cleanup is now done separately and only if requested. Yes, getting messy ...

[jprojects-scripts.git] / build-dist-all.sh

diff --git a/build-dist-all.sh b/build-dist-all.sh
index 5ac2a3e6fe165fbb4772a9abbcea01979f5d57bc..5c2da7771a78e60d1d20e96eb0b09793849f2b76 100755 (executable)
--- a/build-dist-all.sh
+++ b/build-dist-all.sh
@@ -3,10 +3,14 @@
 . ./.jprojects.sh || exit 255
 
 for project in ${LIST}; do
-       if [ ! -d "${JPROJECTS_HOME}/${project}" ]
+       if [ "${project}" = "jprojects-scripts" ]
+       then
+               echo "$0: Skipping jprojects-scripts ..."
+               continue
+       elif [ ! -d "${JPROJECTS_HOME}/${project}" ]
        then
                echo "$0: Project '${project}' does not exist."
-               continue;
+               continue
        fi
 
        echo "$0: Executing '${project}' ..."
@@ -23,8 +27,14 @@ for project in ${LIST}; do
 
        if [ -x "${ANT_BIN}" -a "$1" != "d" ]
        then
-               # Cleanup project and build JAR
-               ${ANT_BIN} clean jar
+               if [ "$1" = "c" ]
+               then
+                       # Cleanup
+                       ${ANT_BIN} clean
+               fi
+
+               # Build JAR
+               ${ANT_BIN} jar
 
                # Save status
                STATUS="$?"
@@ -33,7 +43,7 @@ for project in ${LIST}; do
                if [ "${STATUS}" != "0" ]
                then
                        # This has failed, so try "dist"
-                       ${ANT_BIN} clean dist
+                       ${ANT_BIN} dist
                        STATUS="$?"
 
                        # Still failing? Oh, to bad
@@ -53,7 +63,12 @@ for project in ${LIST}; do
                echo "$0: Error: Project '${project}' has non-executable dist.sh!"
                exit 1
        else
-               ./dist.sh
+               if [ "$1" = "r" ]
+               then
+                       ./dist.sh r
+               else
+                       ./dist.sh
+               fi
        fi
 done