diff options
| author | Henning Heinold <heinold@inf.fu-berlin.de> | 2007-08-13 20:51:42 +0000 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2007-08-13 20:51:42 +0000 |
| commit | 4eb19493333a5367f7c1bf403594ef802b23864b (patch) | |
| tree | deef3c881059c3b972fbd4ad2b074f6eddc94cc8 | |
| parent | cbdb9b89fd14ffaf21c0f3e95d611b1b091d13e7 (diff) | |
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
| -rw-r--r-- | packages/midpath/midpath_svn.bb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/packages/midpath/midpath_svn.bb b/packages/midpath/midpath_svn.bb index 0de15a3d15..6393ddcb7a 100644 --- a/packages/midpath/midpath_svn.bb +++ b/packages/midpath/midpath_svn.bb @@ -13,6 +13,8 @@ RPROVIDES_midpath-cldc = "virtual/cldc-api-1.1" 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 @@ cd ${S}/src/cldc-glue 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 @@ cd ${S}/src/core 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 |