[Aplaws-commit] r919 - in trunk/tools: devel scripts scripts/bin

[<ap...@vh...>]

Author: apevec
Date: 2005-09-23 14:13:43 +0200 (Fri, 23 Sep 2005)
New Revision: 919

Modified:
   trunk/tools/devel/make-zip.sh
   trunk/tools/scripts/bin/make-zip
   trunk/tools/scripts/make-zip.sh
Log:
don't include .svn in ZIP distro


Modified: trunk/tools/devel/make-zip.sh
===================================================================
--- trunk/tools/devel/make-zip.sh	2005-09-23 10:51:35 UTC (rev 918)
+++ trunk/tools/devel/make-zip.sh	2005-09-23 12:13:43 UTC (rev 919)
@@ -46,7 +46,7 @@
 mkdir -p $BUILD_DIR/usr/share/ccm-devel/projects
 mkdir -p $BUILD_DIR/usr/share/ccm-devel/applications
 
-for file in `find template/ -type f | grep -v Makefile`
+for file in `find template/ -name '.svn' -prune -o -type f -not -name "Makefile*" -not -name "*~" -not -name '.cvsignore' -printf '%p\n'`
 do
   target="usr/share/ccm-devel/`echo $file | sed -e 's/custom/@@appname@@/'`"
   dir=`echo $target | sed -e 's/\/[^\/]*$//'`

Modified: trunk/tools/scripts/bin/make-zip
===================================================================
--- trunk/tools/scripts/bin/make-zip	2005-09-23 10:51:35 UTC (rev 918)
+++ trunk/tools/scripts/bin/make-zip	2005-09-23 12:13:43 UTC (rev 919)
@@ -78,9 +78,9 @@
 
 unlink File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip");
 chdir $ccm_inst_webapp_dir;
-$command = "zip -r ";
+$command = "find . -name .svn -prune -o -type f -printf '%P\n' | zip -@ ";
 $command .= "-y " if ($^O ne 'MSWin32');
-$command .= File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip") . " *";
+$command .= File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip");
 `$command`;
 print File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip") . "\n";
 if ( !defined $ENV{'CCM_DIST_NOTARS'} || $ENV{'CCM_DIST_NOTARS'} ne '1' ) {
@@ -92,7 +92,7 @@
         $file =~ s,\\,/,g;
         $file =~ s,^([a-zA-Z]):,/cygdrive/$1,;
     }
-    CCM::CommandsUtil::runAndExitOnError("tar -cf $file *");
+    CCM::CommandsUtil::runAndExitOnError("find . -name .svn -prune -o -type f -printf '%P\n' | tar -cfT $file -");
     CCM::CommandsUtil::runAndExitOnError("gzip -f $file");
     print "$file\n";
 }

Modified: trunk/tools/scripts/make-zip.sh
===================================================================
--- trunk/tools/scripts/make-zip.sh	2005-09-23 10:51:35 UTC (rev 918)
+++ trunk/tools/scripts/make-zip.sh	2005-09-23 12:13:43 UTC (rev 919)
@@ -21,7 +21,7 @@
 cp bin/make-zip "$BUILD_DIR/usr/share/ccm-scripts/bin"
 cp bin/make-source "$BUILD_DIR/usr/share/ccm-scripts/bin"
 
-cp --parents `find pkg -type f | grep -v Makefile | grep -v "~" | grep -v "pl.test"` "$BUILD_DIR/usr/share/ccm-scripts"
+cp --parents `find pkg -name '.svn' -prune -o -type f -not -name "Makefile*" -not -name "*~" -not -name "pl.test" -not -name '.cvsignore' -printf '%p\n'` "$BUILD_DIR/usr/share/ccm-scripts"
 
 mkdir -p "$BUILD_DIR/usr/share/ccm-devel"
 cp --parents template/rollingbuild.cmd "$BUILD_DIR/usr/share/ccm-devel"