Author: wade
Date: 2007-07-12 17:47:08 -0400 (Thu, 12 Jul 2007)
New Revision: 81910
Modified:
trunk/release/conf/olive/ximian-build.conf
trunk/release/monobuild/buildserver.py
trunk/release/packaging/build-all
trunk/release/pyutils/config.py
trunk/release/pyutils/packaging.py
Log:
build-all:
-make sure logs dir exists (mainly for new installs)
olive/ximian-build.conf:
-update filelist for new assemblies and .pc files
buildserver.py:
-check for missing dirs so we don't error out (mainly for new installs)
pyutils/packaging.py:
-don't use version selection reg on HEAD, since we only use svn rev for
HEAD versions now.
pyutils/config.py:
-friendlier platform list
Modified: trunk/release/conf/olive/ximian-build.conf
===================================================================
--- trunk/release/conf/olive/ximian-build.conf 2007-07-12 21:40:21 UTC (rev
81909)
+++ trunk/release/conf/olive/ximian-build.conf 2007-07-12 21:47:08 UTC (rev
81910)
@@ -66,21 +66,33 @@
<i>[[usrprefix]]/lib/mono/3.0/System.Runtime.Serialization.dll*</i>
<i>[[usrprefix]]/lib/mono/gac/System.ServiceModel</i>
- <i>[[usrprefix]]/lib/mono/3.0/System.ServiceModel.dll*</i>
+ <i>[[usrprefix]]/lib/mono/3.0/System.ServiceModel.dll*</i>
<i>[[usrprefix]]/lib/mono/gac/System.Workflow.Activities</i>
- <i>[[usrprefix]]/lib/mono/3.0/System.Workflow.Activities.dll*</i>
+ <i>[[usrprefix]]/lib/mono/3.0/System.Workflow.Activities.dll*</i>
<i>[[usrprefix]]/lib/mono/gac/System.Workflow.ComponentModel</i>
- <i>[[usrprefix]]/lib/mono/3.0/System.Workflow.ComponentModel.dll*</i>
+ <i>[[usrprefix]]/lib/mono/3.0/System.Workflow.ComponentModel.dll*</i>
<i>[[usrprefix]]/lib/mono/gac/System.Xml.Linq</i>
- <i>[[usrprefix]]/lib/mono/3.0/System.Xml.Linq.dll*</i>
+ <i>[[usrprefix]]/lib/mono/3.0/System.Xml.Linq.dll*</i>
<i>[[usrprefix]]/lib/mono/gac/System.ServiceModel.Web</i>
- <i>[[usrprefix]]/lib/mono/3.0/System.ServiceModel.Web*</i>
+ <i>[[usrprefix]]/lib/mono/3.0/System.ServiceModel.Web*</i>
- <i>[[usrprefix]]/lib/pkgconfig/olive.pc</i>
+ <i>[[usrprefix]]/lib/mono/gac/PresentationCore</i>
+ <i>[[usrprefix]]/lib/mono/3.0/PresentationCore*</i>
+
+ <i>[[usrprefix]]/lib/mono/gac/System.SilverLight</i>
+ <i>[[usrprefix]]/lib/mono/3.0/System.SilverLight*</i>
+
+ <i>[[usrprefix]]/lib/mono/gac/agmono</i>
+ <i>[[usrprefix]]/lib/mono/3.0/agmono*</i>
+
+ <i>[[usrprefix]]/lib/mono/gac/agclr</i>
+ <i>[[usrprefix]]/lib/mono/3.0/agclr*</i>
+
+ <i>[[usrprefix]]/lib/pkgconfig/*.pc</i>
</files>
<docs>
Modified: trunk/release/monobuild/buildserver.py
===================================================================
--- trunk/release/monobuild/buildserver.py 2007-07-12 21:40:21 UTC (rev
81909)
+++ trunk/release/monobuild/buildserver.py 2007-07-12 21:47:08 UTC (rev
81910)
@@ -312,27 +312,29 @@
#sync_log.log(" *** Gathering dirs ***\n")
- try:
- # Gather dirs to synchronize
- for i in ['HEAD', 'RELEASE']:
- for distro in
os.listdir(config.build_info_dir + os.sep + i):
- for component in
os.listdir(config.build_info_dir + os.sep + i + os.sep + distro):
- # Get the last
'num_builds' number of elements from the list
- versions =
build.get_versions(i, distro, component)[-self.sync_num_builds:]
- for j in versions:
-
dirs.append(os.path.join('monobuild/www/builds', i, distro, component, j))
+ # Gather dirs to synchronize
+ for i in ['HEAD', 'RELEASE']:
+ i_dir = config.build_info_dir + os.sep + i
+ if os.path.exists(i_dir):
+ for distro in os.listdir(i_dir):
+ distro_dir = i_dir + os.sep +
distro
+ if os.path.exists(distro_dir):
+ for component in
os.listdir(distro_dir):
+ # Get the last
'num_builds' number of elements from the list
+ versions =
build.get_versions(i, distro, component)[-self.sync_num_builds:]
+ for j in
versions:
+
dirs.append(os.path.join('monobuild/www/builds', i, distro, component, j))
- # Grab latest num_builds for tarball
log files as well
- tarball_path =
os.path.join(config.build_info_dir, '..', 'tarball_logs', i)
+ # Grab latest num_builds for tarball log files
as well
+ tarball_path =
os.path.join(config.build_info_dir, '..', 'tarball_logs', i)
+ if os.path.exists(tarball_path):
for component in
os.listdir(tarball_path):
- versions =
os.listdir(tarball_path + os.sep + component)
+ component_dir = tarball_path +
os.sep + component
+ versions =
os.listdir(component_dir)
versions.sort()
for j in
versions[-self.sync_num_builds:]:
dirs.append(os.path.join('monobuild/www/tarball_logs', i, component, j))
- except:
- sync_log.log("Catching missing dir
exceptions...\n")
-
# conduct a dirs string up to the length of the max arg
length, and run rsync for each of those blocks (what's the real maximum?)
while len(dirs):
Modified: trunk/release/packaging/build-all
===================================================================
--- trunk/release/packaging/build-all 2007-07-12 21:40:21 UTC (rev 81909)
+++ trunk/release/packaging/build-all 2007-07-12 21:47:08 UTC (rev 81910)
@@ -19,6 +19,7 @@
PIDS=()
+mkdir -p logs
for distro in [EMAIL PROTECTED]; do
echo Starting $distro
./build --suppress_output --skip_steps $distro $package $version
$release > logs/build-all.$distro.$package.$version-$release 2>&1 &
Modified: trunk/release/pyutils/config.py
===================================================================
--- trunk/release/pyutils/config.py 2007-07-12 21:40:21 UTC (rev 81909)
+++ trunk/release/pyutils/config.py 2007-07-12 21:47:08 UTC (rev 81910)
@@ -84,7 +84,22 @@
sd_sequential_build_packages = [ 'mono', 'mono-1.1.13' ]
# List of platforms/packages
-sd_latest_build_distros = [ 'redhat-9-i386', 'sles-9-x86_64', 'win-4-i386',
'macos-10-ppc', 'macos-10-x86', 'sunos-8-sparc', 'sunos-10-x86', 'sles-9-ia64',
'sles-9-s390', 'sles-9-s390x', 'sles-9-ppc', 'debian-31-arm',
'debian-31-sparc', 'suse-100-i586' ]
+sd_latest_build_distros = """
+ sles-9-i586
+ sles-9-x86_64
+ win-4-i386
+ macos-10-ppc
+ macos-10-x86
+ sunos-8-sparc
+ sunos-10-x86
+ sles-9-ia64
+ sles-9-s390
+ sles-9-s390x
+ sles-9-ppc
+ debian-4-arm
+ debian-4-sparc
+ suse-100-i586
+""".split()
sd_latest_build_packages = td_packages
##############################################
Modified: trunk/release/pyutils/packaging.py
===================================================================
--- trunk/release/pyutils/packaging.py 2007-07-12 21:40:21 UTC (rev 81909)
+++ trunk/release/pyutils/packaging.py 2007-07-12 21:47:08 UTC (rev 81910)
@@ -441,7 +441,12 @@
if not self.version:
if not self.latest_version:
- self.latest_version =
utils.get_latest_ver(self.package_fullpath, fail_on_missing=fail_on_missing,
version_reg=self.get_info_var('version_selection_reg'))
+ # Only use the version_selection_reg on
RELEASE, since 'version' is replaced with the subversion revision
+ # with HEAD
+ version_selection_reg = ""
+ if self.HEAD_or_RELEASE == "RELEASE":
+ version_selection_reg =
self.get_info_var('version_selection_reg')
+ self.latest_version =
utils.get_latest_ver(self.package_fullpath, fail_on_missing=fail_on_missing,
version_reg=version_selection_reg )
if self.bundle_obj.version_map_exists:
# Cases
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
