Author: wade Date: 2007-07-12 17:40:21 -0400 (Thu, 12 Jul 2007) New Revision: 81909
Added: trunk/release/packaging/conf/debian-4-arm trunk/release/packaging/conf/debian-4-sparc Removed: trunk/release/packaging/conf/debian-31-arm trunk/release/packaging/conf/debian-31-sparc trunk/release/packaging/conf/fedora-3-i386 trunk/release/packaging/conf/fedora-4-i386 trunk/release/packaging/conf/fedora-4-ppc trunk/release/packaging/conf/fedora-4-x86_64 trunk/release/packaging/conf/redhat-9-i386 trunk/release/packaging/conf/suse-92-i586 trunk/release/packaging/conf/suse-93-i586 trunk/release/packaging/conf/suse-93-x86_64 Modified: trunk/release/linux-installer/buildlinux-installer trunk/release/packaging/conf/rhel-3-i386 trunk/release/packaging/conf/sles-9-i586 trunk/release/packaging/defs/gecko-sharp-2.0 trunk/release/packaging/defs/gnome-sharp trunk/release/packaging/defs/gtk-sharp trunk/release/packaging/defs/gtk-sharp-2.0 trunk/release/packaging/defs/gtk-sharp-2.10 trunk/release/packaging/defs/gtk-sharp-2.8 trunk/release/packaging/defs/gtksourceview-sharp-2.0 trunk/release/packaging/defs/heap-buddy trunk/release/packaging/defs/last-exit trunk/release/packaging/defs/libgdiplus trunk/release/packaging/defs/mod_mono trunk/release/packaging/defs/mono trunk/release/packaging/defs/mono-1.1.13 trunk/release/packaging/defs/mono-1.1.7 trunk/release/packaging/defs/mono-1.1.8 trunk/release/packaging/defs/mono-basic trunk/release/packaging/defs/mono-debugger trunk/release/packaging/defs/mono-tools trunk/release/packaging/defs/monodevelop Log: packaging/defs: packaging/conf: -remove end-of-life distros -updated debian boxes to 4.0 -bump up lcd distros for gtk# apps -gtk# 2.10 packaging updates linux-installer/buildlinux-installer: -update to use new x86 lcd distro Modified: trunk/release/linux-installer/buildlinux-installer =================================================================== --- trunk/release/linux-installer/buildlinux-installer 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/linux-installer/buildlinux-installer 2007-07-12 21:40:21 UTC (rev 81909) @@ -26,40 +26,34 @@ # Probably won't ship gtk# until we provide fallback libraries like vmware does. -# md doesn't run on suse 93, needs 10.0 now, update accordingly (at least, when the next version of md ships) +# These should be the same as the sles-9 versions +external_rpms_list = """ + ftp://ftp.suse.com/pub/suse/discontinued/i386/9.1/suse/i586/pkgconfig-0.15.0-194.i586.rpm + ftp://ftp.suse.com/pub/suse/discontinued/i386/9.1/suse/i586/ncurses-5.4-59.i586.rpm -external_rpms_list = [ - "ftp://archive.download.redhat.com/pub/redhat/linux/9/en/os/i386/RedHat/RPMS/pkgconfig-0.14.0-3.i386.rpm";, + ftp://ftp.suse.com/pub/suse/discontinued/i386/9.1/suse/i586/libtiff-3.6.1-38.i586.rpm + ftp://ftp.suse.com/pub/suse/discontinued/i386/9.1/suse/i586/libungif-4.1.0b1-581.i586.rpm + ftp://ftp.suse.com/pub/suse/discontinued/i386/9.1/suse/i586/libpng-1.2.5-182.i586.rpm + ftp://ftp.suse.com/pub/suse/discontinued/i386/9.1/suse/i586/libjpeg-6.2.0-731.i586.rpm + ftp://ftp.suse.com/pub/suse/discontinued/i386/9.1/suse/i586/zlib-1.2.1-70.i586.rpm + ftp://ftp.suse.com/pub/suse/discontinued/i386/9.1/suse/i586/expat-1.95.7-37.i586.rpm +""".split() - "ftp://archive.download.redhat.com/pub/redhat/linux/9/en/os/i386/RedHat/RPMS/ncurses-5.3-4.i386.rpm";, +# What's gal2 for? + #http://suse.mirrors.tds.net/pub/opensuse/distribution/SL-10.0-OSS/inst-source/suse/i586/gal2-2.5.3-5.i586.rpm +custom_rpms_list = """ + http://suse.mirrors.tds.net/pub/opensuse/distribution/SL-10.0-OSS/inst-source/suse/i586/gtkhtml2-3.8.0-3.i586.rpm + http://suse.mirrors.tds.net/pub/opensuse/distribution/SL-10.0-OSS/inst-source/suse/i586/gtksourceview-1.4.1-2.i586.rpm +""".split() - "ftp://archive.download.redhat.com/pub/redhat/linux/9/en/os/i386/RedHat/RPMS/libtiff-3.5.7-11.i386.rpm";, - "ftp://archive.download.redhat.com/pub/redhat/linux/9/en/os/i386/RedHat/RPMS/libungif-4.1.0-15.i386.rpm";, - "ftp://archive.download.redhat.com/pub/redhat/linux/9/en/os/i386/RedHat/RPMS/libpng-1.2.2-16.i386.rpm";, - "ftp://archive.download.redhat.com/pub/redhat/linux/9/en/os/i386/RedHat/RPMS/libjpeg-6b-26.i386.rpm";, - "ftp://archive.download.redhat.com/pub/redhat/linux/9/en/os/i386/RedHat/RPMS/zlib-1.1.4-8.i386.rpm";, - "ftp://archive.download.redhat.com/pub/redhat/linux/9/en/os/i386/RedHat/RPMS/expat-1.95.5-2.i386.rpm"; -] - -custom_rpms_list = [ - "ftp://mirrors.kernel.org/suse/i386/9.3/suse/i586/gtkhtml2-3.6.1-5.i586.rpm";, - "http://primates.ximian.com/~wberrier/linux-installer/rpms/libgtkhtml3.0_4-3.0.10-0.ximian.6.1.i386.rpm";, - "http://primates.ximian.com/~wberrier/linux-installer/rpms/gtksourceview-1.0.1-0.ximian.6.1.i386.rpm";, - "ftp://ftp.ximian.com/pub/ximian-evolution/redhat-9-i386/libgal2.0_6-1.99.11-0.ximian.6.1.i386.rpm"; -] - # rpm locations we build locally - -# Hrm... won't be able to use redhat-9 as a base, as it was heavily patched. -# going to have to do some testing on this... -# redhat's gtkhtml sharp package doesn't actually work on redhat boxes (not like anyone is using those...) -# but, we'll need it for the installer, and built on the lcd... local_rpms = [ - {'name': 'redhat-9-i386', 'packages': [ + {'name': 'sles-9-i586', 'packages': [ "mono", "mono-debugger", "heap-buddy", "libgdiplus", + "boo", "xsp", "ikvm", @@ -68,15 +62,15 @@ "ipce", "mono-basic", + ] }, + {'name': 'suse-100-i586', 'packages': [ "gtk-sharp", + "gtk-sharp-2.8", "mono-tools", "monodevelop", "gecko-sharp", "gecko-sharp-2.0", "gtksourceview-sharp-2.0", - ] }, - {'name': 'suse-93-i586', 'packages': [ - "gtk-sharp-2.0", ] } ] @@ -178,7 +172,7 @@ # Collect local rpm files for selection in local_rpms: - conf = packaging.buildconf(selection['name']) + conf = packaging.buildconf(selection['name'], skip_alternates=True) for pack in selection['packages']: pack_obj = packaging.package(conf, pack) @@ -289,9 +283,17 @@ # Fix broken tiff package (package should contain this link, but doesn't) os.chdir("usr/lib") -os.symlink("libtiff.so.3.5", "libtiff.so.3") +if not os.path.exists("libtiff.so.3"): + os.symlink("libtiff.so.3.5", "libtiff.so.3") os.chdir("../..") +# ncurses for suse 9.1 has files under /lib instead of /usr/lib, fix up +os.chdir("lib") +for f in os.listdir('.'): + shutil.move(f, '../usr/lib') +os.chdir("..") +os.rmdir('lib') + shutil.copy(p + "/../projects/mono.xml", p) utils.substitute_parameters_in_file(p + "/mono.xml", { '@@VERSION@@': mono_version } ) Deleted: trunk/release/packaging/conf/debian-31-arm =================================================================== --- trunk/release/packaging/conf/debian-31-arm 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/conf/debian-31-arm 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,5 +0,0 @@ -username=builder -hostname=mono-arm.dnsdhcp.provo.novell.com - -USE_ZIP_PKG=1 - Deleted: trunk/release/packaging/conf/debian-31-sparc =================================================================== --- trunk/release/packaging/conf/debian-31-sparc 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/conf/debian-31-sparc 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,5 +0,0 @@ -username=builder -hostname=mono-linux-sparc.dnsdhcp.provo.novell.com - -USE_ZIP_PKG=1 - Copied: trunk/release/packaging/conf/debian-4-arm (from rev 81662, trunk/release/packaging/conf/debian-31-arm) Copied: trunk/release/packaging/conf/debian-4-sparc (from rev 81662, trunk/release/packaging/conf/debian-31-sparc) Deleted: trunk/release/packaging/conf/fedora-3-i386 =================================================================== --- trunk/release/packaging/conf/fedora-3-i386 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/conf/fedora-3-i386 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,10 +0,0 @@ -username=builder -hostname=hardhat.boston.ximian.com -root_dir=/jails/fedora-3-i386-root-0 - -# Repo conf -USE_OC=1 -OC_DOWNLOAD_URL="http://www.snorp.net/files/packages/rcd-fc3/"; - -USE_YUM=1 - Deleted: trunk/release/packaging/conf/fedora-4-i386 =================================================================== --- trunk/release/packaging/conf/fedora-4-i386 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/conf/fedora-4-i386 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,5 +0,0 @@ -username=builder -hostname=hardhat.boston.ximian.com -root_dir=/jails/fedora-4-i386-root-0 - -USE_YUM=1 Deleted: trunk/release/packaging/conf/fedora-4-ppc =================================================================== --- trunk/release/packaging/conf/fedora-4-ppc 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/conf/fedora-4-ppc 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,6 +0,0 @@ -username=builder -hostname=mono-linux-ppc.dnsdhcp.provo.novell.com -root_dir=/jails/fedora-4-ppc -chroot_path=/usr/bin/chroot - -USE_YUM=1 Deleted: trunk/release/packaging/conf/fedora-4-x86_64 =================================================================== --- trunk/release/packaging/conf/fedora-4-x86_64 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/conf/fedora-4-x86_64 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,6 +0,0 @@ -username=builder -hostname=monobuild2.boston.ximian.com -root_dir=/jails/fedora-4-x86_64-root-0/jail/ -chroot_path=/usr/bin/chroot - -USE_YUM=1 Deleted: trunk/release/packaging/conf/redhat-9-i386 =================================================================== --- trunk/release/packaging/conf/redhat-9-i386 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/conf/redhat-9-i386 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,9 +0,0 @@ -username=builder -hostname=monobuild1.boston.ximian.com -# Don't put this on hardhat, because when mktarball is running, it takes way too long -#hostname=hardhat.boston.ximian.com -root_dir=/jails/redhat-9-i386-duncan-1 - -web_index=0 - -USE_OC=1 Modified: trunk/release/packaging/conf/rhel-3-i386 =================================================================== --- trunk/release/packaging/conf/rhel-3-i386 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/conf/rhel-3-i386 2007-07-12 21:40:21 UTC (rev 81909) @@ -2,6 +2,9 @@ hostname=hardhat.boston.ximian.com root_dir=/jails/rhel-3as-i386-duncan-0 +# It will be a while before this is EOL +# http://www.redhat.com/security/updates/errata/ + distro_aliases=( rhel-3as-i386 rhel-3es-i386 Modified: trunk/release/packaging/conf/sles-9-i586 =================================================================== --- trunk/release/packaging/conf/sles-9-i586 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/conf/sles-9-i586 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,3 +1,5 @@ +web_index=0 + username=builder hostname=hardhat.boston.ximian.com root_dir=/jails/sles-9-i586-duncan-0 Deleted: trunk/release/packaging/conf/suse-92-i586 =================================================================== --- trunk/release/packaging/conf/suse-92-i586 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/conf/suse-92-i586 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,6 +0,0 @@ -username=builder -hostname=hardhat.boston.ximian.com -root_dir=/jails/suse-92-i586-root-0/jail - -USE_OC=1 -USE_YAST=1 Deleted: trunk/release/packaging/conf/suse-93-i586 =================================================================== --- trunk/release/packaging/conf/suse-93-i586 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/conf/suse-93-i586 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,12 +0,0 @@ -username=builder -hostname=hardhat.boston.ximian.com -root_dir=/jails/suse-93-i586-root-0/jail -# This is so /opt/gnome/lib stuff gets set -target_command_prefix=". /etc/profile;" - -# Repo conf -USE_OC=1 -OC_NOTES="Red Carpet packages are also available in the SuSE repositories for this distro, but the previous link has an updated version." - -USE_YAST=1 - Deleted: trunk/release/packaging/conf/suse-93-x86_64 =================================================================== --- trunk/release/packaging/conf/suse-93-x86_64 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/conf/suse-93-x86_64 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,12 +0,0 @@ -username=builder -hostname=monobuild2.boston.ximian.com -root_dir=/jails/suse-93-x86_64-root-0/jail/ -chroot_path=/usr/bin/chroot - - -# Repo conf -USE_OC=1 -OC_NOTES="Red Carpet packages are also available in the SuSE repositories for this distro, but the previous link has an updated version." - -USE_YAST=1 - Modified: trunk/release/packaging/defs/gecko-sharp-2.0 =================================================================== --- trunk/release/packaging/defs/gecko-sharp-2.0 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/defs/gecko-sharp-2.0 2007-07-12 21:40:21 UTC (rev 81909) @@ -2,18 +2,13 @@ suse-100-i586 ) +web_index=6 USE_HOSTS=( - fedora-3-i386 - fedora-4-i386 - fedora-4-ppc - fedora-4-x86_64 fedora-5-i386 fedora-5-x86_64 nld-9-i586 rhel-4-i386 - suse-93-i586 - suse-93-x86_64 suse-100-i586 suse-100-ppc suse-100-x86_64 Modified: trunk/release/packaging/defs/gnome-sharp =================================================================== --- trunk/release/packaging/defs/gnome-sharp 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/defs/gnome-sharp 2007-07-12 21:40:21 UTC (rev 81909) @@ -4,8 +4,10 @@ win-4-i386 ) -MKTARBALL_HOST="suse-102-i586" +web_index=7 +MKTARBALL_HOST="suse-102-x86_64" + USE_HOSTS=([EMAIL PROTECTED]) MONO_DEPS=( Modified: trunk/release/packaging/defs/gtk-sharp =================================================================== --- trunk/release/packaging/defs/gtk-sharp 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/defs/gtk-sharp 2007-07-12 21:40:21 UTC (rev 81909) @@ -4,24 +4,18 @@ USE_PATCHES=1 +MKTARBALL_HOST="suse-100-i586" + BUILD_HOSTS=( - fedora-3-i386 - fedora-4-i386 - fedora-4-ppc - fedora-4-x86_64 fedora-5-i386 fedora-5-x86_64 nld-9-i586 - redhat-9-i386 rhel-3-i386 rhel-4-i386 sles-9-i586 # These don't have all necessary deps #sles-9-ia64 #sles-9-x86_64 - suse-92-i586 - suse-93-i586 - suse-93-x86_64 suse-100-i586 suse-100-ppc suse-100-x86_64 @@ -201,3 +195,4 @@ tags/gtk-sharp/[[versiondot]]/gtk-sharp ) + Modified: trunk/release/packaging/defs/gtk-sharp-2.0 =================================================================== --- trunk/release/packaging/defs/gtk-sharp-2.0 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/defs/gtk-sharp-2.0 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,18 +1,12 @@ -web_index=6 +web_index=5 def_alias="gtk-sharp" version_selection_reg="2\.4\.\d+" BUILD_HOSTS=( - fedora-3-i386 - fedora-4-i386 - fedora-4-ppc - fedora-4-x86_64 nld-9-i586 rhel-4-i386 - suse-93-i586 - suse-93-x86_64 ) USE_HOSTS=([EMAIL PROTECTED]) @@ -31,7 +25,7 @@ } HEAD_PATH=( - trunk/gtk-sharp + branches/gtk-sharp-2-468-branch/gtk-sharp ) RELEASE_PATH=( tags/gtk-sharp/[[gtksharp2ver]]/gtk-sharp @@ -48,14 +42,20 @@ get_source () { - # Handle the new gtk-sharp2 tag namaing standard (example tag version: 2.x.2) - # turn 2.8.2 into 2.x.2, and replace gtksharp2ver with it - gtksharp2ver_match=\\[\\[gtksharp2ver\\]\\] - new_version=`echo $VERSION | sed s/\.[0-9]\./\.x\./` - new_path=${SVN_PATHS//$gtksharp2ver_match/${new_version}} + if test x$HEAD_or_RELEASE = x"RELEASE" ; then + # Handle the new gtk-sharp2 tag namaing standard (example tag version: 2.x.2) + # turn 2.8.2 into 2.x.2, and replace gtksharp2ver with it + gtksharp2ver_match=\\[\\[gtksharp2ver\\]\\] + new_version=`echo $VERSION | sed s/\\.[0-9]\\./\\.x\\./` + new_path=${SVN_PATHS//$gtksharp2ver_match/${new_version}} + else + new_path=$SVN_PATHS + + fi echo "New path: $new_path" + echo "command: $SVNEXPORT $MONO_ROOT/$new_path" $SVNEXPORT $MONO_ROOT/$new_path } Modified: trunk/release/packaging/defs/gtk-sharp-2.10 =================================================================== --- trunk/release/packaging/defs/gtk-sharp-2.10 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/defs/gtk-sharp-2.10 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,5 +1,7 @@ def_alias="gtk-sharp-2.0" +web_index=6 + BUILD_HOSTS=( suse-102-i586 suse-102-x86_64 @@ -17,7 +19,7 @@ monodoc ) -MKTARBALL_HOST="suse-102-i586" +MKTARBALL_HOST="suse-102-x86_64" get_destroot () { DEST_ROOT=$DISTRO Modified: trunk/release/packaging/defs/gtk-sharp-2.8 =================================================================== --- trunk/release/packaging/defs/gtk-sharp-2.8 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/defs/gtk-sharp-2.8 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,4 +1,4 @@ -web_index=7 +web_index=5 def_alias="gtk-sharp-2.0" @@ -13,8 +13,6 @@ suse-101-i586 suse-101-ppc suse-101-x86_64 - suse-102-i586 - suse-102-x86_64 win-4-i386 ) Modified: trunk/release/packaging/defs/gtksourceview-sharp-2.0 =================================================================== --- trunk/release/packaging/defs/gtksourceview-sharp-2.0 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/defs/gtksourceview-sharp-2.0 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,18 +1,12 @@ +web_index=7 + BUILD_HOSTS=( - suse-93-i586 + suse-100-i586 ) USE_HOSTS=( - fedora-3-i386 - fedora-4-i386 - fedora-4-ppc - fedora-4-x86_64 fedora-5-i386 fedora-5-x86_64 - nld-9-i586 - rhel-4-i386 - suse-93-i586 - suse-93-x86_64 suse-100-i586 suse-100-ppc suse-100-x86_64 Modified: trunk/release/packaging/defs/heap-buddy =================================================================== --- trunk/release/packaging/defs/heap-buddy 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/defs/heap-buddy 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,7 +1,7 @@ web_index=10 BUILD_HOSTS=( - redhat-9-i386 + sles-9-i586 sles-9-x86_64 sles-9-ia64 sles-9-ppc @@ -11,14 +11,9 @@ USE_HOSTS=( - fedora-3-i386 - fedora-4-i386 - fedora-4-ppc - fedora-4-x86_64 fedora-5-i386 fedora-5-x86_64 nld-9-i586 - redhat-9-i386 rhel-3-i386 rhel-4-i386 sles-9-i586 @@ -27,8 +22,6 @@ sles-9-s390 sles-9-s390x sles-9-x86_64 - suse-93-i586 - suse-93-x86_64 suse-100-i586 suse-100-ppc suse-100-x86_64 Modified: trunk/release/packaging/defs/last-exit =================================================================== --- trunk/release/packaging/defs/last-exit 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/defs/last-exit 2007-07-12 21:40:21 UTC (rev 81909) @@ -4,10 +4,8 @@ suse-101-i586 suse-101-ppc suse-101-x86_64 - - # Will add these once we publish the new gtk# for 10.2 - #suse-102-i586 - #suse-102-x86_64 + suse-102-i586 + suse-102-x86_64 ) USE_HOSTS=([EMAIL PROTECTED]) Modified: trunk/release/packaging/defs/libgdiplus =================================================================== --- trunk/release/packaging/defs/libgdiplus 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/defs/libgdiplus 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,19 +1,14 @@ web_index=4 BUILD_HOSTS=( - debian-31-arm - debian-31-sparc - fedora-3-i386 - fedora-4-i386 - fedora-4-ppc - fedora-4-x86_64 + debian-4-arm + debian-4-sparc fedora-5-i386 fedora-5-x86_64 macos-10-ppc macos-10-x86 nld-9-i586 nld-9-x86_64 - redhat-9-i386 rhel-3-i386 rhel-4-i386 sles-9-i586 @@ -24,8 +19,6 @@ sles-9-x86_64 sunos-8-sparc sunos-10-x86 - suse-93-i586 - suse-93-x86_64 suse-100-i586 suse-100-ppc suse-100-x86_64 Modified: trunk/release/packaging/defs/mod_mono =================================================================== --- trunk/release/packaging/defs/mod_mono 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/defs/mod_mono 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,10 +1,6 @@ web_index=8 BUILD_HOSTS=( - fedora-3-i386 - fedora-4-i386 - fedora-4-ppc - fedora-4-x86_64 fedora-5-i386 fedora-5-x86_64 nld-9-i586 @@ -17,8 +13,6 @@ sles-9-s390 sles-9-s390x sles-9-x86_64 - suse-93-i586 - suse-93-x86_64 suse-100-i586 suse-100-ppc suse-100-x86_64 Modified: trunk/release/packaging/defs/mono =================================================================== --- trunk/release/packaging/defs/mono 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/defs/mono 2007-07-12 21:40:21 UTC (rev 81909) @@ -2,13 +2,12 @@ #USE_PATCHES=1 -# Possibly use sles-8 as the new base distro? BUILD_HOSTS=( - debian-31-arm - debian-31-sparc + debian-4-arm + debian-4-sparc macos-10-ppc macos-10-x86 - redhat-9-i386 + sles-9-i586 sles-9-x86_64 sles-9-ia64 sles-9-ppc @@ -20,19 +19,14 @@ ) USE_HOSTS=( - debian-31-arm - debian-31-sparc - fedora-3-i386 - fedora-4-i386 - fedora-4-ppc - fedora-4-x86_64 + debian-4-arm + debian-4-sparc fedora-5-i386 fedora-5-x86_64 macos-10-ppc macos-10-x86 nld-9-i586 nld-9-x86_64 - redhat-9-i386 rhel-3-i386 rhel-4-i386 sles-9-i586 @@ -42,8 +36,6 @@ sles-9-s390x sles-9-x86_64 sunos-8-sparc - suse-93-i586 - suse-93-x86_64 suse-100-i586 suse-100-ppc suse-100-x86_64 @@ -375,7 +367,7 @@ POSTBUILD_STEP_NAME5="test-swf" POSTBUILD_STEP5 () { - DISPLAY=monobuild1.boston.ximian.com:1 + DISPLAY=monobuild2.boston.ximian.com:1 export DISPLAY cd mcs/class/System.Drawing Modified: trunk/release/packaging/defs/mono-1.1.13 =================================================================== --- trunk/release/packaging/defs/mono-1.1.13 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/defs/mono-1.1.13 2007-07-12 21:40:21 UTC (rev 81909) @@ -4,10 +4,10 @@ version_selection_reg="1\.1\.13\.\d+" BUILD_HOSTS=( - debian-31-arm - debian-31-sparc + debian-4-arm + debian-4-sparc macos-10-ppc - redhat-9-i386 + sles-9-i586 sles-9-ia64 sles-9-ppc sles-9-s390 @@ -19,13 +19,11 @@ ) USE_HOSTS=( - debian-31-arm - debian-31-sparc + debian-4-arm + debian-4-sparc macos-10-ppc - fedora-3-i386 nld-9-i586 nld-9-x86_64 - redhat-9-i386 rhel-3-i386 rhel-4-i386 sles-9-i586 @@ -35,8 +33,6 @@ sles-9-x86_64 sunos-8-sparc sunos-10-x86 - suse-93-i586 - suse-93-x86_64 win-4-i386 ) Modified: trunk/release/packaging/defs/mono-1.1.7 =================================================================== --- trunk/release/packaging/defs/mono-1.1.7 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/defs/mono-1.1.7 2007-07-12 21:40:21 UTC (rev 81909) @@ -4,21 +4,17 @@ version_selection_reg="1\.1\.7\.\d+" BUILD_HOSTS=( - redhat-9-i386 + sles-9-i586 sles-9-x86_64 ) USE_HOSTS=( - fedora-3-i386 nld-9-i586 nld-9-x86_64 - redhat-9-i386 rhel-3-i386 rhel-4-i386 sles-9-i586 sles-9-x86_64 - suse-93-i586 - suse-93-x86_64 ) MONO_DEPS=( Modified: trunk/release/packaging/defs/mono-1.1.8 =================================================================== --- trunk/release/packaging/defs/mono-1.1.8 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/defs/mono-1.1.8 2007-07-12 21:40:21 UTC (rev 81909) @@ -4,21 +4,17 @@ version_selection_reg="1\.1\.8\.\d+" BUILD_HOSTS=( - redhat-9-i386 + sles-9-i586 sles-9-x86_64 ) USE_HOSTS=( - fedora-3-i386 nld-9-i586 nld-9-x86_64 - redhat-9-i386 rhel-3-i386 rhel-4-i386 sles-9-i586 sles-9-x86_64 - suse-93-i586 - suse-93-x86_64 ) # 1.1.7 for now... (until we have a 1.1.8) Modified: trunk/release/packaging/defs/mono-basic =================================================================== --- trunk/release/packaging/defs/mono-basic 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/defs/mono-basic 2007-07-12 21:40:21 UTC (rev 81909) @@ -21,8 +21,8 @@ sunos-8-sparc sunos-10-x86 win-4-i386 - debian-31-arm - debian-31-sparc + debian-4-arm + debian-4-sparc ) USE_HOSTS=( @@ -47,15 +47,14 @@ # For building... elif test "x$DISTRO" = "xsuse-100-i586" ; then DEST_ROOT=noarch - # For building 0.13.1 and before... - elif test "x$DISTRO" = "xsuse-93-i586" ; then - DEST_ROOT=noarch else - # for monobuild (building on all archs) - #DEST_ROOT=$DISTRO - - # For release time - DEST_ROOT=noarch + if test "x$HEAD_or_RELEASE" = "xHEAD" ; then + # for monobuild (building on all archs) + DEST_ROOT=$DISTRO + else + # For release time + DEST_ROOT=noarch + fi fi } Modified: trunk/release/packaging/defs/mono-debugger =================================================================== --- trunk/release/packaging/defs/mono-debugger 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/defs/mono-debugger 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,25 +1,19 @@ web_index=9 BUILD_HOSTS=( - redhat-9-i386 + sles-9-i586 sles-9-x86_64 ) USE_HOSTS=( - fedora-3-i386 - fedora-4-i386 - fedora-4-x86_64 fedora-5-i386 fedora-5-x86_64 nld-9-i586 nld-9-x86_64 - redhat-9-i386 rhel-3-i386 rhel-4-i386 sles-9-i586 sles-9-x86_64 - suse-93-i586 - suse-93-x86_64 suse-100-i586 suse-100-x86_64 suse-101-i586 Modified: trunk/release/packaging/defs/mono-tools =================================================================== --- trunk/release/packaging/defs/mono-tools 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/defs/mono-tools 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,21 +1,15 @@ web_index=1 BUILD_HOSTS=( - suse-93-i586 + suse-100-i586 ) USE_HOSTS=( - fedora-3-i386 - fedora-4-i386 - fedora-4-ppc - fedora-4-x86_64 fedora-5-i386 fedora-5-x86_64 nld-9-i586 nld-9-x86_64 rhel-4-i386 - suse-93-i586 - suse-93-x86_64 suse-100-i586 suse-100-ppc suse-100-x86_64 Modified: trunk/release/packaging/defs/monodevelop =================================================================== --- trunk/release/packaging/defs/monodevelop 2007-07-12 21:34:56 UTC (rev 81908) +++ trunk/release/packaging/defs/monodevelop 2007-07-12 21:40:21 UTC (rev 81909) @@ -1,23 +1,10 @@ web_index=2 BUILD_HOSTS=( - # md 0.13.1 and before build here - #suse-93-i586 suse-100-i586 ) USE_HOSTS=( - # md 0.13.1 runs on these distros - #fedora-3-i386 - #fedora-4-i386 - #fedora-4-ppc - #fedora-4-x86_64 - #nld-9-i586 - #rhel-4-i386 - #suse-92-i586 - #suse-93-i586 - #suse-93-x86_64 - fedora-5-i386 fedora-5-x86_64 suse-100-i586 _______________________________________________ Mono-patches maillist - [email protected] http://lists.ximian.com/mailman/listinfo/mono-patches
