Skip to content

Commit e51909e

Browse files
Rename jar for linux and remove jar in windows zip (#48)
1 parent 7661ff6 commit e51909e

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

language-extensions/java/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ A. Using the [**restore-packages.sh**](build/linux/restore-packages.sh) script
6565

6666
1. 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

7070
1. 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 \

language-extensions/java/build/linux/build-java-extension.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff 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
#
8181
JAVAEXTENSION_HOME=${ENL_ROOT}/language-extensions/java
8282
JAVAEXTENSION_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.

language-extensions/java/build/windows/create-java-extension-zip.cmd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@ IF NOT DEFINED BUILD_CONFIGURATION (SET BUILD_CONFIGURATION=release)
1616
IF /I NOT %BUILD_CONFIGURATION%==debug (SET BUILD_CONFIGURATION=release)
1717

1818
SET 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

2120
mkdir %BUILD_OUTPUT%\packages
2221

2322
REM 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

2625
REM Check if BUILD_CONFIGURATION is debug, then include javaextension.pdb in the zip
2726
IF /I "%BUILD_CONFIGURATION%"=="debug" (

0 commit comments

Comments
 (0)