Author: wade
Date: 2007-03-16 14:51:10 -0500 (Fri, 16 Mar 2007)
New Revision: 74483

Modified:
   trunk/release/packaging/defs/libgdiplus
   trunk/release/packaging/do-zip-build
   trunk/release/pyutils/packaging.py
Log:
libgdiplus:
-add debian machines to build libgdiplus (mainly for running mono/mcs tests)


packaging/do-zip-build:
pyutils/packaging.py:
-reverse importance order of getting the shell code
 (Try distro first, back to generic zip code)



Modified: trunk/release/packaging/defs/libgdiplus
===================================================================
--- trunk/release/packaging/defs/libgdiplus     2007-03-16 19:50:57 UTC (rev 
74482)
+++ trunk/release/packaging/defs/libgdiplus     2007-03-16 19:51:10 UTC (rev 
74483)
@@ -1,6 +1,8 @@
 web_index=4
 
 BUILD_HOSTS=(
+        debian-31-arm
+        debian-31-sparc
         fedora-3-i386
         fedora-4-i386
         fedora-4-ppc
@@ -48,6 +50,14 @@
        tags/mono-[[version]]/libgdiplus
 )
 
+ZIP_BUILD () {
+
+        ./configure --prefix=/tmp/install || exit 1
+        make || exit 1
+        make install || exit 1
+
+}
+
 sunos_8_sparc_ZIP_BUILD () {
         # Bison fails without the M4 var (tries to use /usr/ccs/bin/m4 instead 
otherwise)
 

Modified: trunk/release/packaging/do-zip-build
===================================================================
--- trunk/release/packaging/do-zip-build        2007-03-16 19:50:57 UTC (rev 
74482)
+++ trunk/release/packaging/do-zip-build        2007-03-16 19:51:10 UTC (rev 
74483)
@@ -79,6 +79,7 @@
        fd.close()
 
 build_command = ". /tmp/build_deps/env.sh ; " + build_command
+print build_command
 
 # TODO:  For some reason the above exit isn't being called on failures
 #  (Still an issue... ?)

Modified: trunk/release/pyutils/packaging.py
===================================================================
--- trunk/release/pyutils/packaging.py  2007-03-16 19:50:57 UTC (rev 74482)
+++ trunk/release/pyutils/packaging.py  2007-03-16 19:51:10 UTC (rev 74483)
@@ -528,19 +528,22 @@
                return return_val
 
        def get_zip_build_commands(self):
-               """Get build code.  First check for that os, then os-ver, and 
then os-version-arch."""
+               """Get build code.  Go from more to less specific: 
distro-ver-arch, distro-ver, distro, then generic."""
 
                my_os = self.package_env.info['os']
                my_os_version = my_os + "-" + self.package_env.info['version']
                my_distro = self.package_env.info['distro']
 
                shell_code = ""
-               for key in [my_os, my_os_version, my_distro]:
+               for key in [my_distro, my_os_version, my_os]:
                        new_key = key.replace("-", "_") + "_ZIP_BUILD"
                        shell_code = self.get_info_var(new_key)
                        if shell_code: break
 
                if not shell_code:
+                       shell_code = self.get_info_var("ZIP_BUILD")
+
+               if not shell_code:
                        print "Warning... could not find shell code..."
 
                return shell_code

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to