File tree Expand file tree Collapse file tree 3 files changed +5
-6
lines changed
Expand file tree Collapse file tree 3 files changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -65,7 +65,7 @@ A. Using the [**restore-packages.sh**](build/linux/restore-packages.sh) script
6565
66661 . Run [ ** build-java-extension.sh** ] ( build/linux/build-java-extension.sh ) which will generate two main files: \
6767 - PATH/TO/ENLISTMENT/build-output/java-extension/linux/release/libJavaExtension.so.1.0 \
68- - PATH/TO/ENLISTMENT/build-output/java-extension/target/release/mssql-java-lang-extension.jar
68+ - PATH/TO/ENLISTMENT/build-output/java-extension/target/release/mssql-java-lang-extension-linux .jar
6969
70701 . Run [ ** create-java-extension-zip.sh** ] ( build/linux/create-java-extension-zip.sh ) which will generate: \
7171 - PATH/TO/ENLISTMENT/build-output/java-extension/linux/release/packages/java-lang-extension.zip \
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ function build {
1919 #
2020 TARGET=${ENL_ROOT} /build-output/java-extension/target/${CMAKE_CONFIGURATION}
2121 TARGET_CLASSES=${TARGET} /classes
22- OUTPUT_JAR=mssql-java-lang-extension.jar
22+ OUTPUT_JAR=mssql-java-lang-extension-linux .jar
2323
2424 # Create the output directories
2525 #
@@ -32,7 +32,7 @@ function build {
3232 ls -d " $PWD " /* .java > ${TARGET} /sources.txt
3333 ${JAVA_HOME} /bin/javac -d ${TARGET_CLASSES} @${TARGET} /sources.txt
3434
35- # Create the mssql-java-lang-extension.jar file
35+ # Create the mssql-java-lang-extension-linux .jar file
3636 #
3737 ${JAVA_HOME} /bin/jar cvf ${TARGET} /${OUTPUT_JAR} -C ${TARGET_CLASSES} .
3838
@@ -80,7 +80,7 @@ ENL_ROOT=${SCRIPTDIR}/../../../..
8080#
8181JAVAEXTENSION_HOME=${ENL_ROOT} /language-extensions/java
8282JAVAEXTENSION_WORKING_DIR=${ENL_ROOT} /build-output/java-extension/linux
83- DEFAULT_JAVA_HOME=/usr/lib/jvm/java-1.8.0 -openjdk-amd64
83+ DEFAULT_JAVA_HOME=/usr/lib/jvm/java-17 -openjdk-amd64
8484
8585# Find JAVA_HOME from user, or set to default for tests.
8686# Error code 1 is generic bash error.
Original file line number Diff line number Diff line change @@ -16,12 +16,11 @@ IF NOT DEFINED BUILD_CONFIGURATION (SET BUILD_CONFIGURATION=release)
1616IF /I NOT %BUILD_CONFIGURATION% == debug (SET BUILD_CONFIGURATION=release)
1717
1818SET BUILD_OUTPUT = %ENL_ROOT% \build-output\java-extension\windows\%BUILD_CONFIGURATION%
19- SET OUTPUT_JAR = " %ENL_ROOT% \build-output\java-extension\target\%BUILD_CONFIGURATION% \mssql-java-lang-extension.jar"
2019
2120mkdir %BUILD_OUTPUT% \packages
2221
2322REM Set common files to be included in the zip
24- SET INCLUDE_FILES = %BUILD_OUTPUT% \javaextension.dll, %OUTPUT_JAR%
23+ SET INCLUDE_FILES = %BUILD_OUTPUT% \javaextension.dll
2524
2625REM Check if BUILD_CONFIGURATION is debug, then include javaextension.pdb in the zip
2726IF /I " %BUILD_CONFIGURATION% " == " debug" (
You can’t perform that action at this time.
0 commit comments