diff options
author | Pierre GRASSER <piorrro33@outlook.com> | 2021-12-20 18:33:35 +0000 |
---|---|---|
committer | Marshall Greenblatt <magreenblatt@gmail.com> | 2021-12-20 18:33:35 +0000 |
commit | 11fa85faa73420499666aa15623057d33ad6b5e5 (patch) | |
tree | a489afda010f1dd3f28872f67971e730e9fb7cba | |
parent | 84f77985d63a2092f26d7d0eb7f396a4748eca09 (diff) | |
download | jcef-11fa85faa73420499666aa15623057d33ad6b5e5.tar.gz |
Added a MANIFEST file to JCEF JARs (fixes issue #389)
This manifest file contains the Automatic-Module-Name set to "jcef". This helps improve compatibility with JPMS (Java 9 Module System), and avoids having two different modules for win32 and win64 JCEF.
-rw-r--r-- | build.xml | 2 | ||||
-rw-r--r-- | java/manifest/MANIFEST.MF | 2 | ||||
-rw-r--r-- | tools/compile.bat | 3 | ||||
-rwxr-xr-x | tools/compile.sh | 3 | ||||
-rw-r--r-- | tools/make_jar.bat | 2 | ||||
-rwxr-xr-x | tools/make_jar.sh | 2 |
6 files changed, 11 insertions, 3 deletions
@@ -42,7 +42,7 @@ <target name="jar" depends="compile"> <mkdir dir="${out.path}"/> - <jar destfile="${out.path}/jcef.jar" index="true" update="false"> + <jar destfile="${out.path}/jcef.jar" index="true" update="false" manifest="java/manifest/MANIFEST.MF"> <fileset dir="${out.path}"> <include name="org/cef/**"/> </fileset> diff --git a/java/manifest/MANIFEST.MF b/java/manifest/MANIFEST.MF new file mode 100644 index 0000000..9993ab6 --- /dev/null +++ b/java/manifest/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 +Automatic-Module-Name: jcef diff --git a/tools/compile.bat b/tools/compile.bat index 8741968..6267894 100644 --- a/tools/compile.bat +++ b/tools/compile.bat @@ -19,6 +19,9 @@ set CLS_PATH=".\third_party\jogamp\jar\*;.\third_party\junit\*;.\java" if not exist %OUT_PATH% mkdir %OUT_PATH%
javac -Xdiags:verbose -cp %CLS_PATH% -d %OUT_PATH% java/tests/detailed/*.java java/tests/junittests/*.java java/tests/simple/*.java java/org/cef/*.java java/org/cef/browser/*.java java/org/cef/callback/*.java java/org/cef/handler/*.java java/org/cef/misc/*.java java/org/cef/network/*.java
+:: Copy MANIFEST.MF
+xcopy /sfy .\java\manifest %OUT_PATH%\manifest\
+
:: Copy resource files.
xcopy /sfy .\java\tests\detailed\handler\*.html %OUT_PATH%\tests\detailed\handler\
xcopy /sfy .\java\tests\detailed\handler\*.png %OUT_PATH%\tests\detailed\handler\
diff --git a/tools/compile.sh b/tools/compile.sh index cd13c20..bd737bf 100755 --- a/tools/compile.sh +++ b/tools/compile.sh @@ -17,6 +17,9 @@ else javac -Xdiags:verbose -cp "$CLS_PATH" -d "$OUT_PATH" "${JAVA_PATH}"/tests/detailed/*.java "${JAVA_PATH}"/tests/junittests/*.java "${JAVA_PATH}"/tests/simple/*.java "${JAVA_PATH}"/org/cef/*.java "${JAVA_PATH}"/org/cef/browser/*.java "${JAVA_PATH}"/org/cef/callback/*.java "${JAVA_PATH}"/org/cef/handler/*.java "${JAVA_PATH}"/org/cef/misc/*.java "${JAVA_PATH}"/org/cef/network/*.java + # Copy MANIFEST.MF + rsync -a ./java/manifest/MANIFEST.MF $OUT_PATH/manifest/ + # Copy resource files. cp -f "${JAVA_PATH}"/tests/detailed/handler/*.html "$OUT_PATH/tests/detailed/handler" cp -f "${JAVA_PATH}"/tests/detailed/handler/*.png "$OUT_PATH/tests/detailed/handler" diff --git a/tools/make_jar.bat b/tools/make_jar.bat index 4637441..6f589e9 100644 --- a/tools/make_jar.bat +++ b/tools/make_jar.bat @@ -12,7 +12,7 @@ set ERRORLEVEL=1 goto end
)
cd ..\out\%1
-jar -cf jcef.jar org/cef/*.class org/cef/browser/*.class org/cef/callback/*.class org/cef/handler/*.class org/cef/misc/*.class org/cef/network/*.class
+jar -cmf manifest\MANIFEST.MF jcef.jar org/cef/*.class org/cef/browser/*.class org/cef/callback/*.class org/cef/handler/*.class org/cef/misc/*.class org/cef/network/*.class
jar -cf jcef-tests.jar tests/detailed/*.class tests/detailed/dialog/*.class tests/detailed/handler/* tests/detailed/ui/*.class
:end
diff --git a/tools/make_jar.sh b/tools/make_jar.sh index 1bc2618..93338e3 100755 --- a/tools/make_jar.sh +++ b/tools/make_jar.sh @@ -8,6 +8,6 @@ if [ -z "$1" ]; then else DIR="$( cd "$( dirname "$0" )" && cd .. && pwd )" OUT_DIR="${DIR}/out/$1" - jar -cf "${OUT_DIR}"/jcef.jar -C "${OUT_DIR}" org + jar -cmf "${OUT_DIR}"/manifest/MANIFEST.MF "${OUT_DIR}"/jcef.jar -C "${OUT_DIR}" org jar -cf "${OUT_DIR}"/jcef-tests.jar -C "${OUT_DIR}" tests fi |