[oe-commits] org.oe.dev midpath_svn: fix ecj and fast command

[woglinde2 commit]

midpath_svn: fix ecj and fast command
* use the JAVA_CMD in all places insted of ecj
* use FASTJAR_CMD in alle places instead of jar

Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: f5320a73ee7adf3a8ec5e78981e0f6b46e44c629
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f5320a73ee7adf3a8ec5e78981e0f6b46e44c629
Files:
1
packages/midpath/midpath_svn.bb
Diffs:

#
# mt diff -r9864f8e29e80d68c15dbddad0db8a33c1165132e -rf5320a73ee7adf3a8ec5e78981e0f6b46e44c629
#
# 
# 
# patch "packages/midpath/midpath_svn.bb"
#  from [746724449d034c259adac0c1deb3a12a0c152ea9]
#    to [7182fd9408851ae61c1a33db310b59724cf340c7]
# 
============================================================
--- packages/midpath/midpath_svn.bb	746724449d034c259adac0c1deb3a12a0c152ea9
+++ packages/midpath/midpath_svn.bb	7182fd9408851ae61c1a33db310b59724cf340c7
@@ -13,6 +13,8 @@ JAVAC_CMD=${STAGING_BINDIR_NATIVE}/ecj
 
 JAVAC_CMD=${STAGING_BINDIR_NATIVE}/ecj
 
+FASTJAR_CMD=${STAGING_BINDIR_NATIVE}/fastjar
+
 GNU_CLASSPATH_PATH=${STAGING_LIBDIR}/java/classpath-minimal/glibj.zip
 
 do_compile() {
@@ -29,7 +31,7 @@ make install JAVAC=${JAVAC_CMD} JAVAC_FL
 make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -sourcepath ${S}/src/cldc-glue -source 1.3 -target 1.1"
 make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes
 # Make a jar
-fastjar cvf  ${S}/dist/cldc1.1.jar -C ${S}/external/cldc1.1/classes .
+${FASTJAR_CMD} cvf  ${S}/dist/cldc1.1.jar -C ${S}/external/cldc1.1/classes .
 
 CLDC_PATH=${S}/dist/cldc1.1.jar
 
@@ -68,8 +70,8 @@ make install JAVAC=${JAVAC_CMD} JAVAC_FL
 make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH:${GNU_CLASSPATH_PATH}:${S}/dist/sdljava-cldc.jar:${S}/dist/escher-x11-cldc.jar:${S}/dist/jlayerme-cldc.jar:${S}/dist/jorbis-cldc.jar:${S}/dist/jsr82-bluetooth.jar:${S}/lib/kxml2-2.3.0.jar:${S}/lib/swt.jar -sourcepath ${S}/src/core -source 1.3 -target 1.1" || exit 1
 make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH:${GNU_CLASSPATH_PATH}:${S}/dist/sdljava-cldc.jar:${S}/dist/escher-x11-cldc.jar:${S}/dist/jlayerme-cldc.jar:${S}/dist/jorbis-cldc.jar:${S}/dist/jsr82-bluetooth.jar:${S}/lib/kxml2-2.3.0.jar:${S}/lib/swt.jar -source 1.3 -target 1.1" CLASS_DIR=${S}/src/core/classes || exit 1
 # Compile JVM.java separately as it can't be compiled against cldc.jar
-ecj -bootclasspath ${GNU_CLASSPATH_PATH} -source 1.3 -target 1.1 -d ${S}/src/core/classes com/sun/cldchi/jvm/JVM.java
-jar cvf ${S}/dist/midpath.jar -C ${S}/src/core/classes .
+${JAVA_CMD} -bootclasspath ${GNU_CLASSPATH_PATH} -source 1.3 -target 1.1 -d ${S}/src/core/classes com/sun/cldchi/jvm/JVM.java
+${FASTJAR_CMD} cvf ${S}/dist/midpath.jar -C ${S}/src/core/classes .
 
 cd ${S}/tests
 make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/dist/midpath.jar:$CLDC_PATH -sourcepath ${S}/tests -source 1.3 -target 1.1" || exit 1