diff options
author | Max Krummenacher <max.oss.09@gmail.com> | 2015-02-17 10:57:11 +0100 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-02-17 10:53:34 -0200 |
commit | 99a92881cd0df264eb4ed0654516fe43569e3f51 (patch) | |
tree | be4c40a8cb46acb3c1cd2b1206199e6b7156fcc3 /recipes-core/xml-commons | |
parent | 9319b7458cd136404998f7aeb5508a2baa83e40a (diff) | |
download | meta-java-99a92881cd0df264eb4ed0654516fe43569e3f51.tar.gz |
cleanup whitespace in tasks
Indent with 4 spaces in task definitions.
Signed-off-by: Max Krummenacher <max.oss.09@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/xml-commons')
-rw-r--r-- | recipes-core/xml-commons/jaxme_0.5.2.bb | 39 | ||||
-rw-r--r-- | recipes-core/xml-commons/xom_1.1.bb | 26 | ||||
-rw-r--r-- | recipes-core/xml-commons/xpp2_2.1.10.bb | 22 | ||||
-rw-r--r-- | recipes-core/xml-commons/xpp3_1.1.3.4.O.bb | 38 |
4 files changed, 62 insertions, 63 deletions
diff --git a/recipes-core/xml-commons/jaxme_0.5.2.bb b/recipes-core/xml-commons/jaxme_0.5.2.bb index 304c06d..65b406e 100644 --- a/recipes-core/xml-commons/jaxme_0.5.2.bb +++ b/recipes-core/xml-commons/jaxme_0.5.2.bb | |||
@@ -16,27 +16,26 @@ inherit java-library | |||
16 | DEPENDS = "fastjar-native log4j1.2 xerces-j xalan-j commons-codec hsqldb antlr antlr-native" | 16 | DEPENDS = "fastjar-native log4j1.2 xerces-j xalan-j commons-codec hsqldb antlr antlr-native" |
17 | 17 | ||
18 | do_compile() { | 18 | do_compile() { |
19 | oe_makeclasspath cp -s log4j-1.2 xercesImpl xalan2 commons-codec hsqldb antlr | 19 | oe_makeclasspath cp -s log4j-1.2 xercesImpl xalan2 commons-codec hsqldb antlr |
20 | cp=build-api:build-jaxme:build-js:build-xs:build-pm:$cp | 20 | cp=build-api:build-jaxme:build-js:build-xs:build-pm:$cp |
21 | 21 | ||
22 | jaxme_build src/api build-api $cp jaxmeapi-${PV}.jar | ||
22 | 23 | ||
23 | jaxme_build src/api build-api $cp jaxmeapi-${PV}.jar | 24 | runantlr -o src/js/org/apache/ws/jaxme/js/jparser src/js/org/apache/ws/jaxme/js/jparser/java15.g |
25 | jaxme_build src/js build-js $cp jaxmejs-${PV}.jar | ||
24 | 26 | ||
25 | runantlr -o src/js/org/apache/ws/jaxme/js/jparser src/js/org/apache/ws/jaxme/js/jparser/java15.g | 27 | jaxme_build src/xs build-xs $cp jaxmexs-${PV}.jar |
26 | jaxme_build src/js build-js $cp jaxmejs-${PV}.jar | ||
27 | 28 | ||
28 | jaxme_build src/xs build-xs $cp jaxmexs-${PV}.jar | 29 | jaxme_build src/jaxme build-jaxme $cp ${JARFILENAME} |
29 | 30 | ||
30 | jaxme_build src/jaxme build-jaxme $cp ${JARFILENAME} | 31 | # jaxme_build src/pm build-pm $cp jaxmepm-${PV}.jar |
31 | |||
32 | # jaxme_build src/pm build-pm $cp jaxmepm-${PV}.jar | ||
33 | } | 32 | } |
34 | 33 | ||
35 | do_install_append() { | 34 | do_install_append() { |
36 | oe_jarinstall jaxmeapi-${PV}.jar jaxmeapi.jar | 35 | oe_jarinstall jaxmeapi-${PV}.jar jaxmeapi.jar |
37 | oe_jarinstall jaxmejs-${PV}.jar jaxmejs.jar | 36 | oe_jarinstall jaxmejs-${PV}.jar jaxmejs.jar |
38 | oe_jarinstall jaxmexs-${PV}.jar jaxmexs.jar | 37 | oe_jarinstall jaxmexs-${PV}.jar jaxmexs.jar |
39 | oe_jarinstall jaxmepm-${PV}.jar jaxmepm.jar | 38 | oe_jarinstall jaxmepm-${PV}.jar jaxmepm.jar |
40 | } | 39 | } |
41 | 40 | ||
42 | # Compile helper | 41 | # Compile helper |
@@ -45,17 +44,17 @@ do_install_append() { | |||
45 | # 3 - classpath | 44 | # 3 - classpath |
46 | # 4 - jar file name | 45 | # 4 - jar file name |
47 | jaxme_build() { | 46 | jaxme_build() { |
48 | mkdir -p $2 | 47 | mkdir -p $2 |
49 | 48 | ||
50 | ant_sourcepath=${WORKDIR}/apache-ant-1.7.1/src/main | 49 | ant_sourcepath=${WORKDIR}/apache-ant-1.7.1/src/main |
51 | 50 | ||
52 | echo "javac -sourcepath $ant_sourcepath:$1 -cp $3 -d $2 \`find $1 -name "*.java"\`" | 51 | echo "javac -sourcepath $ant_sourcepath:$1 -cp $3 -d $2 \`find $1 -name "*.java"\`" |
53 | javac -sourcepath $ant_sourcepath:$1 -cp $3 -d $2 `find $1 -name "*.java" -and -not \( -wholename "*junit*" -or -wholename "*examples*" \) ` | 52 | javac -sourcepath $ant_sourcepath:$1 -cp $3 -d $2 `find $1 -name "*.java" -and -not \( -wholename "*junit*" -or -wholename "*examples*" \) ` |
54 | (cd $1 && find . -name "*.properties" -exec cp {} ${S}/$2/{} \;) | 53 | (cd $1 && find . -name "*.properties" -exec cp {} ${S}/$2/{} \;) |
55 | 54 | ||
56 | rm -rf $2/org/apache/tools | 55 | rm -rf $2/org/apache/tools |
57 | 56 | ||
58 | fastjar -C $2 -c -f $4 . | 57 | fastjar -C $2 -c -f $4 . |
59 | } | 58 | } |
60 | 59 | ||
61 | SRC_URI[archive.md5sum] = "084ebfe4a816058f8ff6bd731fa70df4" | 60 | SRC_URI[archive.md5sum] = "084ebfe4a816058f8ff6bd731fa70df4" |
diff --git a/recipes-core/xml-commons/xom_1.1.bb b/recipes-core/xml-commons/xom_1.1.bb index 697e01d..56701b2 100644 --- a/recipes-core/xml-commons/xom_1.1.bb +++ b/recipes-core/xml-commons/xom_1.1.bb | |||
@@ -16,24 +16,24 @@ inherit java-library | |||
16 | DEPENDS = "fastjar-native xerces-j xalan-j" | 16 | DEPENDS = "fastjar-native xerces-j xalan-j" |
17 | 17 | ||
18 | do_compile() { | 18 | do_compile() { |
19 | mkdir -p build | 19 | mkdir -p build |
20 | 20 | ||
21 | oe_makeclasspath cp -s xercesImpl xalan2 | 21 | oe_makeclasspath cp -s xercesImpl xalan2 |
22 | cp=build:$cp | 22 | cp=build:$cp |
23 | 23 | ||
24 | scp="${WORKDIR}/jaxen-1.1.1/src/java/main" | 24 | scp="${WORKDIR}/jaxen-1.1.1/src/java/main" |
25 | |||
26 | javac -sourcepath src:$scp -cp $cp -d build `find src -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)` | ||
27 | javac -sourcepath fatsrc:$scp -cp $cp -d build `find fatsrc -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)` | ||
28 | javac -sourcepath src15:$scp -cp $cp -d build `find src15 -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)` | ||
29 | 25 | ||
30 | (cd src && find . -name "*.properties" -exec cp {} ../build/{} \;) | 26 | javac -sourcepath src:$scp -cp $cp -d build `find src -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)` |
27 | javac -sourcepath fatsrc:$scp -cp $cp -d build `find fatsrc -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)` | ||
28 | javac -sourcepath src15:$scp -cp $cp -d build `find src15 -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)` | ||
31 | 29 | ||
32 | # Remove Jaxen classes from build | 30 | (cd src && find . -name "*.properties" -exec cp {} ../build/{} \;) |
33 | rm -rf build/org/jaxen | ||
34 | rm -rf build/org/w3c | ||
35 | 31 | ||
36 | fastjar -C build -c -f ${JARFILENAME} . | 32 | # Remove Jaxen classes from build |
33 | rm -rf build/org/jaxen | ||
34 | rm -rf build/org/w3c | ||
35 | |||
36 | fastjar -C build -c -f ${JARFILENAME} . | ||
37 | } | 37 | } |
38 | 38 | ||
39 | SRC_URI[archive.md5sum] = "e5ae82568d7b1faeb950140c34fbbcb1" | 39 | SRC_URI[archive.md5sum] = "e5ae82568d7b1faeb950140c34fbbcb1" |
diff --git a/recipes-core/xml-commons/xpp2_2.1.10.bb b/recipes-core/xml-commons/xpp2_2.1.10.bb index 2239173..54d69f4 100644 --- a/recipes-core/xml-commons/xpp2_2.1.10.bb +++ b/recipes-core/xml-commons/xpp2_2.1.10.bb | |||
@@ -12,22 +12,22 @@ inherit java-library | |||
12 | DEPENDS = "fastjar-native virtual/javac-native" | 12 | DEPENDS = "fastjar-native virtual/javac-native" |
13 | 13 | ||
14 | do_compile() { | 14 | do_compile() { |
15 | if [ -d build-oe ]; then | 15 | if [ -d build-oe ]; then |
16 | rm -rf build-oe | 16 | rm -rf build-oe |
17 | fi | 17 | fi |
18 | mkdir -p build-oe | 18 | mkdir -p build-oe |
19 | 19 | ||
20 | sourcepath="src/java/drivers/jaxp11:src/java/drivers/sax2:src/java/impl/factory:src/java/impl/format:src/java/impl/node:src/java/impl/pullparser:src/java/impl/tag:src/java/intf" | 20 | sourcepath="src/java/drivers/jaxp11:src/java/drivers/sax2:src/java/impl/factory:src/java/impl/format:src/java/impl/node:src/java/impl/pullparser:src/java/impl/tag:src/java/intf" |
21 | 21 | ||
22 | findpath="${sourcepath//:/ }" | 22 | findpath="${sourcepath//:/ }" |
23 | 23 | ||
24 | javac -sourcepath $sourcepath -d build-oe `find $findpath -name "*.java"` | 24 | javac -sourcepath $sourcepath -d build-oe `find $findpath -name "*.java"` |
25 | 25 | ||
26 | mkdir -p build-oe/META-INF/services | 26 | mkdir -p build-oe/META-INF/services |
27 | cp src/java/drivers/jaxp11/META-INF/services/javax.xml.parsers.SAXParserFactory build-oe/META-INF/services | 27 | cp src/java/drivers/jaxp11/META-INF/services/javax.xml.parsers.SAXParserFactory build-oe/META-INF/services |
28 | cp src/java/impl/factory/META-INF/services/org.gjt.xpp.XmlPullParserFactory build-oe/META-INF/services | 28 | cp src/java/impl/factory/META-INF/services/org.gjt.xpp.XmlPullParserFactory build-oe/META-INF/services |
29 | 29 | ||
30 | fastjar -C build-oe -c -f ${JARFILENAME} . | 30 | fastjar -C build-oe -c -f ${JARFILENAME} . |
31 | } | 31 | } |
32 | 32 | ||
33 | SRC_URI[md5sum] = "865ca4e2496c215d301b57450137626f" | 33 | SRC_URI[md5sum] = "865ca4e2496c215d301b57450137626f" |
diff --git a/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb b/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb index 40f7cb2..b87cccd 100644 --- a/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb +++ b/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb | |||
@@ -12,34 +12,34 @@ DEPENDS = "fastjar-native virtual/javac-native" | |||
12 | PACKAGES = "libxpp3-xpath-java ${JPN}" | 12 | PACKAGES = "libxpp3-xpath-java ${JPN}" |
13 | 13 | ||
14 | do_compile() { | 14 | do_compile() { |
15 | if [ -d build-oe ]; then | 15 | if [ -d build-oe ]; then |
16 | rm -rf build-oe | 16 | rm -rf build-oe |
17 | fi | 17 | fi |
18 | mkdir -p build-oe | 18 | mkdir -p build-oe |
19 | 19 | ||
20 | sourcepath="src/java/api:src/java/builder:src/java/dom2_builder:src/java/mxp1_min:src/java/mxp1_standard:src/java/parser_pool:src/java/sax2_driver:src/java/serializer_impl:src/java/util:src/java/wrapper" | 20 | sourcepath="src/java/api:src/java/builder:src/java/dom2_builder:src/java/mxp1_min:src/java/mxp1_standard:src/java/parser_pool:src/java/sax2_driver:src/java/serializer_impl:src/java/util:src/java/wrapper" |
21 | findpath="${sourcepath//:/ }" | 21 | findpath="${sourcepath//:/ }" |
22 | 22 | ||
23 | javac -sourcepath $sourcepath -d build-oe `find $findpath -name "*.java"` | 23 | javac -sourcepath $sourcepath -d build-oe `find $findpath -name "*.java"` |
24 | 24 | ||
25 | mkdir -p build-oe/META-INF/services | 25 | mkdir -p build-oe/META-INF/services |
26 | cp src/java/mxp1_standard/META-INF/services/org.xml* build-oe/META-INF/services | 26 | cp src/java/mxp1_standard/META-INF/services/org.xml* build-oe/META-INF/services |
27 | fastjar -C build-oe -c -f ${JARFILENAME} . | 27 | fastjar -C build-oe -c -f ${JARFILENAME} . |
28 | 28 | ||
29 | if [ -d build-xpath ]; then | 29 | if [ -d build-xpath ]; then |
30 | rm -rf build-xpath | 30 | rm -rf build-xpath |
31 | fi | 31 | fi |
32 | mkdir -p build-xpath | 32 | mkdir -p build-xpath |
33 | 33 | ||
34 | sourcepath="src/java/xpath" | 34 | sourcepath="src/java/xpath" |
35 | findpath="${sourcepath//:/ }" | 35 | findpath="${sourcepath//:/ }" |
36 | javac -sourcepath $sourcepath -cp build-oe -d build-xpath `find $findpath -name "*.java"` | 36 | javac -sourcepath $sourcepath -cp build-oe -d build-xpath `find $findpath -name "*.java"` |
37 | 37 | ||
38 | fastjar -C build-xpath -c -f xpp3-xpath-${PV}.jar . | 38 | fastjar -C build-xpath -c -f xpp3-xpath-${PV}.jar . |
39 | } | 39 | } |
40 | 40 | ||
41 | do_install_append() { | 41 | do_install_append() { |
42 | oe_jarinstall xpp3-xpath-${PV}.jar xpp3-xpath.jar | 42 | oe_jarinstall xpp3-xpath-${PV}.jar xpp3-xpath.jar |
43 | } | 43 | } |
44 | 44 | ||
45 | FILES_libxpp3-xpath-java = "${datadir}/java/xpp3-xpath*" | 45 | FILES_libxpp3-xpath-java = "${datadir}/java/xpp3-xpath*" |