Skip to content

Commit 11fa85f

Browse files
HarmfulBreezemagreenblatt
authored andcommitted
Added a MANIFEST file to JCEF JARs (fixes issue chromiumembedded#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.
1 parent 84f7798 commit 11fa85f

File tree

6 files changed

+11
-3
lines changed

6 files changed

+11
-3
lines changed

build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
<target name="jar" depends="compile">
4444
<mkdir dir="${out.path}"/>
45-
<jar destfile="${out.path}/jcef.jar" index="true" update="false">
45+
<jar destfile="${out.path}/jcef.jar" index="true" update="false" manifest="java/manifest/MANIFEST.MF">
4646
<fileset dir="${out.path}">
4747
<include name="org/cef/**"/>
4848
</fileset>

java/manifest/MANIFEST.MF

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Manifest-Version: 1.0
2+
Automatic-Module-Name: jcef

tools/compile.bat

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ set CLS_PATH=".\third_party\jogamp\jar\*;.\third_party\junit\*;.\java"
1919
if not exist %OUT_PATH% mkdir %OUT_PATH%
2020
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
2121

22+
:: Copy MANIFEST.MF
23+
xcopy /sfy .\java\manifest %OUT_PATH%\manifest\
24+
2225
:: Copy resource files.
2326
xcopy /sfy .\java\tests\detailed\handler\*.html %OUT_PATH%\tests\detailed\handler\
2427
xcopy /sfy .\java\tests\detailed\handler\*.png %OUT_PATH%\tests\detailed\handler\

tools/compile.sh

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ else
1717

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

20+
# Copy MANIFEST.MF
21+
rsync -a ./java/manifest/MANIFEST.MF $OUT_PATH/manifest/
22+
2023
# Copy resource files.
2124
cp -f "${JAVA_PATH}"/tests/detailed/handler/*.html "$OUT_PATH/tests/detailed/handler"
2225
cp -f "${JAVA_PATH}"/tests/detailed/handler/*.png "$OUT_PATH/tests/detailed/handler"

tools/make_jar.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set ERRORLEVEL=1
1212
goto end
1313
)
1414
cd ..\out\%1
15-
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
15+
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
1616
jar -cf jcef-tests.jar tests/detailed/*.class tests/detailed/dialog/*.class tests/detailed/handler/* tests/detailed/ui/*.class
1717

1818
:end

tools/make_jar.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ if [ -z "$1" ]; then
88
else
99
DIR="$( cd "$( dirname "$0" )" && cd .. && pwd )"
1010
OUT_DIR="${DIR}/out/$1"
11-
jar -cf "${OUT_DIR}"/jcef.jar -C "${OUT_DIR}" org
11+
jar -cmf "${OUT_DIR}"/manifest/MANIFEST.MF "${OUT_DIR}"/jcef.jar -C "${OUT_DIR}" org
1212
jar -cf "${OUT_DIR}"/jcef-tests.jar -C "${OUT_DIR}" tests
1313
fi

0 commit comments

Comments
 (0)