aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-05-24 13:52:36 -0700
committerHenning Heinold <heinold@inf.fu-berlin.de>2013-09-29 21:51:44 +0200
commitdca442370feada140aa1f9b42a46a0d48917333e (patch)
tree93afdb625ba15f20415dbb37d8603c0d2577c712
parentccf407d934bae10b6e1d2c5ecc6c0a113b09891d (diff)
downloadmeta-java-dca442370feada140aa1f9b42a46a0d48917333e.tar.gz
meta-java-dca442370feada140aa1f9b42a46a0d48917333e.tar.bz2
meta-java-dca442370feada140aa1f9b42a46a0d48917333e.zip
recipes-core: Correct fastjar cmdline
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes-core/ant/ant-native_1.8.1.bb2
-rw-r--r--recipes-core/antlr/antlr_2.7.7.bb2
-rw-r--r--recipes-core/cup/cup_0.10k.bb2
-rw-r--r--recipes-core/jacl/jacl_1.4.1.bb2
-rw-r--r--recipes-core/jakarta-commons/jakarta-commons.inc4
-rw-r--r--recipes-core/jakarta-libs/bsf_2.4.0.bb2
-rw-r--r--recipes-core/jakarta-libs/log4j1.2_1.2.17.bb2
-rw-r--r--recipes-core/jakarta-libs/logkit_1.2.2.bb2
-rw-r--r--recipes-core/jakarta-libs/oro_2.0.8.bb2
-rw-r--r--recipes-core/jakarta-libs/regexp_1.5.bb2
-rw-r--r--recipes-core/jcraft/jsch_0.1.40.bb2
-rw-r--r--recipes-core/jcraft/jzlib_1.0.7.bb2
-rw-r--r--recipes-core/jdepend/jdepend_2.9.1.bb2
-rw-r--r--recipes-core/jlex/jlex_1.2.6.bb2
-rw-r--r--recipes-core/rhino/rhino_1.7r4.bb2
-rw-r--r--recipes-core/servlet-api/servlet2.3_4.1.37.bb2
-rw-r--r--recipes-core/xalan-j/xalan-j_2.7.1.bb4
-rw-r--r--recipes-core/xml-commons/jaxp1.3_1.4.01.bb2
-rw-r--r--recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb2
19 files changed, 21 insertions, 21 deletions
diff --git a/recipes-core/ant/ant-native_1.8.1.bb b/recipes-core/ant/ant-native_1.8.1.bb
index 21feb1c..35b45d6 100644
--- a/recipes-core/ant/ant-native_1.8.1.bb
+++ b/recipes-core/ant/ant-native_1.8.1.bb
@@ -50,7 +50,7 @@ do_compile() {
echo "VERSION=${PV}" > build/org/apache/tools/ant/version.txt
echo "DATE=`date -R`" >> build/org/apache/tools/ant/version.txt
- fastjar -C build -c -f ${JARFILENAME} .
+ fastjar cf ${JARFILENAME} -C build .
oe_makeclasspath cp -s ecj-bootstrap jsch bsf xalan2 xercesImpl resolver gnumail gnujaf bcel regexp log4j1.2 antlr oro junit jdepend commons-net commons-logging
cp=${STAGING_DATADIR_JAVA_NATIVE}/ant.jar:${STAGING_DATADIR}/classpath/tools.zip:$cp
diff --git a/recipes-core/antlr/antlr_2.7.7.bb b/recipes-core/antlr/antlr_2.7.7.bb
index 105b5e8..2c7ab8e 100644
--- a/recipes-core/antlr/antlr_2.7.7.bb
+++ b/recipes-core/antlr/antlr_2.7.7.bb
@@ -18,7 +18,7 @@ do_compile() {
javac -sourcepath . -d build `find antlr -name "*.java"`
- fastjar -C build -c -f ${JARFILENAME} .
+ fastjar cf ${JARFILENAME} -C build .
}
do_install_virtclass_native() {
diff --git a/recipes-core/cup/cup_0.10k.bb b/recipes-core/cup/cup_0.10k.bb
index 5b76fcc..2a957f9 100644
--- a/recipes-core/cup/cup_0.10k.bb
+++ b/recipes-core/cup/cup_0.10k.bb
@@ -28,7 +28,7 @@ do_compile() {
javac -d build `find . -name "*.java"`
- fastjar -C build -c -f ${BP}.jar .
+ fastjar cf ${BP}.jar -C build .
}
do_install_append() {
diff --git a/recipes-core/jacl/jacl_1.4.1.bb b/recipes-core/jacl/jacl_1.4.1.bb
index 497f4ee..b413719 100644
--- a/recipes-core/jacl/jacl_1.4.1.bb
+++ b/recipes-core/jacl/jacl_1.4.1.bb
@@ -19,7 +19,7 @@ do_compile() {
javac -sourcepath src/tcljava:src/jacl -d build `find src/tcljava src/jacl -name "*.java"`
- fastjar -C build -c -f ${JARFILENAME} .
+ fastjar cf ${JARFILENAME} -C build .
}
SRC_URI[md5sum] = "a7ec8300e8933164e854460c73ac6269"
diff --git a/recipes-core/jakarta-commons/jakarta-commons.inc b/recipes-core/jakarta-commons/jakarta-commons.inc
index 1630df6..4f7b700 100644
--- a/recipes-core/jakarta-commons/jakarta-commons.inc
+++ b/recipes-core/jakarta-commons/jakarta-commons.inc
@@ -55,8 +55,8 @@ do_compile() {
# Some projects have manifest, some have not. This works for both.
if [ -f src/conf/MANIFEST.MF ]
then
- fastjar -C build -c -m src/conf/MANIFEST.MF -f ${JARFILENAME} .
+ fastjar cfm ${JARFILENAME} src/conf/MANIFEST.MF -C build .
else
- fastjar -C build -c -f ${JARFILENAME} .
+ fastjar cf ${JARFILENAME} -C build .
fi
}
diff --git a/recipes-core/jakarta-libs/bsf_2.4.0.bb b/recipes-core/jakarta-libs/bsf_2.4.0.bb
index 02a6c7d..0213004 100644
--- a/recipes-core/jakarta-libs/bsf_2.4.0.bb
+++ b/recipes-core/jakarta-libs/bsf_2.4.0.bb
@@ -22,7 +22,7 @@ do_compile() {
javac -sourcepath src -cp $cp -d build `find src -name "*.java"`
- fastjar -C build -c -f ${JARFILENAME} .
+ fastjar cf ${JARFILENAME} -C build .
}
diff --git a/recipes-core/jakarta-libs/log4j1.2_1.2.17.bb b/recipes-core/jakarta-libs/log4j1.2_1.2.17.bb
index ec8d29e..b4ccd2c 100644
--- a/recipes-core/jakarta-libs/log4j1.2_1.2.17.bb
+++ b/recipes-core/jakarta-libs/log4j1.2_1.2.17.bb
@@ -27,7 +27,7 @@ do_compile() {
cp -R src/main/resources/* build/
- fastjar -C build -c -f ${JARFILENAME} .
+ fastjar cf ${JARFILENAME} -C build .
}
SRC_URI[md5sum] = "8218714e41ee0c6509dcfeafa2e1f53f"
diff --git a/recipes-core/jakarta-libs/logkit_1.2.2.bb b/recipes-core/jakarta-libs/logkit_1.2.2.bb
index 2b1c957..c3b612b 100644
--- a/recipes-core/jakarta-libs/logkit_1.2.2.bb
+++ b/recipes-core/jakarta-libs/logkit_1.2.2.bb
@@ -24,7 +24,7 @@ do_compile() {
(cd src/java && find . -name "*.properties" -exec cp {} ../../build/{} \;)
- fastjar -C build -c -f ${JARFILENAME} .
+ fastjar cf ${JARFILENAME} -C build .
}
SRC_URI[md5sum] = "996ee20d6b5785ab71f4692f64d10f9c"
diff --git a/recipes-core/jakarta-libs/oro_2.0.8.bb b/recipes-core/jakarta-libs/oro_2.0.8.bb
index 69c33cf..0a7fba3 100644
--- a/recipes-core/jakarta-libs/oro_2.0.8.bb
+++ b/recipes-core/jakarta-libs/oro_2.0.8.bb
@@ -15,7 +15,7 @@ do_compile() {
javac -sourcepath src/java -d build `find src/java -name \*.java`
- fastjar -C build -c -f ${JARFILENAME} org
+ fastjar cf ${JARFILENAME} -C build org
}
SRC_URI[md5sum] = "6f7690c6ba9750e3cbb8ebd10078a79a"
diff --git a/recipes-core/jakarta-libs/regexp_1.5.bb b/recipes-core/jakarta-libs/regexp_1.5.bb
index 4392e04..ce6150c 100644
--- a/recipes-core/jakarta-libs/regexp_1.5.bb
+++ b/recipes-core/jakarta-libs/regexp_1.5.bb
@@ -15,7 +15,7 @@ do_compile() {
javac -sourcepath src/java -d build `find src/java -name \*.java`
- fastjar -C build -c -f ${JARFILENAME} .
+ fastjar cf ${JARFILENAME} -C build .
}
SRC_URI[md5sum] = "b941b8f4de297827f3211c2cb34af199"
diff --git a/recipes-core/jcraft/jsch_0.1.40.bb b/recipes-core/jcraft/jsch_0.1.40.bb
index ebe1885..337a8eb 100644
--- a/recipes-core/jcraft/jsch_0.1.40.bb
+++ b/recipes-core/jcraft/jsch_0.1.40.bb
@@ -20,7 +20,7 @@ do_compile() {
javac -sourcepath src -cp $cp -d build `find src -name "*.java"`
- fastjar -C build -c -f ${JARFILENAME} .
+ fastjar cf ${JARFILENAME} -C build .
}
SRC_URI[md5sum] = "b59cec19a487e95aed68378976b4b566"
diff --git a/recipes-core/jcraft/jzlib_1.0.7.bb b/recipes-core/jcraft/jzlib_1.0.7.bb
index 96aec3c..b6f3f64 100644
--- a/recipes-core/jcraft/jzlib_1.0.7.bb
+++ b/recipes-core/jcraft/jzlib_1.0.7.bb
@@ -13,7 +13,7 @@ do_compile() {
javac -sourcepath . -d build `find com -name "*.java"`
- fastjar -C build -c -f ${JARFILENAME} .
+ fastjar cf ${JARFILENAME} -C build .
}
SRC_URI[md5sum] = "3c52a0afb970e8a1fb2d34f30d330a83"
diff --git a/recipes-core/jdepend/jdepend_2.9.1.bb b/recipes-core/jdepend/jdepend_2.9.1.bb
index 7511914..9f74f44 100644
--- a/recipes-core/jdepend/jdepend_2.9.1.bb
+++ b/recipes-core/jdepend/jdepend_2.9.1.bb
@@ -15,7 +15,7 @@ do_compile() {
javac -sourcepath src -d build `find src -name "*.java"`
- fastjar -C build -c -f ${JARFILENAME} .
+ fastjar cf ${JARFILENAME} -C build .
}
SRC_URI[md5sum] = "0cbaf43493cd30838bee261f69e76fe9"
diff --git a/recipes-core/jlex/jlex_1.2.6.bb b/recipes-core/jlex/jlex_1.2.6.bb
index e0fe186..5282980 100644
--- a/recipes-core/jlex/jlex_1.2.6.bb
+++ b/recipes-core/jlex/jlex_1.2.6.bb
@@ -29,7 +29,7 @@ do_compile() {
javac -d build Main.java
- fastjar -C build -c -f ${BP}.jar .
+ fastjar cf ${BP}.jar -C build .
}
do_install_append() {
diff --git a/recipes-core/rhino/rhino_1.7r4.bb b/recipes-core/rhino/rhino_1.7r4.bb
index 76a3b5f..7898d23 100644
--- a/recipes-core/rhino/rhino_1.7r4.bb
+++ b/recipes-core/rhino/rhino_1.7r4.bb
@@ -32,7 +32,7 @@ do_compile() {
mkdir -p build/org/mozilla/javascript/resources
cp src/org/mozilla/javascript/resources/*.properties build/org/mozilla/javascript/resources
- fastjar -m ${S}/src/manifest -C build -c -f ${JARFILENAME} .
+ fastjar cfm ${JARFILENAME} ${S}/src/manifest -C build .
}
do_install_append() {
diff --git a/recipes-core/servlet-api/servlet2.3_4.1.37.bb b/recipes-core/servlet-api/servlet2.3_4.1.37.bb
index 98f0d69..fbda5c8 100644
--- a/recipes-core/servlet-api/servlet2.3_4.1.37.bb
+++ b/recipes-core/servlet-api/servlet2.3_4.1.37.bb
@@ -39,7 +39,7 @@ do_compile() {
cp src/share/dtd/web-jsptaglibrary*.dtd build/javax/servlet/jsp/resources
cp src/share/dtd/jspxml.* build/javax/servlet/jsp/resources
- fastjar -C build -c -m src/etc/manifest -f ${JARFILENAME} .
+ fastjar cfm ${JARFILENAME} src/etc/manifest -C build .
}
SRC_URI[md5sum] = "fe50177a25a084ad1abf4a201d08c2a6"
diff --git a/recipes-core/xalan-j/xalan-j_2.7.1.bb b/recipes-core/xalan-j/xalan-j_2.7.1.bb
index 67c4d66..317b3c9 100644
--- a/recipes-core/xalan-j/xalan-j_2.7.1.bb
+++ b/recipes-core/xalan-j/xalan-j_2.7.1.bb
@@ -44,8 +44,8 @@ do_compile() {
mkdir -p build-serializer/org/apache/xml
mv build/org/apache/xml/serializer build-serializer/org/apache/xml
- fastjar -C build -c -f ${JARFILENAME} .
- fastjar -C build-serializer -c -f serializer-${PV}.jar .
+ fastjar cf ${JARFILENAME} -C build .
+ fastjar cf serializer-${PV}.jar -C build-serializer .
}
do_install_append() {
diff --git a/recipes-core/xml-commons/jaxp1.3_1.4.01.bb b/recipes-core/xml-commons/jaxp1.3_1.4.01.bb
index 481a1ec..711b6b7 100644
--- a/recipes-core/xml-commons/jaxp1.3_1.4.01.bb
+++ b/recipes-core/xml-commons/jaxp1.3_1.4.01.bb
@@ -24,7 +24,7 @@ do_compile() {
cp LICENSE.*.txt README.*.txt build/license
- fastjar -c -m manifest.commons -f ${JARFILENAME} -C build .
+ fastjar cfm ${JARFILENAME} manifest.commons -C build .
}
SRC_URI[md5sum] = "2fea8e97a5d4d1a24bd05f5f62f3e04e"
diff --git a/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb b/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb
index 93a5c31..5853895 100644
--- a/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb
+++ b/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb
@@ -33,7 +33,7 @@ do_compile() {
(cd src && find org -name "*.xml" -o -name "*.txt" -o -name "*.src" -exec cp {} ../build/{} \;)
- fastjar -C build -c -m src/manifest.resolver -f ${JARFILENAME} org
+ fastjar cfm ${JARFILENAME} src/manifest.resolver -C build org
}
SRC_URI[md5sum] = "46d52acdb67ba60f0156043f30108766"