r31 - in tools: devel/trunk scripts/trunk tools/trunk

[Dennis Gregorovic <dgregoro@xxxxxxxxxxxxxxxxxxxxxxxxx>]

Author: dgregoro
Date: 2004-10-06 00:13:44 +0200 (Wed, 06 Oct 2004)
New Revision: 31

Modified:
   tools/devel/trunk/make-zip.sh
   tools/scripts/trunk/make-zip.sh
   tools/tools/trunk/make-zip.sh
Log:
move, don't copy the zip file if X_CCM_DIST_ZIP_DIR is set

Modified: tools/devel/trunk/make-zip.sh
===================================================================
--- tools/devel/trunk/make-zip.sh       2004-10-05 22:05:41 UTC (rev 30)
+++ tools/devel/trunk/make-zip.sh       2004-10-05 22:13:44 UTC (rev 31)
@@ -65,13 +65,14 @@
   zip -r $FILENAME * -x "*.cvsignore"
 )
 
-mv $BUILD_HOME/$FILENAME .
 
 if [ "x$X_CCM_DIST_ZIP_DIR" != "x" ]; then
-  cp $FILENAME $X_CCM_DIST_ZIP_DIR
+  mkdir -p "$X_CCM_DIST_ZIP_DIR"
+  mv "$BUILD_HOME/$FILENAME" "$X_CCM_DIST_ZIP_DIR"
+  echo "Wrote $X_CCM_DIST_ZIP_DIR/$FILENAME"
+else
+  mv "$BUILD_HOME/$FILENAME" .
+  echo "Wrote $FILENAME"
 fi
 
-echo "Wrote $FILENAME"
-
-rm -rf $BUILD_DIR
-
+rm -rf "$BUILD_HOME"

Modified: tools/scripts/trunk/make-zip.sh
===================================================================
--- tools/scripts/trunk/make-zip.sh     2004-10-05 22:05:41 UTC (rev 30)
+++ tools/scripts/trunk/make-zip.sh     2004-10-05 22:13:44 UTC (rev 31)
@@ -42,13 +42,15 @@
   zip -r "$FILENAME" *
 )
 
-mv "$BUILD_HOME/$FILENAME" .
 
 if [ "x$X_CCM_DIST_ZIP_DIR" != "x" ]; then
-  cp "$FILENAME" "$X_CCM_DIST_ZIP_DIR"
+  mkdir -p "$X_CCM_DIST_ZIP_DIR"
+  mv "$BUILD_HOME/$FILENAME" "$X_CCM_DIST_ZIP_DIR"
+  echo "Wrote $X_CCM_DIST_ZIP_DIR/$FILENAME"
+else
+  mv "$BUILD_HOME/$FILENAME" .
+  echo "Wrote $FILENAME"
 fi
 
-echo "Wrote $FILENAME"
+rm -rf "$BUILD_HOME"
 
-rm -rf "$BUILD_DIR"
-

Modified: tools/tools/trunk/make-zip.sh
===================================================================
--- tools/tools/trunk/make-zip.sh       2004-10-05 22:05:41 UTC (rev 30)
+++ tools/tools/trunk/make-zip.sh       2004-10-05 22:13:44 UTC (rev 31)
@@ -136,12 +136,14 @@
   zip -r "$FILENAME" *
 )
 
-mv "$BUILD_HOME/$FILENAME" .
 
 if [ "x$X_CCM_DIST_ZIP_DIR" != "x" ]; then
-  cp "$FILENAME" "$X_CCM_DIST_ZIP_DIR"
+  mkdir -p "$X_CCM_DIST_ZIP_DIR"
+  mv "$BUILD_HOME/$FILENAME" "$X_CCM_DIST_ZIP_DIR"
+  echo "Wrote $X_CCM_DIST_ZIP_DIR/$FILENAME"
+else
+  mv "$BUILD_HOME/$FILENAME" .
+  echo "Wrote $FILENAME"
 fi
 
 rm -rf "$BUILD_HOME"
-
-echo "Wrote $FILENAME"