Revision: 5931
http://sourceforge.net/p/jump-pilot/code/5931
Author: edso
Date: 2018-08-27 13:53:00 +0000 (Mon, 27 Aug 2018)
Log Message:
-----------
remove javax.se.ee when run w/ java 11+ on linux/mac
Modified Paths:
--------------
core/trunk/ChangeLog
core/trunk/scripts/oj_linux.sh
Modified: core/trunk/ChangeLog
===================================================================
--- core/trunk/ChangeLog 2018-08-27 13:43:30 UTC (rev 5930)
+++ core/trunk/ChangeLog 2018-08-27 13:53:00 UTC (rev 5931)
@@ -5,6 +5,7 @@
2018-08-27 ede
* oj_windows.bat rework version detection for 'openjdk version "12-ea"'
+ * linux/mac starter remove javax.se.ee when run w/ java 11+
2018-08-24 mmichaud <m.michael.mich...@orange.fr>
* Improve LayerView naming and saving, allow views based on view
Modified: core/trunk/scripts/oj_linux.sh
===================================================================
--- core/trunk/scripts/oj_linux.sh 2018-08-27 13:43:30 UTC (rev 5930)
+++ core/trunk/scripts/oj_linux.sh 2018-08-27 13:53:00 UTC (rev 5931)
@@ -242,9 +242,13 @@
JAVA_OPTS="--add-exports java.base/jdk.internal.loader=ALL-UNNAMED \
--add-exports java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED \
--add-exports java.desktop/com.sun.java.swing.plaf.motif=ALL-UNNAMED \
---add-exports java.desktop/com.sun.imageio.spi=ALL-UNNAMED --add-modules
java.se.ee \
+--add-exports java.desktop/com.sun.imageio.spi=ALL-UNNAMED \
$JAVA_OPTS"
fi
+# java ee was removed from jdk in java 11
+if awk "BEGIN{if( $JAVA_VERSION >= 9 && $JAVA_VERSION < 11 )exit 0;else exit
1}"; then
+ JAVA_OPTS="--add-modules java.se.ee $JAVA_OPTS"
+fi
# in case some additional archives were placed in native dir inbetween
extract_libs "$JUMP_NATIVE_DIR"
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
