Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sketches-core: Fix build #13043

Merged
merged 2 commits into from
Feb 14, 2025
Merged

sketches-core: Fix build #13043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b58bbb9
sketches-core: Fix build
arthurscchan Feb 14, 2025
70433a8
Fix build dependencies
arthurscchan Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions projects/sketches-core/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,9 @@ RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-
unzip maven.zip -d $SRC/maven && \
rm -rf maven.zip

RUN curl -L https://download.java.net/openjdk/jdk11.0.0.1/ri/openjdk-11.0.0.1_linux-x64_bin.tar.gz -o jdk.tar.gz && \
tar zxf jdk.tar.gz && \
rm -rf jdk.tar.gz
RUN curl -L https://repo1.maven.org/maven2/org/apache/datasketches/datasketches-memory/4.1.0/datasketches-memory-4.1.0.jar -o $OUT/datasketches-memory.jar

ENV MVN $SRC/maven/apache-maven-3.6.3/bin/mvn
ENV JAVA_HOME="$SRC/jdk-11.0.0.1"
ENV PATH="$JAVA_HOME/bin:$PATH"
RUN git clone --depth 1 https://github.com/DataSketches/sketches-core sketches-core
COPY *.sh *.java $SRC/
WORKDIR $SRC/sketches-core
14 changes: 11 additions & 3 deletions projects/sketches-core/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
# limitations under the License.
#
##########################################################################
# Configure toolchain
mkdir -p ~/.m2
echo "<toolchains>" > ~/.m2/toolchains.xml
echo "<toolchain><type>jdk</type><provides><version>17</version></provides>" >> ~/.m2/toolchains.xml
echo "<configuration><jdkHome>\${env.JAVA_HOME}</jdkHome></configuration></toolchain>" >> ~/.m2/toolchains.xml
echo "</toolchains>" >> ~/.m2/toolchains.xml

$MVN clean package -Dmaven.javadoc.skip=true -DskipTests=true -Dpmd.skip=true \
-Dencoding=UTF-8 -Dmaven.antrun.skip=true -Dcheckstyle.skip=true \
-DperformRelease=True org.apache.maven.plugins:maven-shade-plugin:3.2.4:shade
Expand All @@ -22,7 +29,7 @@ CURRENT_VERSION=$($MVN org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate

cp "./target/datasketches-java-$CURRENT_VERSION.jar" $OUT/sketches-core.jar

ALL_JARS='sketches-core.jar'
ALL_JARS='sketches-core.jar datasketches-memory.jar'

# The classpath at build-time includes the project jars in $OUT as well as the
# Jazzer API.
Expand All @@ -33,7 +40,7 @@ RUNTIME_CLASSPATH=$(echo $ALL_JARS | xargs printf -- "\$this_dir/%s:"):\$this_di

cp -r $JAVA_HOME $OUT/

for fuzzer in $(find $SRC -name '*Fuzzer.java')
for fuzzer in $(find $SRC -maxdepth 1 -name '*Fuzzer.java')
do
fuzzer_basename=$(basename -s .java $fuzzer)
$JAVA_HOME/bin/javac -cp $BUILD_CLASSPATH $fuzzer
Expand All @@ -49,6 +56,7 @@ do
else
mem_settings='-Xmx2048m:-Xss1024k'
fi
settings=\$mem_settings:--add-modules=jdk.incubator.foreign
export JAVA_HOME=\$this_dir/$(basename $JAVA_HOME)
export LD_LIBRARY_PATH="\$JAVA_HOME/lib/server":\$this_dir
export PATH=\$JAVA_HOME/bin:\$PATH
Expand All @@ -57,7 +65,7 @@ do
--agent_path=\$this_dir/jazzer_agent_deploy.jar \
--cp=$RUNTIME_CLASSPATH \
--target_class=$fuzzer_basename \
--jvm_args="\$mem_settings" \
--jvm_args=\$settings \
\$@" > $OUT/$fuzzer_basename

chmod u+x $OUT/$fuzzer_basename
Expand Down