Author: wade
Date: 2005-12-09 11:03:16 -0500 (Fri, 09 Dec 2005)
New Revision: 54165
Modified:
trunk/release/packaging/
trunk/release/packaging/build
Log:
Use snapshot package place for zips as well
(So that windows installer doesn't pick up snapshots)
Property changes on: trunk/release/packaging
___________________________________________________________________
Name: svn:ignore
- packages
snapshot_packages
zip_packages
external_zip_pkg
external_packages
bscripts
logs
sources
snapshot_sources
tarball_map
+ packages
snapshot_packages
snapshot_zip_packages
zip_packages
external_zip_pkg
external_packages
bscripts
logs
sources
snapshot_sources
tarball_map
Modified: trunk/release/packaging/build
===================================================================
--- trunk/release/packaging/build 2005-12-09 13:33:36 UTC (rev 54164)
+++ trunk/release/packaging/build 2005-12-09 16:03:16 UTC (rev 54165)
@@ -58,21 +58,26 @@
VER_PATH="$version-$serial"
fi
+# Set some defaults of where to find packages/sources
+source_path=sources
+if [ ! -z $USE_ZIP_PKG ]; then
+ package_path=zip_packages
+else
+ package_path=packages
+fi
+
# Figure out if this is a snapshot build or not...
if [ -e sources/$package/*-$version.tar.gz ]; then
- source_path=sources
- package_path=packages
+ echo "Using release sources and packages"
elif [ -e snapshot_sources/$package/*-$version.tar.gz ]; then
- source_path=snapshot_sources
- package_path=snapshot_packages
+ echo "Using snapshot sources and packages"
+ source_path="snapshot_${source_path}"
+ package_path="snapshot_${package_path}"
else
echo Cannot find source file for $package
exit 1
fi
-if [ ! -z $USE_ZIP_PKG ]; then
- package_path=zip_packages
-fi
if [ -d $package_path/$DEST_ROOT/$package/$VER_PATH ]; then
echo "The path for this package
($package_path/$DEST_ROOT/$package/$VER_PATH) already exists. You probably need
to bump the revision number"
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches