Author: wade
Date: 2007-10-17 11:08:46 -0400 (Wed, 17 Oct 2007)
New Revision: 87685
Modified:
trunk/release/packaging/build
trunk/release/packaging/defs/mono
trunk/release/packaging/defs/mono-basic
trunk/release/packaging/defs/olive
trunk/release/packaging/do-zip-build
Log:
build:
do-zip-build:
-set version environment for build and tests... remove this from do-zip-build
defs/*:
-add date and version to the status api step
Modified: trunk/release/packaging/build
===================================================================
--- trunk/release/packaging/build 2007-10-17 15:07:13 UTC (rev 87684)
+++ trunk/release/packaging/build 2007-10-17 15:08:46 UTC (rev 87685)
@@ -302,6 +302,7 @@
conf.env_vars['DISTRO'] = distro
conf.env_vars['BUILD_OS'] = conf.info['os']
conf.env_vars['BUILD_ARCH'] = conf.info['arch']
+conf.env_vars['version'] = version
# Put in a function rather than copy and paste...
def build_failed(conf, code, LOGFILE, build_info, package):
Modified: trunk/release/packaging/defs/mono
===================================================================
--- trunk/release/packaging/defs/mono 2007-10-17 15:07:13 UTC (rev 87684)
+++ trunk/release/packaging/defs/mono 2007-10-17 15:08:46 UTC (rev 87685)
@@ -379,14 +379,18 @@
DISPLAY=x64-linux-2.mono.lab.novell.com:1
export DISPLAY
+ failure=0
+
cd mcs/class/System.Drawing
- $make_path run-test
- $make_path run-test PROFILE=net_2_0
+ $make_path run-test || failure=1
+ $make_path run-test PROFILE=net_2_0 || failure=1
cd ../Managed.Windows.Forms
- $make_path run-test
- $make_path run-test PROFILE=net_2_0
+ $make_path run-test || failure=1
+ $make_path run-test PROFILE=net_2_0 || failure=1
+ exit $failure
+
}
POSTBUILD_STEP_NAME6="test-ondotnet"
@@ -498,6 +502,8 @@
mkdir infos
mkdir src
+ echo "<p>Date: `date`</p>" >> deploy/index.html
+ echo "<p>Revision: $version</p>" >> deploy/index.html
echo "<ul>" >> deploy/index.html
export MONO_PATH=../mcs/class/lib/$PROFILE
Modified: trunk/release/packaging/defs/mono-basic
===================================================================
--- trunk/release/packaging/defs/mono-basic 2007-10-17 15:07:13 UTC (rev
87684)
+++ trunk/release/packaging/defs/mono-basic 2007-10-17 15:08:46 UTC (rev
87685)
@@ -177,6 +177,8 @@
mkdir infos
mkdir src
+ echo "<p>Date: `date`</p>" >> deploy/index.html
+ echo "<p>Revision: $version</p>" >> deploy/index.html
echo "<ul>" >> deploy/index.html
# Output to step-output dir, which will get recursively copied back to
the build info
Modified: trunk/release/packaging/defs/olive
===================================================================
--- trunk/release/packaging/defs/olive 2007-10-17 15:07:13 UTC (rev 87684)
+++ trunk/release/packaging/defs/olive 2007-10-17 15:08:46 UTC (rev 87685)
@@ -62,6 +62,8 @@
mkdir infos
mkdir src
+ echo "<p>Date: `date`</p>" >> deploy/index.html
+ echo "<p>Revision: $version</p>" >> deploy/index.html
echo "<ul>" >> deploy/index.html
# Output to step-output dir, which will get recursively copied back to
the build info
Modified: trunk/release/packaging/do-zip-build
===================================================================
--- trunk/release/packaging/do-zip-build 2007-10-17 15:07:13 UTC (rev
87684)
+++ trunk/release/packaging/do-zip-build 2007-10-17 15:08:46 UTC (rev
87685)
@@ -54,8 +54,7 @@
# Get code from def file
shell_code = pack_def.get_zip_build_commands()
-# set version var, load up environment for deps, and execute build command
-os.environ['version'] = version
+# load up environment for deps, and execute build command
build_command = shell_code
# Trying to load this missing file fails on solaris 10... ?
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
