Author: wade
Date: 2006-07-05 20:46:34 -0400 (Wed, 05 Jul 2006)
New Revision: 62289
Modified:
trunk/release/packaging/defs/gtk-sharp-2.0
trunk/release/packaging/defs/gtk-sharp-2.8
trunk/release/pyutils/datastore.py
trunk/release/pyutils/packaging.py
Log:
gtk-sharp def files:
-fix release path tarball handling for new version standard
packaging.py:
-add def_alias fields for gtk-sharp-2.x tarball creation
datastore.py:
-oops, fix typo for invalid code
Modified: trunk/release/packaging/defs/gtk-sharp-2.0
===================================================================
--- trunk/release/packaging/defs/gtk-sharp-2.0 2006-07-05 23:09:55 UTC (rev
62288)
+++ trunk/release/packaging/defs/gtk-sharp-2.0 2006-07-06 00:46:34 UTC (rev
62289)
@@ -30,8 +30,7 @@
trunk/gtk-sharp
)
RELEASE_PATH=(
- #tags/gtk-sharp/[[gtksharp2ver]]/gtk-sharp
- tags/gtk-sharp/2.x.2/gtk-sharp
+ tags/gtk-sharp/[[gtksharp2ver]]/gtk-sharp
)
# Note, the above tags are a little weird... here's now the automation handles
them:
@@ -44,9 +43,16 @@
# I believe it's the same with ./build
get_source () {
- # TODO:
- # substitute version dot with digit.x.digit
- $SVNEXPORT $MONO_ROOT/$SVN_PATHS
+
+ # Handle the new gtk-sharp2 tag namaing standard (example tag version:
2.x.2)
+ # turn 2.8.2 into 2.x.2, and replace gtksharp2ver with it
+ gtksharp2ver_match=\\[\\[gtksharp2ver\\]\\]
+ new_version=`echo $VERSION | sed s/\.[1234567890]\./\.x\./`
+ new_path=${SVN_PATHS//$gtksharp2ver_match/${new_version}}
+
+ echo "New path: $new_path"
+
+ $SVNEXPORT $MONO_ROOT/$new_path
}
# this probably isn't getting escaped correctly... done
Modified: trunk/release/packaging/defs/gtk-sharp-2.8
===================================================================
--- trunk/release/packaging/defs/gtk-sharp-2.8 2006-07-05 23:09:55 UTC (rev
62288)
+++ trunk/release/packaging/defs/gtk-sharp-2.8 2006-07-06 00:46:34 UTC (rev
62289)
@@ -25,19 +25,6 @@
DEST_ROOT=$DISTRO
}
-HEAD_PATH=(
- trunk/gtk-sharp
-)
-RELEASE_PATH=(
- #tags/gtk-sharp/[[versiondot]]/gtk-sharp
- tags/gtk-sharp/2.x.2/gtk-sharp
-)
-
-get_source () {
- # substitute version dot with digit.x.digit
- $SVNEXPORT $MONO_ROOT/$SVN_PATHS
-}
-
# this probably isn't getting escaped correctly... done
update_version_file () {
sed -i "s/^\(GTK_SHARP_VERSION.*\)$/\1.$VERSION/" bootstrap-2.8
Modified: trunk/release/pyutils/datastore.py
===================================================================
--- trunk/release/pyutils/datastore.py 2006-07-05 23:09:55 UTC (rev 62288)
+++ trunk/release/pyutils/datastore.py 2006-07-06 00:46:34 UTC (rev 62289)
@@ -149,7 +149,7 @@
latest = utils.version_sort(versions).pop()
latest_filename = self.info[":".join([HEAD_or_RELEASE,
package_name, latest])]
except:
- print "Error getting latest tarball (%s, %s, %s)..." %
(HEAD_or_RELEASE, package_name, latest)
+ print "Error getting latest tarball (%s, %s)..." %
(HEAD_or_RELEASE, package_name)
latest_filename = ""
return latest_filename
Modified: trunk/release/pyutils/packaging.py
===================================================================
--- trunk/release/pyutils/packaging.py 2006-07-05 23:09:55 UTC (rev 62288)
+++ trunk/release/pyutils/packaging.py 2006-07-06 00:46:34 UTC (rev 62289)
@@ -190,7 +190,7 @@
# keys (regs) to grab from the def_alias if they are not in
this def file
valid_alias_key_regs = []
- for reg in ['make_dist', 'HEAD_PATH', 'get_destroot', '_ZIP_']:
+ for reg in ['make_dist', 'HEAD_PATH', 'RELEASE_PATH',
'get_destroot', '_ZIP_', 'get_source']:
valid_alias_key_regs.append(re.compile(reg))
# Check alias package so we include any information from it
that we don't include in this package (reduces maintenance redundancy)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
