Menu
▾
▴
[Aplaws-commit] r921 - in releases/1.0.3/tools: devel misc scripts scripts/bin
|
From: <ap...@vh...> - 2005-09-23 12:32:26
|
Author: apevec
Date: 2005-09-23 14:22:38 +0200 (Fri, 23 Sep 2005)
New Revision: 921
Modified:
releases/1.0.3/tools/devel/make-zip.sh
releases/1.0.3/tools/misc/build-all.sh
releases/1.0.3/tools/scripts/bin/make-zip
releases/1.0.3/tools/scripts/make-zip.sh
Log:
merge tools fixes 918 and 919 from the trunk
Modified: releases/1.0.3/tools/devel/make-zip.sh
===================================================================
--- releases/1.0.3/tools/devel/make-zip.sh 2005-09-23 12:22:34 UTC (rev 920)
+++ releases/1.0.3/tools/devel/make-zip.sh 2005-09-23 12:22:38 UTC (rev 921)
@@ -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: releases/1.0.3/tools/misc/build-all.sh
===================================================================
--- releases/1.0.3/tools/misc/build-all.sh 2005-09-23 12:22:34 UTC (rev 920)
+++ releases/1.0.3/tools/misc/build-all.sh 2005-09-23 12:22:38 UTC (rev 921)
@@ -602,31 +602,33 @@
(
set -e
- BUNDLE_VERSION=`grep 'VERSION=' tools/bundle/configure.in | sed -e 's/VERSION=//'`
- BUNDLE_RELEASE=`grep 'RELEASE=' tools/bundle/configure.in | sed -e 's/RELEASE=//'`
- TOOLS_VERSION=`grep 'VERSION=' tools/tools/configure.in | sed -e 's/VERSION=//'`
- TOOLS_RELEASE=`grep 'RELEASE=' tools/tools/configure.in | sed -e 's/RELEASE=//'`
- DEVEL_VERSION=`grep 'VERSION=' tools/devel/configure.in | sed -e 's/VERSION=//'`
- DEVEL_RELEASE=`grep 'RELEASE=' tools/devel/configure.in | sed -e 's/RELEASE=//'`
- SCRIPTS_VERSION=`grep 'VERSION=' tools/scripts/configure.in | sed -e 's/VERSION=//'`
- SCRIPTS_RELEASE=`grep 'RELEASE=' tools/scripts/configure.in | sed -e 's/RELEASE=//'`
- cp $HOMERPMDIR/junit-3.8.1-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/junitperf-1.8-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/httpunit-1.5.4-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-java-1.0-1.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/junit-3.8.1-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/servlet-2.3-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
-# cp $HOMERPMDIR/servlet-2.2-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-tools-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-tools-servlet-tomcat-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-tools-servlet-resin-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-devel-$DEVEL_VERSION-$DEVEL_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-devel-perforce-$DEVEL_VERSION-$DEVEL_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-devel-cvs-$DEVEL_VERSION-$DEVEL_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-scripts-$SCRIPTS_VERSION-$SCRIPTS_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-tools-bundle-$BUNDLE_VERSION-$BUNDLE_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
+ BUNDLE_RADIX=`rpm -q --specfile tools/bundle/ccm-tools-bundle.spec`
+ TOOLS_RADIX=`rpm -q --specfile tools/tools/ccm-tools.spec`
+ DEVEL_RADIX=`rpm -q --specfile tools/devel/ccm-devel.spec`
+ SCRIPTS_RADIX=`rpm -q --specfile tools/scripts/ccm-scripts.spec`
+ JUNIT_RADIX=`rpm -q --specfile tools/rpms/junit/junit.spec`
+ JUNITPERF_RADIX=`rpm -q --specfile tools/rpms/junitperf/junitperf.spec`
+ HTTPUNIT_RADIX=`rpm -q --specfile tools/rpms/httpunit/httpunit.spec`
+ CCM_JAVA_RADIX=`rpm -q --specfile tools/rpms/ccm-java/ccm-java.spec`
+ SERVLET_RADIX=`rpm -q --specfile tools/rpms/servlet/servlet.spec`
+ tools_chop=${TOOLS_RADIX%-*}
+ TOOLS_VERSION=${tools_chop##*-}
+ devel_chop=${DEVEL_RADIX%-*}
+ DEVEL_VERSION=${devel_chop##*-}
+ scripts_chop=${SCRIPTS_RADIX%-*}
+ SCRIPTS_VERSION=${scripts_chop##*-}
+
+ for radix in $BUNDLE_RADIX $TOOLS_RADIX $DEVEL_RADIX $SCRIPTS_RADIX $JUNIT_RADIX $JUNITPERF_RADIX $HTTPUNIT_RADIX $CCM_JAVA_RADIX $SERVLET_RADIX
+ do
+ cp ${HOMERPMDIR}/${radix}.noarch.rpm ${BUILD_HOME}/dist/runtime/RPMS
+ if [ -f ${HOMESRPMDIR}/${radix}.src.rpm ]
+ then
+ cp ${HOMESRPMDIR}/${radix}.src.rpm ${BUILD_HOME}/dist/runtime/SRPMS
+ fi
+ done
+
if [ "x$CCM_DIST_NOZIPS" != "x1" ]; then
cp tools/tools/ccm-tools-$TOOLS_VERSION.zip $BUILD_HOME/dist/runtime/ZIPS
cp tools/tools/ccm-tools-servlet-tomcat-$TOOLS_VERSION.zip $BUILD_HOME/dist/runtime/ZIPS
@@ -635,17 +637,6 @@
cp tools/scripts/ccm-scripts-$SCRIPTS_VERSION.zip $BUILD_HOME/dist/runtime/ZIPS
fi
- cp $HOMESRPMDIR/junit-3.8.1-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/junitperf-1.8-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/httpunit-1.5.4-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/ccm-java-1.0-1.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/junit-3.8.1-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/servlet-2.3-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
-# cp $HOMERPMDIR/servlet-2.2-1ccm.src.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMESRPMDIR/ccm-tools-$TOOLS_VERSION-$TOOLS_RELEASE.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/ccm-devel-$DEVEL_VERSION-$DEVEL_RELEASE.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/ccm-scripts-$SCRIPTS_VERSION-$SCRIPTS_RELEASE.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/ccm-tools-bundle-$BUNDLE_VERSION-$BUNDLE_RELEASE.src.rpm $BUILD_HOME/dist/runtime/SRPMS
)
for DOC in $RUNTIME_DOCS
Modified: releases/1.0.3/tools/scripts/bin/make-zip
===================================================================
--- releases/1.0.3/tools/scripts/bin/make-zip 2005-09-23 12:22:34 UTC (rev 920)
+++ releases/1.0.3/tools/scripts/bin/make-zip 2005-09-23 12:22:38 UTC (rev 921)
@@ -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: releases/1.0.3/tools/scripts/make-zip.sh
===================================================================
--- releases/1.0.3/tools/scripts/make-zip.sh 2005-09-23 12:22:34 UTC (rev 920)
+++ releases/1.0.3/tools/scripts/make-zip.sh 2005-09-23 12:22:38 UTC (rev 921)
@@ -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"
|
