Author: wade
Date: 2006-06-21 14:31:49 -0400 (Wed, 21 Jun 2006)
New Revision: 61913

Modified:
   trunk/release/macosx/new/buildpackage
   trunk/release/packaging/dep_defs/macosx
   trunk/release/packaging/do-dep-build
Log:
do-dep-build:
-add support for post build commands

dep_defs/macosx:
-add post build commands to clean out unecessary files for building and
creating the installer

macosx/new/buildpackage:
-no need to clean up unneeded files here anymore.
-include .a files



Modified: trunk/release/macosx/new/buildpackage
===================================================================
--- trunk/release/macosx/new/buildpackage       2006-06-21 17:06:56 UTC (rev 
61912)
+++ trunk/release/macosx/new/buildpackage       2006-06-21 18:31:49 UTC (rev 
61913)
@@ -86,7 +86,7 @@
        # Strip files to save space
        # These were in the old script as "cleanup"
        env.ssh.print_command=1
-       env.ssh.execute("cd %s%s;   rm bin/gettext* bin/ngettext bin/xgettext; 
rm bin/glib-* ; rm bin/gobject-query ; rm lib/lib*a ; strip bin/pedump 
bin/monodiet bin/monodis bin/jay bin/monograph ; rm -rf share/gtk-doc " % 
(remote_PKGROOT, prefix ) )
+       env.ssh.execute("cd %s%s; strip bin/*  " % (remote_PKGROOT, prefix ) )
 
        if os.path.exists(temp_dir): shutil.rmtree(temp_dir)
        distutils.dir_util.mkpath(temp_dir)

Modified: trunk/release/packaging/dep_defs/macosx
===================================================================
--- trunk/release/packaging/dep_defs/macosx     2006-06-21 17:06:56 UTC (rev 
61912)
+++ trunk/release/packaging/dep_defs/macosx     2006-06-21 18:31:49 UTC (rev 
61913)
@@ -11,11 +11,28 @@
        },
        {
                'name': 'gettext', 
-               'source': 
'http://ftp.gnu.org/pub/gnu/gettext/gettext-0.14.1.tar.gz'
+               'source': 
'http://ftp.gnu.org/pub/gnu/gettext/gettext-0.14.1.tar.gz',
+               'post':"""
+                       # Save msgfmt, as this is needed for building glib
+                       rm -Rf /tmp/temp_install
+                       mkdir -p /tmp/temp_install/bin
+                       mv /tmp/install/bin/msgfmt /tmp/temp_install/bin
+
+                       rm -Rf /tmp/install/bin/*
+                       rm -Rf /tmp/install/share/doc
+                       rm -Rf /tmp/install/share/emacs
+                       rm -Rf /tmp/install/share/gettext
+
+                       mv /tmp/temp_install/bin/msgfmt /tmp/install/bin
+                       """
        },
        {
                'name': 'glib', 
-               'source': 'ftp://ftp.gtk.org/pub/gtk/v2.6/glib-2.6.3.tar.bz2'
+               'source': 'ftp://ftp.gtk.org/pub/gtk/v2.6/glib-2.6.3.tar.bz2',
+               'post':"""
+                       rm -Rf /tmp/install/bin/*
+                       rm -Rf /tmp/install/share/gtk-doc
+                       """
        },
        {
                'name': 'jpeg', 
@@ -46,15 +63,24 @@
                'name': 'libpng',
                # Otherwise version turns out to be 1.2.8-config 
                'version': '1.2.8', 
-               'source': 
'http://easynews.dl.sourceforge.net/sourceforge/libpng/libpng-1.2.8-config.tar.gz'
+               'source': 
'http://easynews.dl.sourceforge.net/sourceforge/libpng/libpng-1.2.8-config.tar.gz',
+               'post':"""
+                       rm -Rf /tmp/install/bin/*
+                       """
        },
        {
                'name': 'libungif', 
-               'source': 
'http://easynews.dl.sourceforge.net/sourceforge/libungif/libungif-4.1.3.tar.gz'
+               'source': 
'http://easynews.dl.sourceforge.net/sourceforge/libungif/libungif-4.1.3.tar.gz',
+               'post':"""
+                       rm -Rf /tmp/install/bin/*
+                       """
        },
        {
                'name': 'freetype', 
-               'source': 
'http://download.savannah.gnu.org/releases/freetype/freetype-2.1.10.tar.gz'
+               'source': 
'http://download.savannah.gnu.org/releases/freetype/freetype-2.1.10.tar.gz',
+               'post':"""
+                       rm -Rf /tmp/install/bin/*
+                       """
        }
 ]
 

Modified: trunk/release/packaging/do-dep-build
===================================================================
--- trunk/release/packaging/do-dep-build        2006-06-21 17:06:56 UTC (rev 
61912)
+++ trunk/release/packaging/do-dep-build        2006-06-21 18:31:49 UTC (rev 
61913)
@@ -105,7 +105,17 @@
                        print "Error building " + pack['name']
                        sys.exit(1)
 
+               # Run a post command if there is one
+               post_command = utils.get_dict_var('post', pack)
+               if post_command:
+                       print " --- Post Build: " + pack['name'] + " ---"
+                       code, output = utils.launch_process(env_string + 
post_command)
 
+                       if code:
+                               print "Error running post command for " + 
pack['name']
+                               sys.exit(1)
+
+
                os.chdir('/tmp/install')
                
                print " --- Archiving: " + pack['name'] + " ---"

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

Reply via email to