Permalink
Browse files

Fixes/updates for new packaging infrastructure

  • Loading branch information...
1 parent 37c0a04 commit 71c14bd0c01c75c7e2a3cb0991b8fd1d97208e70 @chkn chkn committed Jul 29, 2011
View
34 macosx/buildpackage
@@ -19,7 +19,7 @@ import packaging
# Which noarch packages to include in the various packages
packages_to_include = {}
-packages_to_include['macos-10-ppc'] = ['libgdiplus', 'mono', 'xsp', 'boo', 'nant', 'ironpython', 'mono-basic', 'gtk-sharp212', 'mono-addins', 'ironruby', 'fsharp' ]
+packages_to_include['macos-10-ppc'] = ['libgdiplus', 'mono', 'xsp', 'boo', 'nant', 'ironlangs', 'mono-basic', 'gtk-sharp212', 'mono-addins', 'fsharp' ]
packages_to_include['macos-10-x86'] = packages_to_include['macos-10-ppc']
@@ -82,21 +82,21 @@ revision = mono_package.get_revision(release)
version = version.split("-")[0]
# Create the version integer
-version_list = (version.split(".") + ["0"] * (4 - len(version.split("."))))[:4]
-for i in range(1,4):
+version_list = (version.split(".") + ["0"] * (3 - len(version.split("."))))[:4]
+for i in range(1,3):
version_list[i] = version_list[i].zfill(2)
-version_int = "".join(version_list) + release.zfill(2)
+version_int = "".join(version_list) + release.replace(".", "").zfill(3)
# Set the package GUID
if arch_name == "universal":
package_guid = "960a0c10-580c-43fd-b173-78cddf93a7e8"
- csdk_guid = "ea6f53e2-aa4e-428e-aa97-26d147e73485"
+ csdk_guid = "2fc902b8-40e2-43bd-8102-45f56fb11836"
elif arch_name == "x86":
package_guid = "432959f9-ce1b-47a7-94d3-eb99cb2e1aa8"
- csdk_guid = "d7972cf5-4df5-471d-b971-d26907fa121d"
+ csdk_guid = "964ebddd-1ffe-47e7-8128-5ce17ffffb05"
elif arch_name == "ppc":
package_guid = "294befc2-2cb2-4191-8d6f-d81f5324eec3"
- csdk_guid = "44d524bb-c7ce-41b8-a057-c17b433676d3"
+ csdk_guid = "72dfbfa7-e3d0-4aec-996d-4f46236db8c9"
output_dir = os.path.join("output", version, target, release)
@@ -216,7 +216,7 @@ fd.close()
# Get list of components for readme
def package_pretty_name(package_name):
- return package_name.replace(".novell.noarch.rpm", "").replace(".macos10.novell.ppc.zip", "").replace(".macos10.novell.x86.zip", "")
+ return package_name.replace(".novell.noarch.rpm", "").replace(".macos10.ppc.zip", "").replace(".macos10.x86.zip", "").replace(".noarch.zip", "").replace(".zip", "")
packages = []
packages_text = ""
@@ -243,9 +243,11 @@ for f in dep_packages:
conf.buildenv.print_command=1
#conf.buildenv.execute_command_command=0
-print "Creating symlinks..."
-conf.buildenv.execute_command('cd %s%s/Versions; ln -sf %s Current' % (remote_PKGROOT, framework_prefix, version) )
+# Split the installer in two
+conf.buildenv.execute_command("%s/cleanup %s%s %s%s" % (arch_remote_packages_loc, remote_PKGROOT, prefix, remote_PKGROOT + "_sdk", prefix) )
+# this used to come before the cleanup script splits the installer in two, but rsync -al seems broken on snow leopard
+print "Creating symlinks..."
symlinks = {}
symlinks['Versions/Current/Resources'] = "Resources"
symlinks['Versions/Current/lib'] = "Libraries"
@@ -254,8 +256,11 @@ symlinks['Versions/Current/bin'] = "Commands"
symlinks['Versions/Current'] = "Home"
symlinks['Libraries/libmono-2.0.dylib'] = "Mono"
-for k,v in symlinks.iteritems():
- conf.buildenv.execute_command('cd %s%s; ln -sf %s %s' % (remote_PKGROOT, framework_prefix, k, v) )
+for dir in [ remote_PKGROOT, remote_PKGROOT + "_sdk" ]:
+ conf.buildenv.execute_command('cd %s%s/Versions; ln -sf %s Current' % (dir, framework_prefix, version) )
+
+ for k,v in symlinks.iteritems():
+ conf.buildenv.execute_command('cd %s%s; ln -sf %s %s' % (dir, framework_prefix, k, v) )
print "Done creating symlinks...."
@@ -266,8 +271,6 @@ if code:
print "Error munging dllmaps for .config files"
sys.exit(1)
-# Split the installer in two
-conf.buildenv.execute_command("%s/cleanup %s%s %s%s" % (arch_remote_packages_loc, remote_PKGROOT, prefix, remote_PKGROOT + "_sdk", prefix) )
# Start process of making the package
package_filename = "MonoFramework-MRE-%s_%s.%s" % (version, revision, arch_name)
@@ -308,6 +311,7 @@ conf.buildenv.copy_to('Info_sdk.plist Description_sdk.plist version.plist'.split
conf.buildenv.copy_to('updateinfo'.split(), "%s%s/Versions/%s" % (remote_PKGROOT, framework_prefix, version))
conf.buildenv.copy_to('updateinfo.csdk'.split(), "%s%s/Versions/%s" % (remote_PKGROOT + "_sdk", framework_prefix, version))
+conf.buildenv.execute_command('cd %s%s/Versions/%s && mv updateinfo.csdk updateinfo' % (remote_PKGROOT + "_sdk", framework_prefix, version))
os.chdir(cwd)
@@ -339,7 +343,7 @@ conf.buildenv.execute_command('sudo chown -R root:admin %s*' % (remote_PKGROOT))
packagemaker = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"
conf.buildenv.execute_command('cd %s; %s -build -p %s/new/%s.pkg -f %s -r %s -i %s/Info.plist -d %s/Description.plist' % (remote_PKGROOT, packagemaker, remote_temp, package_filename, remote_PKGROOT, resources_dir, framework_resources_dir, framework_resources_dir), terminate_reg=exit_reg)
-conf.buildenv.execute_command('cd %s; %s -build -p %s/new_sdk/%s.pkg -f %s -i %s/Info_sdk.plist -d %s/Description_sdk.plist' % (remote_PKGROOT + "_sdk", packagemaker, remote_temp, sdk_package_filename, remote_PKGROOT + "_sdk", arch_remote_packages_loc, arch_remote_packages_loc), terminate_reg=exit_reg)
+conf.buildenv.execute_command('cd %s; %s -build -p %s/new_sdk/%s.pkg -f %s -r %s -i %s/Info_sdk.plist -d %s/Description_sdk.plist' % (remote_PKGROOT + "_sdk", packagemaker, remote_temp, sdk_package_filename, remote_PKGROOT + "_sdk", resources_dir, arch_remote_packages_loc, arch_remote_packages_loc), terminate_reg=exit_reg)
conf.buildenv.execute_command('/usr/bin/hdiutil create -ov -srcfolder %s/new -volname MonoFramework-MRE-%s %s/%s.dmg' % (remote_temp, version, remote_temp, package_filename) )
conf.buildenv.execute_command('/usr/bin/hdiutil create -ov -srcfolder %s/new_sdk -volname MonoFramework-MDK-%s %s/%s.dmg' % (remote_temp, version, remote_temp, sdk_package_filename) )
View
13 macosx/setup-files/Welcome.rtf
@@ -1,11 +1,12 @@
-{\rtf1\mac\ansicpg10000\cocoartf102
-{\fonttbl\f0\fnil\fcharset77 HelveticaNeue;\f1\fnil\fcharset77 HelveticaNeue-Bold;}
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
+{\fonttbl\f0\fnil\fcharset0 HelveticaNeue;}
{\colortbl;\red255\green255\blue255;}
\margl1440\margr1440\vieww9000\viewh9000\viewkind0
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
-\f0\fs36 \cf0 Welcome to
-\f1\b Mono.framework @@MONO_VERSION_RELEASE@@
-\f0\b0 for OS X.\
+\f0\fs32 \cf0 Welcome to
+\b Mono.framework @@MONO_VERSION_RELEASE@@
+\b0 for OS X.
+\fs36 \
\
-}
+}
View
2 macosx/setup-files/postflight
@@ -32,7 +32,7 @@ if [ -d ${FW_CURRENT} ]; then
# Make sure we run the files we lay down, and not other stuff installed on the system
export PATH=${FW_CURRENT}/bin:$PATH
# gtk+ setup
- gdk-pixbuf-query-loaders > gtk-2.0/gdk-pixbuf.loaders
+ gdk-pixbuf-query-loaders --update-cache
# pango setup
mkdir -p pango
pango-querymodules > pango/pango.modules
View
3 packaging/conf/macos-10-x86
@@ -1,6 +1,5 @@
username=builder
-#hostname=x32-macos-2.mono.lab.novell.com
-hostname=x64-macos-2.mono.lab.novell.com
+hostname=macos-10-x86.lab.xamarin.com
USE_ZIP_PKG=1
# Helps with relocating binaries
View
2 packaging/conf/win-4-i386
@@ -1,5 +1,5 @@
username=builder
-hostname=x32-win-1.mono.lab.novell.com
+hostname=win-7-x86.lab.xamarin.com
USE_ZIP_PKG=1
# Cygwin's ssh server doesn't load this information
# ... let's do it explicitly through sshutils
View
16 packaging/defs/boo
@@ -4,6 +4,7 @@ EXTERNAL_SOURCE=1
# and the rpm can be used everywhere
BUILD_HOSTS=(
sle-11-i586
+ macos-10-x86
)
USE_HOSTS=(
@@ -22,10 +23,17 @@ get_destroot () {
DEST_ROOT=noarch
}
-BUILD_DIR="/tmp"
+#BUILD_DIR="/tmp"
+
+ZIP_BUILD () {
+
+ ./configure --prefix=/tmp/install || exit 1
+ make || exit 1
+ make install || exit 1
-make_dist () {
- curl -O http://dist.codehaus.org/boo/distributions/boo-$VERSION.tar.gz
- bznew boo-$VERSION.tar.gz
}
+#make_dist () {
+# curl -O http://dist.codehaus.org/boo/distributions/boo-$VERSION.tar.gz
+# bznew boo-$VERSION.tar.gz
+#}
View
17 packaging/defs/gluezilla
@@ -28,21 +28,22 @@ update_version_file () {
ZIP_BUILD () {
- ./configure --prefix=/tmp/install || exit 1
+ ./configure --prefix=/tmp/install --enable-optimize=yes || exit 1
make || exit 1
make install || exit 1
}
win_4_i386_ZIP_DEPS=(
#http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.1.4/sdk/xulrunner-1.9.1.4.en-US.win32.sdk.zip
- http://ftp-mozilla.netscape.com/pub/mozilla.org/xulrunner/releases/1.8.1.3/contrib/sdk/xulrunner-1.8.1.3.en-US.win32.sdk.zip
+ ftp://ftp.mozilla.org/pub/xulrunner/releases/1.8.1.3/contrib/sdk/xulrunner-1.8.1.3.en-US.win32.sdk.zip
http://ftp.mozilla.org/pub/mozilla.org/mozilla/source/wintools.zip
)
win_4_i386_ZIP_RUNTIME_DEPS=(
#http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.1.4/runtimes/xulrunner-1.9.1.4.en-US.win32.zip
- http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.8.1.3/contrib/win32/xulrunner-1.8.1.3.en-US.win32.zip
+ #http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.8.1.3/contrib/win32/xulrunner-1.8.1.3.en-US.win32.zip
+ ftp://ftp.mozilla.org/pub/xulrunner/releases/1.8.1.3/contrib/win32/xulrunner-1.8.1.3.en-US.win32.zip
http://shana.worldofcoding.com/files/Microsoft_VC80_CRT.zip
)
@@ -51,12 +52,12 @@ win_4_i386_ZIP_BUILD () {
# Install platform sdk, c++ express, and sp1 for c++ express (sp1 probably not needed after all)
cd build
- for i in xulrunner-sdk/bin/xpidl.exe buildtools/windows/bin/x86/glib-1.2.dll buildtools/windows/bin/x86/libIDL-0.6.dll ; do
+ for i in gecko-sdk/bin/xpidl.exe buildtools/windows/bin/x86/glib-1.2.dll buildtools/windows/bin/x86/libIDL-0.6.dll ; do
cp /tmp/build_deps/$i .
done
chmod 755 xpidl.exe *.dll
chmod 755 make.cmd
- ./make.cmd c:\\cygwin\\tmp\\build_deps\\xulrunner-sdk
+ ./make.cmd c:\\cygwin\\tmp\\build_deps\\gecko-sdk
cd ..
cd src
@@ -65,12 +66,12 @@ win_4_i386_ZIP_BUILD () {
my_dir=`cygpath -w $PWD`
# both vcvars and SetEnv need to be called because one has cl.exe, and the latter has the win32 api headers
cat <<EOF > build.bat
-call "c:\Program Files\Microsoft Visual Studio 8\Common7\Tools\vsvars32.bat"
-call "c:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\SetEnv.Cmd" /RETAIL
+call "c:\Program Files\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat"
+rem call "c:\Program Files\Microsoft SDKs\Windows\v7.0\Bin\SetEnv.Cmd" /Release
nmake /f windows.mak CFG=Release all
EOF
- output=`rsh localhost "cd $my_dir && build.bat > out.log && echo exit:%ERRORLEVEL%"`
+ output=`cmd /c "cd $my_dir && build.bat > out.log && echo exit:%ERRORLEVEL%"`
# echo output locally
cat out.log
View
87 packaging/defs/gtk-sharp212
@@ -50,45 +50,46 @@ make_dist () {
}
macos_10_x86_ZIP_DEPS=(
- http://primates.ximian.com/~wberrier/macos/deps/x86/atk-1.30.0-8.macos10.novell.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/cairo-1.8.10-8.macos10.novell.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/fontconfig-2.8.0-8.macos10.novell.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/freetype-2.4.2-8.macos10.novell.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/glib-2.24.1-8.macos10.novell.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/gtk+-2.20.1-8.macos10.novell.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/libglade-2.6.4-8.macos10.novell.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/librsvg-2.26.3-8.macos10.novell.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/libxml2-2.6.30-8.macos10.novell.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/pango-1.28.1-8.macos10.novell.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/pixman-0.18.2-8.macos10.novell.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/atk-1.33.6.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/cairo-1.10.2.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/fontconfig-2.8.0.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/freetype-2.4.2.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/glib-2.28.8.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/gdk-pixbuf-2.22.1.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/gtk+-2.24.5.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/libglade-2.6.4.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/librsvg-2.26.3.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/libxml2-2.6.30.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/pango-1.28.4.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/pixman-0.22.2.macos10.x86.zip
)
macos_10_x86_ZIP_RUNTIME_DEPS=(
- http://primates.ximian.com/~wberrier/macos/deps/various/gtkrc_mac-1.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/gtk-engines-2.20.1-8.macos10.novell.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/ige-mac-integration-0.8.2-8.macos10.novell.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/murrine-0.90.3-8.macos10.novell.x86.zip
+ http://beefydude.lab.xamarin.com/misc/gtkrc_mac-1.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/gtk-engines-2.20.2.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/ige-mac-integration-0.9.8.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/murrine-0.98.1.macos10.x86.zip
)
macos_10_ppc_ZIP_DEPS=(
- http://primates.ximian.com/~wberrier/macos/deps/ppc/atk-1.30.0-8.macos10.novell.ppc.zip
- http://primates.ximian.com/~wberrier/macos/deps/ppc/cairo-1.8.10-8.macos10.novell.ppc.zip
- http://primates.ximian.com/~wberrier/macos/deps/ppc/fontconfig-2.8.0-8.macos10.novell.ppc.zip
- http://primates.ximian.com/~wberrier/macos/deps/ppc/freetype-2.4.2-8.macos10.novell.ppc.zip
- http://primates.ximian.com/~wberrier/macos/deps/ppc/glib-2.24.1-8.macos10.novell.ppc.zip
- http://primates.ximian.com/~wberrier/macos/deps/ppc/gtk+-2.20.1-8.macos10.novell.ppc.zip
- http://primates.ximian.com/~wberrier/macos/deps/ppc/libglade-2.6.4-8.macos10.novell.ppc.zip
- http://primates.ximian.com/~wberrier/macos/deps/ppc/librsvg-2.26.3-8.macos10.novell.ppc.zip
- http://primates.ximian.com/~wberrier/macos/deps/ppc/libxml2-2.6.30-8.macos10.novell.ppc.zip
- http://primates.ximian.com/~wberrier/macos/deps/ppc/pango-1.28.1-8.macos10.novell.ppc.zip
- http://primates.ximian.com/~wberrier/macos/deps/ppc/pixman-0.18.2-8.macos10.novell.ppc.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-ppc/atk-1.30.0-8.macos10.novell.ppc.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-ppc/cairo-1.8.10-8.macos10.novell.ppc.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-ppc/fontconfig-2.8.0-8.macos10.novell.ppc.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-ppc/freetype-2.4.2-8.macos10.novell.ppc.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-ppc/glib-2.24.1-8.macos10.novell.ppc.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-ppc/gtk+-2.20.1-8.macos10.novell.ppc.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-ppc/libglade-2.6.4-8.macos10.novell.ppc.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-ppc/librsvg-2.26.3-8.macos10.novell.ppc.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-ppc/libxml2-2.6.30-8.macos10.novell.ppc.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-ppc/pango-1.28.1-8.macos10.novell.ppc.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-ppc/pixman-0.18.2-8.macos10.novell.ppc.zip
)
macos_10_ppc_ZIP_RUNTIME_DEPS=(
- http://primates.ximian.com/~wberrier/macos/deps/various/gtkrc_mac-1.zip
- http://primates.ximian.com/~wberrier/macos/deps/ppc/gtk-engines-2.20.1-8.macos10.novell.ppc.zip
- http://primates.ximian.com/~wberrier/macos/deps/ppc/ige-mac-integration-0.8.2-8.macos10.novell.ppc.zip
- http://primates.ximian.com/~wberrier/macos/deps/ppc/murrine-0.90.3-8.macos10.novell.ppc.zip
+ http://169.254.133.176/~alex/mono/macos/deps/various/gtkrc_mac-1.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-ppc/gtk-engines-2.20.1-8.macos10.novell.ppc.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-ppc/ige-mac-integration-0.8.2-8.macos10.novell.ppc.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-ppc/murrine-0.90.3-8.macos10.novell.ppc.zip
)
@@ -103,41 +104,41 @@ macos_10_ZIP_BUILD () {
# add this so libxml is found
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/tmp/build_deps/lib/pkgconfig:/usr/X11R6/lib/pkgconfig
- ./configure --prefix=/tmp/install || exit 1
+ CFLAGS="-m32" ./configure --prefix=/tmp/install || exit 1
make || exit 1
make install || exit 1
}
win_4_i386_ZIP_DEPS=(
- http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/cairo-dev_1.8.10-3_win32.zip
- http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/cairo_1.8.10-3_win32.zip
+ http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/cairo-dev_1.10.2-1_win32.zip
+ http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/cairo_1.10.2-1_win32.zip
http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/expat-dev_2.0.1-1_win32.zip
http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/expat_2.0.1-1_win32.zip
http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/fontconfig-dev_2.8.0-2_win32.zip
http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/fontconfig_2.8.0-2_win32.zip
- http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/freetype-dev_2.3.12-1_win32.zip
- http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/freetype_2.3.12-1_win32.zip
+ http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/freetype-dev_2.4.2-1_win32.zip
+ http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/freetype_2.4.2-1_win32.zip
http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/libpng-dev_1.4.0-1_win32.zip
http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/libpng_1.4.0-1_win32.zip
http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/libxml2-dev_2.7.7-1_win32.zip
http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/libxml2_2.7.7-1_win32.zip
- http://ftp.gnome.org/pub/GNOME/binaries/win32/atk/1.30/atk-dev_1.30.0-1_win32.zip
- http://ftp.gnome.org/pub/GNOME/binaries/win32/atk/1.30/atk_1.30.0-1_win32.zip
+ http://ftp.gnome.org/pub/GNOME/binaries/win32/atk/1.32/atk-dev_1.32.0-1_win32.zip
+ http://ftp.gnome.org/pub/GNOME/binaries/win32/atk/1.32/atk_1.32.0-1_win32.zip
- http://ftp.gnome.org/pub/GNOME/binaries/win32/glib/2.24/glib-dev_2.24.1-1_win32.zip
- http://ftp.gnome.org/pub/GNOME/binaries/win32/glib/2.24/glib_2.24.1-1_win32.zip
+ http://ftp.gnome.org/pub/GNOME/binaries/win32/glib/2.28/glib-dev_2.28.1-1_win32.zip
+ http://ftp.gnome.org/pub/GNOME/binaries/win32/glib/2.28/glib_2.28.1-1_win32.zip
- http://ftp.gnome.org/pub/GNOME/binaries/win32/gtk+/2.20/gtk+-dev_2.20.1-1_win32.zip
- http://ftp.gnome.org/pub/GNOME/binaries/win32/gtk+/2.20/gtk+_2.20.1-1_win32.zip
+ http://ftp.gnome.org/pub/GNOME/binaries/win32/gtk+/2.24/gtk+-dev_2.24.0-1_win32.zip
+ http://ftp.gnome.org/pub/GNOME/binaries/win32/gtk+/2.24/gtk+_2.24.0-1_win32.zip
http://ftp.gnome.org/pub/GNOME/binaries/win32/libglade/2.6/libglade-dev_2.6.4-1_win32.zip
http://ftp.gnome.org/pub/GNOME/binaries/win32/libglade/2.6/libglade_2.6.4-1_win32.zip
- http://ftp.gnome.org/pub/GNOME/binaries/win32/pango/1.28/pango-dev_1.28.0-1_win32.zip
- http://ftp.gnome.org/pub/GNOME/binaries/win32/pango/1.28/pango_1.28.0-1_win32.zip
+ http://ftp.gnome.org/pub/GNOME/binaries/win32/pango/1.28/pango-dev_1.28.3-1_win32.zip
+ http://ftp.gnome.org/pub/GNOME/binaries/win32/pango/1.28/pango_1.28.3-1_win32.zip
)
win_4_i386_ZIP_BUILD () {
View
27 packaging/defs/libgdiplus
@@ -110,7 +110,7 @@ sunos_8_sparc_ZIP_DEPS=(
macos_10_ZIP_BUILD () {
# TODO: any other options needed here to build to use without x11?
- ./configure --enable-quartz --prefix=/tmp/install --with-libjpeg --includedir=/tmp/build_deps/include || exit 1
+ CFLAGS="-m32" ./configure --enable-quartz --prefix=/tmp/install --with-libjpeg --includedir=/tmp/build_deps/include || exit 1
make || exit 1
make install || exit 1
}
@@ -138,24 +138,23 @@ macos_10_ppc_ZIP_DEPS=(
)
macos_10_x86_ZIP_DEPS=(
- # See http://primates.ximian.com/~wberrier/macos/deps/README
- http://primates.ximian.com/~wberrier/macos/deps/x86/glib-2.24.1-8.macos10.novell.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/pkg-config-0.25-8.1.macos10.novell.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/gettext-0.18.1.1-8.macos10.novell.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/glib-2.28.8.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/pkg-config-0.25.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/gettext-0.18.1.1.macos10.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/jpeg-8-8.macos10.novell.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/libpng-1.2.44-8.macos10.novell.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/giflib-4.1.6-8.macos10.novell.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/tiff-3.8.2-8.macos10.novell.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/jpeg-8.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/libpng-1.2.46.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/giflib-4.1.6.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/tiff-3.8.2.macos10.x86.zip
# We cannot build against our own fontconfig, I don't know why
- #http://primates.ximian.com/~wberrier/macos/deps/x86/cairo-1.8.10-8.macos10.novell.x86.zip
- #http://primates.ximian.com/~wberrier/macos/deps/x86/fontconfig-2.8.0-8.macos10.novell.x86.zip
- #http://primates.ximian.com/~wberrier/macos/deps/x86/freetype-2.4.2-8.macos10.novell.x86.zip
- #http://primates.ximian.com/~wberrier/macos/deps/x86/pixman-0.18.2-8.macos10.novell.x86.zip
+ #http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/cairo-1.10.2.macos10.x86.zip
+ #http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/fontconfig-2.8.0.macos10.x86.zip
+ #http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/freetype-2.4.2.macos10.x86.zip
+ #http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/pixman-0.22.2.macos10.x86.zip
# 10.4 and 10.5 have differing expat versions, use our own
- http://primates.ximian.com/~wberrier/macos/deps/x86/expat-2.0.1-8.macos10.novell.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/expat-2.0.1.macos10.x86.zip
)
View
20 packaging/defs/mono
@@ -39,17 +39,17 @@ PACKS_TO_REMOVE=(
)
win_4_i386_ZIP_RUNTIME_DEPS=(
- http://primates.ximian.com/~wberrier/windows-installer/ms_gdiplus/3102.1360/gdiplus.exe
+ http://beefydude.lab.xamarin.com/misc/gdiplus.zip
)
## format: <$DISTRO>_ZIP_DEPS
# Note: $DISTRO must have the hyphens converted to underscores
win_4_i386_ZIP_DEPS=(
- http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/gettext-runtime-0.17-1.zip
- http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/gettext-runtime-dev-0.17-1.zip
- http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/gettext-tools-0.17.zip
+ http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/gettext-runtime_0.18.1.1-2_win32.zip
+ http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/gettext-runtime-dev_0.18.1.1-2_win32.zip
+ http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/gettext-tools_0.18.1.1-2_win32.zip
http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/libiconv-1.9.1.bin.woe32.zip
- http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/pkg-config_0.23-3_win32.zip
+ http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/pkg-config_0.25-1_win32.zip
http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/zlib-dev_1.2.4-2_win32.zip
http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/zlib_1.2.4-2_win32.zip
)
@@ -63,9 +63,9 @@ macos_10_ppc_ZIP_DEPS=(
macos_10_x86_ZIP_DEPS=(
# See http://primates.ximian.com/~wberrier/macos/deps/README
- http://primates.ximian.com/~wberrier/macos/deps/x86/pkg-config-0.25-8.1.macos10.novell.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/gettext-0.18.1.1-8.macos10.novell.x86.zip
- http://primates.ximian.com/~wberrier/macos/deps/x86/sqlite-3.6.23.1-8.macos10.novell.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/pkg-config-0.25.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/gettext-0.18.1.1.macos10.x86.zip
+ http://beefydude.lab.xamarin.com/packages/deps/macos-10-x86/sqlite-3.6.23.1.macos10.x86.zip
)
win_4_i386_ZIP_BUILD () {
@@ -100,10 +100,10 @@ fd.write(text)
fd.close()'
ENABLE_LLVM=""
- if [ "$(uname -m)" = "i386" ]; then
+ if test "$(uname -m)" = "i386" || test "$(uname -m)" = "x86_64"; then
ENABLE_LLVM="--enable-loadedllvm"
fi
- CFLAGS=" -DMAC_OS_X_VERSION_10_5=1050 $CFLAGS " ./configure --prefix=$MONO_PREFIX --with-moonlight=no --with-ikvm=yes $ENABLE_LLVM || exit 1
+ CFLAGS=" -DMAC_OS_X_VERSION_10_5=1050 $CFLAGS " ./configure --prefix=$MONO_PREFIX --host=i386-apple-darwin10.8.0 --with-moonlight=no --with-ikvm=yes $ENABLE_LLVM || exit 1
set
View
9 packaging/defs/mono-addins
@@ -1,5 +1,6 @@
BUILD_HOSTS=(
sle-11-i586
+ macos-10-x86
)
USE_HOSTS=(
@@ -34,3 +35,11 @@ make_dist () {
./autogen.sh
make dist-bzip2
}
+
+ZIP_BUILD () {
+
+ ./configure --prefix=/tmp/install || exit 1
+ make || exit 1
+ make install || exit 1
+
+}
View
13 packaging/defs/mono-basic
@@ -6,7 +6,8 @@ web_ignore_noarch=1
# 1.0 vb runtime won't be included
BUILD_HOSTS=(
- sle-11-i586
+ sle-11-i586
+ macos-10-x86
)
USE_HOSTS=(
@@ -76,10 +77,14 @@ ZIP_BUILD () {
PATH=$PATH:/usr/sbin
export MONO_GAC_PREFIX MONO_PREFIX MONO_CFG_DIR MONO_PATH PATH
- ./configure --prefix=/usr
- $make_path
+ ./configure --prefix=/tmp/install
+
+ # HACK for now
+ sed -e 's/@cp -pu/@cp -p/' vbnc/vbnc/Makefile > vbnc/vbnc/Makefile2
+ mv -f vbnc/vbnc/Makefile2 vbnc/vbnc/Makefile
- $make_path install DESTDIR=/tmp/install
+ $make_path PROFILE_VBNC_FLAGS=/sdkpath:/tmp/build_deps/lib/mono/4.0/
+ $make_path install PROFILE_VBNC_FLAGS=/sdkpath:/tmp/build_deps/lib/mono/4.0/
}
POSTBUILD_TEST_NAME1="test"
View
8 packaging/defs/mono-tools
@@ -31,6 +31,14 @@ RELEASE_PATH=(
tags/mono-[[version]]/mono-tools
)
+ZIP_BUILD () {
+
+ ./configure --prefix=/tmp/install || exit 1
+ make || exit 1
+ make install || exit 1
+
+}
+
POSTBUILD_TEST_NAME1="test-gendarme"
POSTBUILD_TEST1 () {
cd gendarme
View
6 packaging/defs/nant
@@ -2,6 +2,7 @@ EXTERNAL_SOURCE=1
BUILD_HOSTS=(
sle-11-i586
+ macos-10-x86
)
USE_HOSTS=(
@@ -33,3 +34,8 @@ make_dist () {
curl -O http://easynews.dl.sourceforge.net/sourceforge/nant/nant-$VERSION-src.tar.gz
}
+ZIP_BUILD () {
+
+ make install prefix=/tmp/install || exit 1
+
+}
View
8 packaging/defs/webkit-sharp
@@ -1,4 +1,5 @@
BUILD_HOSTS=(
+ macos-10-x86
sle-11-i586
)
@@ -25,3 +26,10 @@ RELEASE_PATH=(
tags/webkit-sharp/[[versiondot]]
)
+ZIP_BUILD () {
+
+ ./configure --prefix=/tmp/install || exit 1
+ make || exit 1
+ make install || exit 1
+
+}
View
6 packaging/defs/xsp
@@ -2,6 +2,7 @@ web_index=4
BUILD_HOSTS=(
sle-11-i586
+ macos-10-x86
)
USE_HOSTS=(
@@ -27,3 +28,8 @@ RELEASE_PATH=(
tags/mono-[[version]]/xsp
)
+macos_10_ZIP_BUILD () {
+ ./configure --prefix=/tmp/install || exit 1
+ make || exit 1
+ make install || exit 1
+}
View
9 packaging/dep_builder
@@ -1,5 +1,6 @@
#!/usr/bin/env python
+import os
import sys
import getopt
import time
@@ -41,7 +42,11 @@ if code:
sys.exit(1)
# Copy files back
-log_obj.log("Copying files back...\n")
-conf.buildenv.copy_from(build_location + '/build/built-packages/*', 'external_zip_pkg')
+dep_location = "external_zip_pkg/%s" % jail
+if not os.path.exists(dep_location):
+ os.mkdir(dep_location)
+
+log_obj.log("Copying files back to %s...\n" % dep_location)
+conf.buildenv.copy_from(build_location + '/build/built-packages/*', dep_location)
conf.buildenv.unlock_env()
View
246 packaging/dep_defs/macosx
@@ -16,6 +16,11 @@ packages = [
{
'name': 'pkg-config',
'source': 'http://pkgconfig.freedesktop.org/releases/pkg-config-0.25.tar.gz',
+ 'build':"""
+ CFLAGS="-m32" ./configure --prefix=/tmp/install
+ make || exit 1
+ make install || exit 1
+ """,
'post':"""
# Configure shell wrapper for pkg-config so it will look for .pc files when installed (#79671)
cd /tmp/install/bin
@@ -33,6 +38,11 @@ EOF
{
'name': 'gettext',
'source': 'http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz',
+ 'build':"""set -x
+ CFLAGS="-m32" CXXFLAGS="-m32" ./configure --prefix=/tmp/install
+ make || exit 1
+ make install || exit 1
+ """,
'post':"""
# Save msgfmt, as this is needed for building glib
# we also need msgmerge for intltool... (monodevelop)
@@ -52,18 +62,26 @@ EOF
},
{
'name': 'glib',
- 'source': 'http://ftp.gnome.org/pub/gnome/sources/glib/2.24/glib-2.24.1.tar.bz2',
+ 'source': 'http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.8.tar.bz2',
'build':
"""set -x
find . -iname "makefile\.in" | xargs sed -i -e 's@which[[:space:]]*gtkdoc-rebase@/usr/bin/false@'
- LDFLAGS="$LDFLAGS -lresolv" ./configure --prefix=/tmp/install
+
+
+ PATCHES=`curl -L http://beefydude.lab.xamarin.com/patches/glib/patchlist.txt | egrep -o '\"[^\"]*\"' | sed 's/\"//g'`
+ for patchfile in $PATCHES; do
+ curl -# -L http://beefydude.lab.xamarin.com/patches/glib/$patchfile | patch -p0 || exit 1
+ done
+
+ CFLAGS="-m32" LDFLAGS="$LDFLAGS -m32 -lresolv" ./configure --prefix=/tmp/install || exit 1
+ curl -# -L http://beefydude.lab.xamarin.com/patches/glib/config.h.ed | ed - config.h || exit 1
+
make || exit 1
make install || exit 1
- """,
- 'post':"""
- # glib-mkenums is required for pango, maybe others
- #rm -Rf /tmp/install/bin/*
- """
+
+ # we don't really need all these html files and they have weird characters in their file names that were screwing up the Mach-O relocation step
+ rm -rf /tmp/install/share/gtk-doc
+ """
},
{
'name': 'jpeg',
@@ -72,7 +90,7 @@ EOF
'build':
"""ln -s `which glibtool` ./libtool
- ./configure --enable-shared --enable-static --enable-freetype --prefix=/tmp/install
+ CFLAGS="-m32" ./configure --enable-shared --enable-static --enable-freetype --prefix=/tmp/install
make || exit 1
mkdir -p /tmp/install/lib
mkdir -p /tmp/install/include
@@ -83,8 +101,8 @@ EOF
'name': 'tiff',
'source': 'http://dl.maptools.org/dl/libtiff/tiff-3.8.2.tar.gz',
'build':
- """
- ./configure --prefix=/tmp/install --mandir=/tmp/install/share/man \
+ """set -x
+ CFLAGS="-m32" CXXFLAGS="-m32" ./configure --prefix=/tmp/install --mandir=/tmp/install/share/man \
--with-jpeg-include-dir=/tmp/build_deps/include --with-jpeg-lib-dir=/tmp/build_deps/lib
# 3.8.2's libtool didn't like the sysroot for building on 10.3
@@ -98,27 +116,33 @@ EOF
},
{
'name': 'libpng',
- 'source': 'http://voxel.dl.sourceforge.net/project/libpng/03-libpng-previous/1.2.44/libpng-1.2.44.tar.bz2',
- #'source': 'ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.4.0.tar.bz2',
+ #'source': 'http://voxel.dl.sourceforge.net/project/libpng/03-libpng-previous/1.2.44/libpng-1.2.44.tar.bz2',
+ #'source': 'ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.4.8.tar.bz2',
+ 'source': 'ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.46.tar.bz2',
+ 'build':"""set -x
+ CFLAGS="-m32" ./configure --prefix=/tmp/install
+ make || exit 1
+ make install || exit 1
+ """,
'post':"""
rm -Rf /tmp/install/bin/*
"""
},
{
'name': 'giflib',
- 'source': 'http://cdnetworks-us-1.dl.sourceforge.net/project/giflib/giflib%204.x/giflib-4.1.6/giflib-4.1.6.tar.bz2',
+ 'source': 'http://surfnet.dl.sourceforge.net/project/giflib/giflib%204.x/giflib-4.1.6/giflib-4.1.6.tar.bz2',
'post':"""
rm -Rf /tmp/install/bin/*
"""
},
# Include our own because 10.4 and 10.5 ppc have differing expat versions
{
'name': 'expat',
- 'source': 'http://cdnetworks-us-1.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz',
- 'build': """
- ./configure --prefix=/tmp/install
- make
- make install
+ 'source': 'http://surfnet.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz',
+ 'build': """set -x
+ CFLAGS="-m32" ./configure --prefix=/tmp/install
+ make || exit 1
+ make install || exit 1
""",
'post':"""
rm -Rf /tmp/install/bin
@@ -127,43 +151,51 @@ EOF
},
{
'name': 'pixman',
- 'source': 'http://cairographics.org/releases/pixman-0.18.2.tar.gz',
+ 'source': 'http://cairographics.org/releases/pixman-0.22.2.tar.gz',
+ 'build':"""set -x
+ CFLAGS="-m32" ./configure --prefix=/tmp/install
+ make || exit 1
+ make install || exit 1
+ """
},
{
'name': 'freetype',
'source': 'http://download.savannah.gnu.org/releases/freetype/freetype-2.4.2.tar.bz2',
- 'build': """
- ./configure --prefix=/tmp/install
- make
- make install
+ 'build': """set -x
+ CFLAGS="-m32" ./configure --prefix=/tmp/install
+ make || exit 1
+ make install || exit 1
""",
},
{
'name': 'fontconfig',
'source': 'http://www.fontconfig.org/release/fontconfig-2.8.0.tar.gz',
- 'build': """
- ./configure --prefix=/tmp/install --disable-docs
- make
- make install
+ 'build': """set -x
+ CFLAGS="-m32" ./configure --prefix=/tmp/install --disable-docs
+ make || exit 1
+ make install || exit 1
""",
},
{
'name': 'cairo',
- 'source': 'http://cairographics.org/releases/cairo-1.8.10.tar.gz',
- 'build': """
- ./configure --prefix=/tmp/install --enable-quartz --enable-quartz-font --enable-quartz-image --enable-atsui --enable-pdf --disable-xlib --disable-ft
- make
- make install
- """,
+ 'source': 'http://cairographics.org/releases/cairo-1.10.2.tar.gz',
+ 'build': """set -x
+ CFLAGS="-m32" ./configure --prefix=/tmp/install --enable-quartz --enable-quartz-font --enable-quartz-image --enable-atsui --enable-pdf --disable-xlib --without-x --enable-ft
+ make || exit 1
+ make install || exit 1
+
+ # we don't really need all these html files and they have weird characters in their file names that were screwing up the Mach-O relocation step
+ rm -rf /tmp/install/share/gtk-doc
+ """,
},
# TODO: There are problems relocating these binaries... is the max header flag not getting passed in?
# Hrm... the flag is getting set... which binary is failing?
{
'name': 'pango',
#'source': 'http://ftp.gnome.org/pub/GNOME/sources/pango/1.20/pango-1.20.2.tar.bz2',
#'source': 'http://ftp.gnome.org/pub/GNOME/sources/pango/1.20/pango-1.20.5.tar.bz2',
- 'source': 'http://ftp.gnome.org/pub/GNOME/sources/pango/1.28/pango-1.28.1.tar.bz2',
- 'build': """
+ 'source': 'http://ftp.gnome.org/pub/GNOME/sources/pango/1.28/pango-1.28.4.tar.bz2',
+ 'build': """set -x
find . -iname "makefile\.in" | xargs sed -i -e 's@which[[:space:]]*gtkdoc-rebase@/usr/bin/false@'
# Hrm... LDFLAGS not getting set for atsui basic... for it (TODO: file bug)
@@ -179,7 +211,7 @@ EOF
#sed -i bak 's,2\.5\.0,9.5.0,' configure
# Use this prefix so we don't have to do any tricks to relocate (Do this with all modules?)
- CFLAGS=" -DMAC_OS_X_VERSION_10_5=1050 $CFLAGS " ./configure --prefix=%s --without-x
+ CFLAGS="-m32 -DMAC_OS_X_VERSION_10_5=1050 $CFLAGS " CXXFLAGS="-m32" ./configure --prefix=%s --without-x
make
rm -Rf /tmp/temp_install
@@ -189,20 +221,44 @@ EOF
mkdir -p /tmp/install
cd /tmp/temp_install%s || exit 1
mv * /tmp/install
- """ % (prefix, prefix),
+
+ # we don't really need all these html files and they have weird characters in their file names that were screwing up the Mach-O relocation step
+ rm -rf /tmp/install/share/gtk-doc
+ """ % (prefix, prefix),
},
{
'name': 'atk',
#'source': 'http://ftp.gnome.org/pub/gnome/sources/atk/1.20/atk-1.20.0.tar.bz2',
#'source': 'http://ftp.gnome.org/pub/GNOME/sources/atk/1.23/atk-1.23.5.tar.bz2',
- 'source': 'http://ftp.gnome.org/pub/GNOME/sources/atk/1.30/atk-1.30.0.tar.bz2',
- 'build': """
+ 'source': 'http://ftp.gnome.org/pub/GNOME/sources/atk/1.33/atk-1.33.6.tar.bz2',
+ 'build': """set -x
find . -iname "makefile\.in" | xargs sed -i -e 's@which[[:space:]]*gtkdoc-rebase@/usr/bin/false@'
- ./configure --prefix=/tmp/install || exit 1
+ CFLAGS="-m32" ./configure --prefix=/tmp/install || exit 1
make || exit 1
make install || exit 1
""",
},
+ # has same relocation problems as pango, uses same hack..
+ {
+ 'name': 'gdk-pixbuf',
+ 'source': 'http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.22/gdk-pixbuf-2.22.1.tar.bz2',
+ 'build':
+ """set -x
+ CFLAGS="-m32" ./configure --prefix=%s
+ make || exit 1
+
+ rm -Rf /tmp/temp_install
+ make install DESTDIR=/tmp/temp_install || exit 1
+
+ # Do this so all the zip files have the same base, and we can lay them back here later
+ mkdir -p /tmp/install
+ cd /tmp/temp_install%s || exit 1
+ mv * /tmp/install
+
+ # we don't really need all these html files and they have weird characters in their file names that were screwing up the Mach-O relocation step
+ rm -rf /tmp/install/share/gtk-doc
+ """ % (prefix, prefix)
+ },
# ## Tarball generated on linux (opensuse 10.3) using:
# # Applied patch: http://people.imendio.com/richard/patches/gtk-configure.patch
# # Applied patch: from Geoff to remove some spew
@@ -213,99 +269,121 @@ EOF
{
# Requires 10.4 or above
'name': 'gtk+',
- 'version': '2.20.1',
- 'source': 'http://ftp.gnome.org/pub/gnome/sources/gtk+/2.20/gtk+-2.20.1.tar.bz2',
+ 'version': '2.24.5',
+ 'source': 'http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.5.tar.bz2',
'build': """set -ex
# The following is a hack for a gtk bug where 'which' does not act as expected on mac.
# see http://lists.macosforge.org/pipermail/macports-users/2007-December.txt and search for 'gtkdoc-rebase'
find . -iname "makefile\.in" | xargs sed -i -e 's@which[[:space:]]*gtkdoc-rebase@/usr/bin/false@'
- LDFLAGS="$LDFLAGS -framework Foundation -framework Carbon -framework AppKit -Xlinker -headerpad_max_install_names" ./configure --prefix=%s --with-gdktarget=quartz --disable-gtk-doc --with-libjpeg --without-libjasper
- make
- make install DESTDIR=/tmp/temp_install
- mkdir -p /tmp/temp_install/Library/Frameworks/Mono.framework/Versions/Current/share/themes/Mac/gtk-2.0-key
- curl -L http://mjhutchinson.com/files/temp/gtkrc-mac-2.20-hack > /tmp/temp_install/Library/Frameworks/Mono.framework/Versions/Current/share/themes/Mac/gtk-2.0-key/gtkrc
-
- # Do this so all the zip files have the same base, and we can lay them back here later
- mkdir -p /tmp/install
- cd /tmp/temp_install%s || exit 1
- mv * /tmp/install
- """ % (prefix, prefix),
+
+ # Mac OS 10.7 Lion patches
+ PATCHES=`curl -L http://beefydude.lab.xamarin.com/patches/gtk/patchlist.txt | egrep -o '\"[^\"]*\"' | sed 's/\"//g'`
+ for patchfile in $PATCHES; do
+ curl -# -L http://beefydude.lab.xamarin.com/patches/gtk/$patchfile | patch -p1
+ done
+
+ # gdk-pixbuf relocation is hacky
+ export GDK_PIXBUF_MODULE_FILE="/tmp/build_deps/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+ export GDK_PIXBUF_MODULEDIR="/tmp/build_deps/lib/gdk-pixbuf-2.0/2.10.0/loaders/"
+ /tmp/build_deps/bin/gdk-pixbuf-query-loaders --update-cache
+
+ CFLAGS="-m32" LDFLAGS="$LDFLAGS -framework Foundation -framework Carbon -framework AppKit -Xlinker -headerpad_max_install_names" ./configure --prefix=/tmp/install --with-gdktarget=quartz --disable-gtk-doc --with-libjpeg --without-libjasper
+ make || exit 1
+ make install || exit 1
+ """,
},
{
'name': 'libxml2',
'source': 'http://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/libxml2-2.6.30.tar.bz2',
- 'build': """
- ./configure --prefix=/tmp/install --with-python=no
- make
- make install
+ 'build': """set -x
+ CFLAGS="-m32" ./configure --prefix=/tmp/install --with-python=no
+ make || exit 1
+ make install || exit 1
""",
},
{
'name': 'librsvg',
'source': 'http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.26/librsvg-2.26.3.tar.bz2',
+ 'build':"""set -x
+ CFLAGS="-m32" ./configure --prefix=/tmp/install
+ make || exit 1
+ make install || exit 1
+ """
},
{
'name': 'libglade',
#'source': 'http://ftp.gnome.org/pub/GNOME/sources/libglade/2.6/libglade-2.6.2.tar.bz2',
'source': 'http://ftp.gnome.org/pub/GNOME/sources/libglade/2.6/libglade-2.6.4.tar.bz2',
'build':"""set -ex
- ./configure --prefix=/tmp/install
- make
- make install
+ CFLAGS="-m32" ./configure --prefix=/tmp/install
+ make || exit 1
+ make install || exit 1
"""
},
{
'name': 'intltool',
'source': 'http://ftp.gnome.org/pub/gnome/sources/intltool/0.40/intltool-0.40.6.tar.bz2',
- 'build':"""
- ./configure --prefix=/tmp/install
- make
- make install
+ 'build':"""set -x
+ CFLAGS="-m32" ./configure --prefix=/tmp/install
+ make || exit 1
+ make install || exit 1
"""
},
{
'name': 'gtk-engines',
- 'source': 'http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.20/gtk-engines-2.20.1.tar.bz2',
+ 'source': 'http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2',
'pre':"""
# This is a total hack to fake out the check for xgettext.
# This can be removed once we get xgettext compiling on mac
echo -e '#!/bin/sh\necho "(GNU gettext"' > /tmp/build_deps/bin/xgettext
chmod 755 /tmp/build_deps/bin/xgettext
""",
- 'build':"""
- ./configure --disable-nls --prefix=/tmp/install
- make
- make install
+ 'build':"""set -x
+ CFLAGS="-m32" ./configure --disable-nls --prefix=/tmp/install
+ make || exit 1
+ make install || exit 1
""",
},
{
'name': 'murrine',
- 'source': 'http://ftp.gnome.org/pub/GNOME/sources/murrine/0.90/murrine-0.90.3.tar.bz2',
- },
- {
- 'name': 'gtk-quartz-engine',
- 'source': 'http://build.mono.lab.novell.com/~builder/gtk-quartz-engine-0.2.tar.bz2',
- #'source': 'http://downloads.sourceforge.net/project/gtk-osx/GTK%20Quartz%20Engine/gtk-quartz-engine-0.2.tar.gz',
+ 'source': 'http://ftp.gnome.org/pub/GNOME/sources/murrine/0.98/murrine-0.98.1.tar.bz2',
+ 'build':"""set -x
+ curl -L http://beefydude.lab.xamarin.com/patches/murrine-link-pixman.patch | patch -p1 || exit 1
+ ACLOCAL="aclocal -I/tmp/build_deps/share/aclocal" autoreconf -fi || exit 1
+ CFLAGS="-m32" ./configure --prefix=/tmp/install || exit 1
+ make || exit 1
+ make install || exit 1
+ """
},
+# {
+# 'name': 'gtk-quartz-engine',
+# 'source': 'http://build.mono.lab.novell.com/~builder/gtk-quartz-engine-0.2.tar.bz2',
+# #'source': 'http://downloads.sourceforge.net/project/gtk-osx/GTK%20Quartz%20Engine/gtk-quartz-engine-0.2.tar.gz',
+# 'build':"""set -x
+# CFLAGS="-m32" ./configure --prefix=/tmp/install
+# make || exit 1
+# make install || exit 1
+# """
+# },
{
'name': 'ige-mac-integration',
- 'source': 'http://ftp.imendio.com/pub/imendio/ige-mac-integration/ige-mac-integration-0.8.2.tar.gz',
- #'source': 'http://downloads.sourceforge.net/project/gtk-osx/GTK-OSX%20Build/ige-mac-integration-0.9.4.tar.gz',
- 'build':"""
- LDFLAGS="-framework AppKit -Xlinker -headerpad_max_install_names" ./configure --prefix=/tmp/install
- make
- make install
+ #'source': 'http://ftp.imendio.com/pub/imendio/ige-mac-integration/ige-mac-integration-0.8.2.tar.gz',
+ 'source': 'http://surfnet.dl.sourceforge.net/project/gtk-osx/GTK-OSX%20Build/ige-mac-integration-0.9.8.tar.bz2',
+ 'build':"""set -x
+ CFLAGS="-m32" LDFLAGS="-framework AppKit -Xlinker -headerpad_max_install_names" ./configure --prefix=/tmp/install
+ make || exit 1
+ make install || exit 1
""",
},
{
'name': 'sqlite',
#'source': 'http://www.sqlite.org/sqlite-3.5.7.tar.gz',
'source': 'http://www.sqlite.org/sqlite-3.6.23.1.tar.gz',
'build':"""
- ./configure --prefix=/tmp/install --disable-tcl
- make
- make install
+ CFLAGS="-m32" ./configure --prefix=/tmp/install --disable-tcl
+ make || exit 1
+ make install || exit 1
""",
'post':"""
rm -Rf /tmp/install/bin
View
6 packaging/dep_defs/win4
@@ -10,7 +10,7 @@ packages = [
# http://www.mingw.org/docs.shtml
'name': 'libxml2',
- 'source': 'http://primates.ximian.com/~wberrier/windows-installer/win32_deps/libxml2/libxml2-2.6.27.win32.zip',
+ 'source': 'ftp://xmlsoft.org/libxml2/win32/libxml2-2.6.30.win32.zip',
'build': """
x_dir=`pwd`
@@ -25,8 +25,8 @@ f=libxml2-$x_ver.win32.zip
p_ver=0.43
p=pexports-$p_ver.zip
-# From http://www.emmestech.com/software/cygwin/pexports-0.43/download_pexports.html
-wget http://primates.ximian.com/~wberrier/windows-installer/win32_deps/libxml2/$p
+# From http://www.emmestech.com/software/pexports-0.43/download_pexports.html
+wget http://beefydude.lab.xamarin.com/misc/$p
unzip $p
chmod 755 pexports-$p_ver/bin/pexports.exe
View
3 packaging/do-rpm-build
@@ -125,7 +125,8 @@ for f in rcfiles:
if os.path.exists(f): files.append(f)
# Will this command need to change from distro to distro? (possibly on REALLY old distros)
-command = "rpmbuild --rcfile=/usr/lib/rpm/rpmrc:%s -bb *.spec" % ":".join(files)
+#command = "rpmbuild --rcfile=/usr/lib/rpm/rpmrc:%s -bb *.spec" % ":".join(files)
+command = "rpmbuild --macros=%s -bb *.spec" % ":".join(macrofiles)
print "Executing: " + command
sys.stdout.flush()
if os.system(command): sys.exit(1)
View
13 packaging/install-deps
@@ -26,6 +26,9 @@ import pdb
is_url = re.compile("^(ftp|http)", re.I)
+# not ideal, but doesn't require having rpm installed on the main host machine
+pkg_name = re.compile("(?<=\\/)([^\\/ ]+?(?=\\-[0-9]))[^\\/]*$", re.I)
+
# Default to RELEASE
HEAD_or_RELEASE = "RELEASE"
build_source = False
@@ -82,8 +85,8 @@ if build_deps_package != 'none':
for dep in deps:
if is_url.search(dep):
- utils.get_url(dep, 'external_zip_pkg')
- files += [ 'external_zip_pkg' + os.sep + os.path.basename(dep) ]
+ utils.get_url(dep, 'external_zip_pkg' + os.sep + target)
+ files += [ 'external_zip_pkg' + os.sep + target + os.sep + os.path.basename(dep) ]
else:
package = packaging.package(target_conf, dep, HEAD_or_RELEASE=HEAD_or_RELEASE)
@@ -126,8 +129,10 @@ if target_conf.get_info_var('USE_ZIP_PKG'):
else:
if files:
- (code, rpm_names) = utils.launch_process("rpm -qp --queryformat '%%{NAME} ' %s" % " ".join(files))
- packs_to_remove += rpm_names.split()
+ #(code, rpm_names) = target_conf.buildenv.execute_command("rpm -qp --queryformat '%%{NAME} ' `ls %s/install-packages/*.rpm`" % build_location, exec_as_root=1)
+ #packs_to_remove += rpm_names.split()
+ for file in files:
+ packs_to_remove += [ pkg_name.search(file).group(1) ]
packs_to_remove = utils.remove_list_duplicates(packs_to_remove)
if packs_to_remove:
View
2 packaging/rpm_defs/ikvm/ikvm.spec
@@ -20,7 +20,7 @@ interoperability.
%prep
%setup -q
# For some reason this file is outside the source dir...
-cp ../LICENSE .
+#cp ../LICENSE .
# fix line endings for rpmlint
dos2unix LICENSE
View
8 pyutils/datastore.py
@@ -1,11 +1,15 @@
+import sys
+import os
+
+if sys.platform.startswith('darwin'):
+ os.environ['PY_USE_XMLPLUS'] = '1'
import xml.xpath
import xml.dom.minidom
import fcntl
-import os
import re
import distutils.dir_util
-import sys
+
import pdb
View
6 pyutils/packaging.py
@@ -325,9 +325,9 @@ def get_revision(self, serial):
distro = self.package_env.info['distro']
if self.destroot == distro:
(os, ver) = re.compile(r'(.*?)-(.*?)-.*').search(distro).groups()
- revision = "%s.%s%s.novell" % (serial, os, ver)
+ revision = "%s.%s%s.xamarin" % (serial, os, ver)
else:
- revision = serial + ".novell"
+ revision = serial + ".xamarin"
return revision
def get_mono_deps(self):
@@ -550,7 +550,7 @@ def get_source_file(self):
def get_dep_files(self, build_deps=False, recommend_deps=False, source_deps=False, zip_runtime_deps=False):
files = []
- url_dest = config.packaging_dir + os.sep + 'external_zip_pkg'
+ url_dest = config.packaging_dir + os.sep + 'external_zip_pkg' + os.sep + self.package_env.name
deps = []
if build_deps:
View
5 pyutils/utils.py
@@ -245,7 +245,6 @@ def extract_file(filename, preserve_symlinks=0, truncate_path='usr'):
def get_url(url, destination):
download_filename = destination + os.sep + os.path.basename(url)
-
# Get size to make sure it's > 0
if os.path.exists(download_filename):
size = os.stat(download_filename).st_size
@@ -631,6 +630,8 @@ def version_sort(my_list):
Uses the rpmvercmp python extension to speed things up a bit.
"""
+ print "FIXME: not actually sorting version in utils.version_sort"
+ """
sys.path.append(rpmvercmp_module_path)
try:
import rpmvercmp
@@ -644,7 +645,7 @@ def version_sort(my_list):
import rpmvercmp
my_list.sort(rpmvercmp.version_compare)
-
+ """
return my_list
def remove_list_duplicates(my_list):
View
2 rpmvercmp/Makefile
@@ -4,7 +4,7 @@ SWIG=swig
all: rpmvercmp _rpmvercmp.so
rpmvercmp: rpmvercmp.c Makefile
- ${CC} -Wall `pkg-config --libs --cflags glib-2.0` -I/opt/gnome/include -lpopt -lrpm -lrpmio -lrpmdb -o rpmvercmp rpmvercmp.c
+ ${CC} -Wall `pkg-config --libs --cflags glib-2.0` -I/opt/gnome/include -lpopt -lrpm -lrpmio -o rpmvercmp rpmvercmp.c
_rpmvercmp.so: rpmvercmp.c rpmvercmp.i Makefile
${SWIG} -python rpmvercmp.i
View
67 windows-installer/buildwindows-installer
@@ -108,7 +108,7 @@ class Selection:
for url in self.urls:
filename = os.path.basename(url)
- url_dest = config.packaging_dir + os.sep + 'external_zip_pkg'
+ url_dest = config.packaging_dir + os.sep + 'external_zip_pkg' + os.sep + 'win-4-i386'
url_dest_file = url_dest + os.sep + filename
if not os.path.exists(url_dest_file):
utils.get_url(url, url_dest)
@@ -146,7 +146,8 @@ selections += [ Selection('mono', packages = "mono boo ikvm nant mono-basic glue
selections += [ Selection('gtk', deps = "gtk-sharp212".split() ) ]
-selections += [ Selection('gtk-sharp', packages = "gtk-sharp212 mono-tools".split() ) ]
+#selections += [ Selection('gtk-sharp', packages = "gtk-sharp212 mono-tools".split() ) ]
+selections += [ Selection('gtk-sharp', deps = "gtk-sharp212".split() ) ]
# Grab the gtk# version, and if there's a revision, ditch it
gtk_sharp_version = selections[len(selections) - 1].versions['gtk-sharp212']
@@ -155,8 +156,7 @@ if gtk_sharp_version.count('-'):
# Hmm... needs to be a better way to package up these samples...
selections += [ Selection('samples', urls = """
-http://developer.novell.com/wiki/index.php/Special:File/sqlsharpgtk/SQL-Sharp~~~For~~~GTK-Sharp~~~0.4/sqlsharpgtk-0.4-bin.zip
-http://primates.ximian.com/~wberrier/windows-installer/samples-1.zip
+http://beefydude.lab.xamarin.com/packages/deps/win-4-i386/samples.zip
""".split()
) ]
@@ -191,43 +191,43 @@ files_used_in_installer = utils.remove_list_duplicates(files_used_in_installer)
##########################################
# Special case for sqlsharpgtk, massage it
-os.chdir('samples')
+#os.chdir('samples')
-distutils.dir_util.mkpath("lib/mono/sqlsharpgtk")
+#distutils.dir_util.mkpath("lib/mono/sqlsharpgtk")
# Weird... but it works (moves all files from the sqlsharpgtk dir into the dest dir
# (I would assume it moved the whole directory... but no)
-shutil.move("sqlsharpgtk", "lib/mono/sqlsharpgtk")
+#shutil.move("sqlsharpgtk", "lib/mono/sqlsharpgtk")
-distutils.dir_util.mkpath("bin")
+#distutils.dir_util.mkpath("bin")
# Create wrapper
-fd = open('bin/sqlsharpgtk', 'w')
-fd.write("""#!/bin/sh
-exec /tmp/install/bin/mono $MONO_OPTIONS C:/cygwin/tmp/install/lib/mono/sqlsharpgtk/sqlsharpgtk.exe "$@"
-""")
-fd.close()
-os.chmod('bin/sqlsharpgtk', config.shell_perms)
+#fd = open('bin/sqlsharpgtk', 'w')
+#fd.write("""#!/bin/sh
+#exec /tmp/install/bin/mono $MONO_OPTIONS C:/cygwin/tmp/install/lib/mono/sqlsharpgtk/sqlsharpgtk.exe "$@"
+#""")
+#fd.close()
+#os.chmod('bin/sqlsharpgtk', config.shell_perms)
-os.chdir("..")
+#os.chdir("..")
# End of sqlsharpgtk special case
#########################################
##########################################
# Special case for gtk-sharp samples
-os.chdir('samples')
+#os.chdir('samples')
# Move them from the gtk-sharp-2.8 package
-distutils.dir_util.copy_tree("../gtk-sharp/samples", "samples")
-distutils.dir_util.remove_tree("../gtk-sharp/samples")
+#distutils.dir_util.copy_tree("../gtk-sharp/samples", "samples")
+#distutils.dir_util.remove_tree("../gtk-sharp/samples")
-distutils.dir_util.mkpath('bin')
+#distutils.dir_util.mkpath('bin')
-fd = open('bin/GtkDemo', 'w')
-fd.write("""#!/bin/sh
-exec @@WIN_MONO_INST_DIR@@/bin/mono @@WIN_MONO_INST_DIR@@/samples/gtk-sharp-2.0/GtkDemo/GtkDemo.exe "$@" """)
-fd.close()
+#fd = open('bin/GtkDemo', 'w')
+#fd.write("""#!/bin/sh
+#exec @@WIN_MONO_INST_DIR@@/bin/mono @@WIN_MONO_INST_DIR@@/samples/gtk-sharp-2.0/GtkDemo/GtkDemo.exe "$@" """)
+#fd.close()
-os.chdir("..")
+#os.chdir("..")
# End of gtk-sharp samples special case
#########################################
@@ -302,13 +302,14 @@ os.chdir('..')
os.chdir('mono')
os.mkdir('share/doc/gdiplus')
-shutil.move('redist.txt', 'share/doc/gdiplus')
-shutil.move('license.txt', 'share/doc/gdiplus')
+#shutil.move('redist.txt', 'share/doc/gdiplus')
+shutil.move('gdiplus/eula.txt', 'share/doc/gdiplus')
#shutil.move('gdiplus.dll', 'bin')
# Need to move it back so it doesn't get grabbed with the mono\* selection
-shutil.move('gdiplus.dll', '..')
+shutil.move('gdiplus/gdiplus.dll', '..')
+shutil.rmtree('gdiplus')
os.chdir("..")
#
@@ -506,16 +507,16 @@ for selection in selections:
# TODO: Should this happen in the gtk-sharp build?
# This will change once gtk-sharp2 is built with mcs/mono instead of the ms sdk
#gapi2-codegen
-shutil.copy("gtk-sharp/lib/gtk-sharp-2.0/gapi_codegen.exe", "gtk-sharp/bin/gapi2-codegen.exe")
-os.remove("gtk-sharp/bin/gapi2-codegen")
+#shutil.copy("gtk-sharp/lib/gtk-sharp-2.0/gapi_codegen.exe", "gtk-sharp/bin/gapi2-codegen.exe")
+#os.remove("gtk-sharp/bin/gapi2-codegen")
#gapi2-fixup
-shutil.copy("gtk-sharp/lib/gtk-sharp-2.0/gapi-fixup.exe", "gtk-sharp/bin/gapi2-fixup.exe")
-os.remove("gtk-sharp/bin/gapi2-fixup")
+#shutil.copy("gtk-sharp/lib/gtk-sharp-2.0/gapi-fixup.exe", "gtk-sharp/bin/gapi2-fixup.exe")
+#os.remove("gtk-sharp/bin/gapi2-fixup")
#gapi2-parser
-shutil.copy("gtk-sharp/lib/gtk-sharp-2.0/gapi-parser.exe", "gtk-sharp/bin/gapi2-parser.exe")
-os.remove("gtk-sharp/bin/gapi2-parser")
+#shutil.copy("gtk-sharp/lib/gtk-sharp-2.0/gapi-parser.exe", "gtk-sharp/bin/gapi2-parser.exe")
+#os.remove("gtk-sharp/bin/gapi2-parser")
#gconfsharp2-schemagen
#shutil.copy("gtk-sharp/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe", "gtk-sharp/bin/gconfsharp2-schemagen.exe")

0 comments on commit 71c14bd

Please sign in to comment.