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/jakarta-commons/jakarta-commons.inc | |
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/jakarta-commons/jakarta-commons.inc')
-rw-r--r-- | recipes-core/jakarta-commons/jakarta-commons.inc | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/recipes-core/jakarta-commons/jakarta-commons.inc b/recipes-core/jakarta-commons/jakarta-commons.inc index 4f7b700..bd85610 100644 --- a/recipes-core/jakarta-commons/jakarta-commons.inc +++ b/recipes-core/jakarta-commons/jakarta-commons.inc | |||
@@ -21,42 +21,42 @@ CLEAN_PATH = "" | |||
21 | 21 | ||
22 | # Some projects have a replaceable version number in their manifest template. | 22 | # Some projects have a replaceable version number in their manifest template. |
23 | do_unpackpost() { | 23 | do_unpackpost() { |
24 | if [ -d src/conf ] | 24 | if [ -d src/conf ] |
25 | then | 25 | then |
26 | find src/conf -exec \ | 26 | find src/conf -exec \ |
27 | sed -i -e "s|@version@|${PV}|" {} \; | 27 | sed -i -e "s|@version@|${PV}|" {} \; |
28 | fi | 28 | fi |
29 | } | 29 | } |
30 | 30 | ||
31 | addtask unpackpost after do_unpack before do_patch | 31 | addtask unpackpost after do_unpack before do_patch |
32 | # Compile step is very similar for Jakarta commons packages | 32 | # Compile step is very similar for Jakarta commons packages |
33 | do_compile() { | 33 | do_compile() { |
34 | mkdir -p build | 34 | mkdir -p build |
35 | 35 | ||
36 | if [ "${CP}" ] | 36 | if [ "${CP}" ] |
37 | then | 37 | then |
38 | oe_makeclasspath cp -s ${CP} | 38 | oe_makeclasspath cp -s ${CP} |
39 | else | 39 | else |
40 | cp=. | 40 | cp=. |
41 | fi | 41 | fi |
42 | 42 | ||
43 | echo "javac -sourcepath ${COMPILE_SOURCEPATH} -cp $cp -d build \`find ${MAINSOURCES} ${COMPILE_FINDARGS}\`" | 43 | echo "javac -sourcepath ${COMPILE_SOURCEPATH} -cp $cp -d build \`find ${MAINSOURCES} ${COMPILE_FINDARGS}\`" |
44 | javac -sourcepath ${COMPILE_SOURCEPATH} -cp $cp -d build `find ${MAINSOURCES} ${COMPILE_FINDARGS}` | 44 | javac -sourcepath ${COMPILE_SOURCEPATH} -cp $cp -d build `find ${MAINSOURCES} ${COMPILE_FINDARGS}` |
45 | 45 | ||
46 | # Copy extraneous files | 46 | # Copy extraneous files |
47 | echo "(cd ${MAINSOURCES} && find . ${FINDARGS} -exec cp {} ../../build/{} \;)" | 47 | echo "(cd ${MAINSOURCES} && find . ${FINDARGS} -exec cp {} ../../build/{} \;)" |
48 | (cd ${MAINSOURCES} && find . ${FINDARGS} -exec cp {} ../../build/{} \;) | 48 | (cd ${MAINSOURCES} && find . ${FINDARGS} -exec cp {} ../../build/{} \;) |
49 | 49 | ||
50 | # Optionally remove stuff after compilation (needed for sourcepath hacks). | 50 | # Optionally remove stuff after compilation (needed for sourcepath hacks). |
51 | if [ ${CLEAN_PATH} ]; then | 51 | if [ ${CLEAN_PATH} ]; then |
52 | rm -rf ${CLEAN_PATH} | 52 | rm -rf ${CLEAN_PATH} |
53 | fi | 53 | fi |
54 | 54 | ||
55 | # Some projects have manifest, some have not. This works for both. | 55 | # Some projects have manifest, some have not. This works for both. |
56 | if [ -f src/conf/MANIFEST.MF ] | 56 | if [ -f src/conf/MANIFEST.MF ] |
57 | then | 57 | then |
58 | fastjar cfm ${JARFILENAME} src/conf/MANIFEST.MF -C build . | 58 | fastjar cfm ${JARFILENAME} src/conf/MANIFEST.MF -C build . |
59 | else | 59 | else |
60 | fastjar cf ${JARFILENAME} -C build . | 60 | fastjar cf ${JARFILENAME} -C build . |
61 | fi | 61 | fi |
62 | } | 62 | } |