From 99a92881cd0df264eb4ed0654516fe43569e3f51 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 17 Feb 2015 10:57:11 +0100 Subject: cleanup whitespace in tasks Indent with 4 spaces in task definitions. Signed-off-by: Max Krummenacher Signed-off-by: Otavio Salvador --- recipes-core/jakarta-commons/jakarta-commons.inc | 66 ++++++++++++------------ 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'recipes-core/jakarta-commons') 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 = "" # Some projects have a replaceable version number in their manifest template. do_unpackpost() { - if [ -d src/conf ] - then - find src/conf -exec \ - sed -i -e "s|@version@|${PV}|" {} \; - fi + if [ -d src/conf ] + then + find src/conf -exec \ + sed -i -e "s|@version@|${PV}|" {} \; + fi } addtask unpackpost after do_unpack before do_patch # Compile step is very similar for Jakarta commons packages do_compile() { - mkdir -p build - - if [ "${CP}" ] - then - oe_makeclasspath cp -s ${CP} - else - cp=. - fi - - echo "javac -sourcepath ${COMPILE_SOURCEPATH} -cp $cp -d build \`find ${MAINSOURCES} ${COMPILE_FINDARGS}\`" - javac -sourcepath ${COMPILE_SOURCEPATH} -cp $cp -d build `find ${MAINSOURCES} ${COMPILE_FINDARGS}` - - # Copy extraneous files - echo "(cd ${MAINSOURCES} && find . ${FINDARGS} -exec cp {} ../../build/{} \;)" - (cd ${MAINSOURCES} && find . ${FINDARGS} -exec cp {} ../../build/{} \;) - - # Optionally remove stuff after compilation (needed for sourcepath hacks). - if [ ${CLEAN_PATH} ]; then - rm -rf ${CLEAN_PATH} - fi - - # Some projects have manifest, some have not. This works for both. - if [ -f src/conf/MANIFEST.MF ] - then - fastjar cfm ${JARFILENAME} src/conf/MANIFEST.MF -C build . - else - fastjar cf ${JARFILENAME} -C build . - fi + mkdir -p build + + if [ "${CP}" ] + then + oe_makeclasspath cp -s ${CP} + else + cp=. + fi + + echo "javac -sourcepath ${COMPILE_SOURCEPATH} -cp $cp -d build \`find ${MAINSOURCES} ${COMPILE_FINDARGS}\`" + javac -sourcepath ${COMPILE_SOURCEPATH} -cp $cp -d build `find ${MAINSOURCES} ${COMPILE_FINDARGS}` + + # Copy extraneous files + echo "(cd ${MAINSOURCES} && find . ${FINDARGS} -exec cp {} ../../build/{} \;)" + (cd ${MAINSOURCES} && find . ${FINDARGS} -exec cp {} ../../build/{} \;) + + # Optionally remove stuff after compilation (needed for sourcepath hacks). + if [ ${CLEAN_PATH} ]; then + rm -rf ${CLEAN_PATH} + fi + + # Some projects have manifest, some have not. This works for both. + if [ -f src/conf/MANIFEST.MF ] + then + fastjar cfm ${JARFILENAME} src/conf/MANIFEST.MF -C build . + else + fastjar cf ${JARFILENAME} -C build . + fi } -- cgit v1.2.3-54-g00ecf