Commit 221749ee authored by Petri Hintukainen's avatar Petri Hintukainen

BD-J: parametrize java language and binary code versions

parent b1e45cbf
- Add support for compiling .jar file with Java 9+ compiler.
2017-12-01: Version 1.0.2
- Add initial support for UHD BluRay discs (without BD-J menus).
- Detect JRE (from the Java Applet plugin) on MacOS.
......
......@@ -226,6 +226,12 @@ pkginclude_HEADERS = \
if USING_BDJAVA_BUILD_JAR
if USING_JAVAC_9
java_versions = -Djava_version_asm=1.6 -Djava_version_bdj=1.6
else
java_versions = -Djava_version_asm=1.5 -Djava_version_bdj=1.4
endif
if BDJ_J2SE
awt_src = java-$(BDJ_TYPE):java-build-support
else
......@@ -244,6 +250,7 @@ all-local:
-Dbuild='$(abs_builddir)/src/libbluray/bdj/build' \
-Ddist='$(abs_builddir)/.libs' \
-Dsrc_awt=:$(awt_src) \
$(java_versions) \
-Dbootclasspath="$(BDJ_BOOTCLASSPATH)" \
-Dversion='$(BDJ_TYPE)-$(VERSION)'
......
......@@ -112,6 +112,9 @@ AC_ARG_WITH([bdj-bootclasspath],
[BDJ_BOOTCLASSPATH=$withval],
[BDJ_BOOTCLASSPATH=])
AC_ARG_WITH([java9],
[AS_HELP_STRING([--with-java9], [build with Java 9+ (drop support for Java <1.6) @<:@default=without@:>@])])
dnl required programs
AC_PROG_CC
AM_PROG_CC_C_O
......@@ -239,6 +242,7 @@ AS_IF([test "x$use_bdjava_jar" = "xyes"], [
AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ])
AM_CONDITIONAL([USING_JAVAC_9], [ test x"$with_java9" = x"yes" ])
dnl BD-J type
if test "$BDJ_TYPE" = "j2me"; then
......
......@@ -10,6 +10,8 @@
<property name="src_asm" value="../../../contrib/asm/src/"/>
<property name="bootclasspath" value=""/>
<property name="version" value=""/>
<property name="java_version_asm" value="1.5"/>
<property name="java_version_bdj" value="1.4"/>
<target name="init">
<tstamp/>
......@@ -21,13 +23,13 @@
description="compile the source " >
<javac srcdir="${src_asm}" destdir="${build}" debug="yes"
bootclasspath="${bootclasspath}"
source="1.5" target="1.5">
source="${java_version_asm}" target="${java_version_asm}">
<compilerarg value="-XDignore.symbol.file"/>
<compilerarg value="-Xlint:-deprecation"/>
</javac>
<javac srcdir="${src}${src_awt}" destdir="${build}" debug="yes"
bootclasspath="${bootclasspath}"
source="1.4" target="1.4">
source="${java_version_bdj}" target="${java_version_bdj}">
<compilerarg value="-XDignore.symbol.file"/>
<compilerarg value="-Xlint:-deprecation"/>
</javac>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment