Author: wade
Date: 2006-08-28 16:11:50 -0400 (Mon, 28 Aug 2006)
New Revision: 64494

Modified:
   trunk/release/conf/mono/ximian-build.conf
   trunk/release/conf/nant/ximian-build.conf
   trunk/release/linux-installer/buildlinux-installer
   trunk/release/linux-installer/projects/Readme.txt
   trunk/release/linux-installer/projects/mono.xml
   trunk/release/macosx/new/buildpackage
   trunk/release/monobuild/scheduler-daemon.py
   trunk/release/packaging/defs/mono
   trunk/release/packaging/defs/mono-basic
   trunk/release/packaging/defs/monodevelop
   trunk/release/packaging/do-install-zip-pkgs
   trunk/release/packaging/do-msvn-tar
   trunk/release/packaging/mktarball
   trunk/release/pyutils/config.py
   trunk/release/sunos/buildpackage
   trunk/release/windows-installer/Mono.iss
   trunk/release/windows-installer/buildwindows-installer
Log:
defs:
-monodevelop: 
 -add mono-basic for a runtime dep
-mono-basic:
 -fix svn tag path
-mono:
 -add dllmaps to etc/mono/config instead of each dll's .config
 -don't fail on cleanup step
 -add aot test step

release/conf:
-nant:
 -user mono-find-* from mono package instead of hacked up local version
-mono:
 -update filelist for CustomMarshalers

installers (mac, sunos, linux, win)
-add mono-basic to package list

release/linux-installer/buildpackage:
-re-add monodevelop for this release

monobuild/scheduler-daemon.py:
-fix off by one error for shutting down the daemon
 (forgot to count main execution loop as a thread)
 
packaging/mktarball:
packaging/do-msvn-tar:
-add some error handling

do-install-zip-pkgs:
-also relocate /etc/mono/config for mac dllmaps 

pyutils/config.py
-add more packages/distro for scheduler daemon



Modified: trunk/release/conf/mono/ximian-build.conf
===================================================================
--- trunk/release/conf/mono/ximian-build.conf   2006-08-28 20:10:48 UTC (rev 
64493)
+++ trunk/release/conf/mono/ximian-build.conf   2006-08-28 20:11:50 UTC (rev 
64494)
@@ -55,8 +55,6 @@
        <dep id="provides">
          <i>mono = [[fullversion]]</i>
          <i>mono-ikvm = [[fullversion]]</i>
-         <i>mono(mscorlib) = 1.0.5000.0</i>
-         <i>mono(mscorlib) = 2.0.0.0</i>
        </dep>
 
        <dep id="conflicts">
@@ -208,6 +206,11 @@
          <i>[[usrprefix]]/lib/mono/gac/Commons.Xml.Relaxng</i>
          <i>[[usrprefix]]/lib/mono/1.0/Commons.Xml.Relaxng.dll</i>
          <i>[[usrprefix]]/lib/mono/2.0/Commons.Xml.Relaxng.dll</i>
+
+         <i>[[usrprefix]]/lib/mono/gac/CustomMarshalers</i>
+         <i>[[usrprefix]]/lib/mono/1.0/CustomMarshalers.dll</i>
+         <i>[[usrprefix]]/lib/mono/2.0/CustomMarshalers.dll</i>
+
        </files>
 
        <docs />

Modified: trunk/release/conf/nant/ximian-build.conf
===================================================================
--- trunk/release/conf/nant/ximian-build.conf   2006-08-28 20:10:48 UTC (rev 
64493)
+++ trunk/release/conf/nant/ximian-build.conf   2006-08-28 20:11:50 UTC (rev 
64494)
@@ -78,7 +78,6 @@
 
         <docs />
 
-<!-- Use private copies of mono-find-provides until mono is updated -->
 <script id="find_provides">
            <i>
 <![CDATA[
@@ -88,7 +87,7 @@
  
 {
     echo $filelist | tr [:blank:] \\n | /usr/lib/rpm/find-provides
-    echo $filelist | tr [:blank:] \\n | /mono-find-provides
+    echo $filelist | tr [:blank:] \\n | /usr/bin/mono-find-provides
 } | sort | uniq
 
 ]]>
@@ -104,7 +103,7 @@
  
 {
     echo $filelist | tr [:blank:] \\n | /usr/lib/rpm/find-requires
-    echo $filelist | tr [:blank:] \\n | /mono-find-requires
+    echo $filelist | tr [:blank:] \\n | /usr/bin/mono-find-requires
 } | sort | uniq
 ]]>
            </i>           

Modified: trunk/release/linux-installer/buildlinux-installer
===================================================================
--- trunk/release/linux-installer/buildlinux-installer  2006-08-28 20:10:48 UTC 
(rev 64493)
+++ trunk/release/linux-installer/buildlinux-installer  2006-08-28 20:11:50 UTC 
(rev 64494)
@@ -26,24 +26,24 @@
 
 # Probably won't ship gtk# until we provide fallback libraries like vmware 
does.
 
-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://archive.download.redhat.com/pub/redhat/linux/9/en/os/i386/RedHat/RPMS/glib2-2.2.1-1.i386.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://archive.download.redhat.com/pub/redhat/linux/9/en/os/i386/RedHat/RPMS/ncurses-5.3-4.i386.rpm
+       
"ftp://archive.download.redhat.com/pub/redhat/linux/9/en/os/i386/RedHat/RPMS/ncurses-5.3-4.i386.rpm";,
 
-       
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/fontconfig-2.1-9.i386.rpm
-       
ftp://archive.download.redhat.com/pub/redhat/linux/9/en/os/i386/RedHat/RPMS/freetype-2.1.3-6.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
-""".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 = """
-""".split()
+custom_rpms_list = [
+       
"ftp://mirrors.kernel.org/suse/i386/9.3/suse/i586/gtkhtml2-3.6.1-5.i586.rpm";,
+       
"http://www.go-mono.com/archive/1.0.5/redhat-9-i386/libgtkhtml3.0_4-3.0.10-0.ximian.6.1.i386.rpm";,
+       
"http://www.go-mono.com/archive/1.0.5/redhat-9-i386/gtksourceview-1.0.1-0.ximian.6.1.i386.rpm";
+]
 
 # rpm locations we build locally
 local_rpms = [ 
@@ -57,7 +57,20 @@
                "ikvm",
                "monodoc",
                "nant",
-               "ironpython" ] },
+               "ironpython",
+               "mono-basic",
+
+               "gtk-sharp",
+                "mono-tools",
+                "monodevelop",
+                "gecko-sharp",
+                "gecko-sharp-2.0",
+                "gtksourceview-sharp-2.0",
+               ] },
+       {'name': 'suse-93-i586', 'packages': [
+               "gtk-sharp-2.0",
+               ] }
+
 ]
 
 prefix = os.getcwd()

Modified: trunk/release/linux-installer/projects/Readme.txt
===================================================================
--- trunk/release/linux-installer/projects/Readme.txt   2006-08-28 20:10:48 UTC 
(rev 64493)
+++ trunk/release/linux-installer/projects/Readme.txt   2006-08-28 20:11:50 UTC 
(rev 64494)
@@ -2,12 +2,14 @@
 
 Please file any bugs or issues at http://bugzilla.ximian.com
 
+Warning: gtk-sharp apps (Monodoc, MonoDevelop, etc...)
+  may not work on all distros.  This is due to differing
+  gtk+ versions.  Also, if you want to run MonoDevelop,
+  you must have the Gnome libraries installed.
+
 Installer changes:
 
 1.1.17:
-- Remove gtk# and related apps, since running them from the
-  installer was not reliable across distros because of missing
-  libraries.
 - Add some libgdiplus deps, as well as some other base deps.  
   These deps may be on most installations, but include them to 
   make sure.

Modified: trunk/release/linux-installer/projects/mono.xml
===================================================================
--- trunk/release/linux-installer/projects/mono.xml     2006-08-28 20:10:48 UTC 
(rev 64493)
+++ trunk/release/linux-installer/projects/mono.xml     2006-08-28 20:11:50 UTC 
(rev 64494)
@@ -74,6 +74,22 @@
              <path>${installdir}</path>
              <platforms>linux</platforms>
            </shortcut>
+           <shortcut>
+             <comment>Mono Develop</comment>
+             <exec>${installdir}/bin/monodevelop</exec>
+             <icon>${installdir}/share/pixmaps/monodevelop.png</icon>
+             <name>MonoDevelop</name>
+             <path>${installdir}/bin</path>
+             <platforms>linux</platforms>
+           </shortcut>
+           <shortcut>
+             <comment>Mono Documentacion</comment>
+             <exec>${installdir}/bin/monodoc</exec>
+             <icon>${installdir}/share/pixmaps/monodoc.png</icon>
+             <name>MonoDoc</name>
+             <path>${installdir}/bin</path>
+             <platforms>linux</platforms>
+           </shortcut>
            <linkShortcut>
              <comment>Mono Project Website</comment>
              <icon>${installdir}/share/pixmaps/monourl.gif</icon>

Modified: trunk/release/macosx/new/buildpackage
===================================================================
--- trunk/release/macosx/new/buildpackage       2006-08-28 20:10:48 UTC (rev 
64493)
+++ trunk/release/macosx/new/buildpackage       2006-08-28 20:11:50 UTC (rev 
64494)
@@ -20,7 +20,7 @@
 # Which noarch packages to include in the various packages
 packages_to_include = {}
 
-packages_to_include['macos-10-ppc'] = ['mono', 'cocoa-sharp', 'libgdiplus', 
'xsp', 'monodoc', 'boo', 'ikvm', 'nant', 'ironpython' ]
+packages_to_include['macos-10-ppc'] = ['mono', 'cocoa-sharp', 'libgdiplus', 
'xsp', 'monodoc', 'boo', 'ikvm', 'nant', 'ironpython', 'mono-basic' ]
 
 packages_to_include['macos-10-x86'] = packages_to_include['macos-10-ppc']
 

Modified: trunk/release/monobuild/scheduler-daemon.py
===================================================================
--- trunk/release/monobuild/scheduler-daemon.py 2006-08-28 20:10:48 UTC (rev 
64493)
+++ trunk/release/monobuild/scheduler-daemon.py 2006-08-28 20:11:50 UTC (rev 
64494)
@@ -154,8 +154,9 @@
 threads = []
 
 # Start the threads, as well as allow changes to 
config.sd_latest_build_distros to start and stop platforms
+#  (Main execution counts as a thread)
 firstrun = True  # emulate dowhile
-while threading.activeCount() > 0 or firstrun:
+while threading.activeCount() > 1 or firstrun:
        firstrun = False
        # Check for newly activated threads
        reload(config)
@@ -178,7 +179,7 @@
                        threads.append(thread)
 
        # Wait for threads to die
-       time.sleep(1)
+       time.sleep(5)
 
 
 # Wrong!!

Modified: trunk/release/packaging/defs/mono
===================================================================
--- trunk/release/packaging/defs/mono   2006-08-28 20:10:48 UTC (rev 64493)
+++ trunk/release/packaging/defs/mono   2006-08-28 20:11:50 UTC (rev 64494)
@@ -189,28 +189,19 @@
 
        # This really should go in the autotooled build... ?
        #Create gacutil config files specific to OS X
-cat <<EOF > mcs/class/lib/default/System.Drawing.dll.config
-<configuration>
-        <dllmap dll="gdiplus.dll" target="$MONO_PREFIX/lib/libgdiplus.dylib" />
-</configuration>
-EOF
-       cp mcs/class/lib/default/System.Drawing.dll.config 
mcs/class/lib/net_2_0/
+       # New approach (site wide changes instead of for assemblies)
+       # The X11 dllmap needs to be a full path
+       python -c 'fd = open("data/config.in", "r+")
+text = fd.read()
+text = text.replace("libMonoPosixHelper", 
"/tmp/build_deps/lib/libMonoPosixHelper")
+text = text.replace("@X11@", "/usr/X11R6/lib/libX11.dylib")
 
-cat <<EOF > mcs/class/lib/default/System.Windows.Forms.dll.config
-<configuration>
-        <dllmap dll="gdiplus" target="$MONO_PREFIX/lib/libgdiplus.dylib" />
-        <dllmap dll="libX11" target="/usr/X11R6/lib/libX11.dylib" />
-</configuration>
-EOF
-       cp mcs/class/lib/default/System.Windows.Forms.dll.config 
mcs/class/lib/net_2_0/
+text = text.replace("</configuration>", """\t<dllmap dll="gdiplus.dll" 
target="/tmp/build_deps/lib/libgdiplus.dylib" />
+</configuration>""")
+fd.seek(0)
+fd.write(text)
+fd.close()'
 
-cat<<EOF > mcs/class/lib/default/Mono.Posix.dll.config
-<configuration>
-        <dllmap dll="MonoPosixHelper" 
target="$MONO_PREFIX/lib/libMonoPosixHelper.dylib"/>
-</configuration>
-EOF
-       cp mcs/class/lib/default/Mono.Posix.dll.config mcs/class/lib/net_2_0/
-
        # Need a version here...
        ./configure --prefix=$MONO_PREFIX --with-preview=yes
 
@@ -267,7 +258,11 @@
 
 POSTBUILD_STEP_NAME2="test-aot"
 POSTBUILD_STEP2 () {
-       echo "Skipping..."
+       #echo "Skipping..."
+       cd mono/mini
+       $make_path aotcheck
+       cd ../tests
+       $make_path testaot
 }
 
 POSTBUILD_STEP_NAME3="test-profiles"
@@ -307,10 +302,10 @@
         #echo "Skipping..."
         ./runtime/mono-wrapper --wapi=semdel
 
-       # Clean up tmp files
+       # Clean up tmp files, but don't fail if they are missing
        cd /tmp
-       rm ipc*
-       rm tmp*tmp
-       rm *.exe
+       rm ipc* || true
+       rm tmp*tmp || true
+       rm *.exe || true
 }
 

Modified: trunk/release/packaging/defs/mono-basic
===================================================================
--- trunk/release/packaging/defs/mono-basic     2006-08-28 20:10:48 UTC (rev 
64493)
+++ trunk/release/packaging/defs/mono-basic     2006-08-28 20:11:50 UTC (rev 
64494)
@@ -47,7 +47,7 @@
        trunk/mono-basic
 )
 RELEASE_PATH=(
-       tags/mono-basic/[[version]]
+       tags/mono-[[version]]/mono-basic
 )
 
 update_version_file () {

Modified: trunk/release/packaging/defs/monodevelop
===================================================================
--- trunk/release/packaging/defs/monodevelop    2006-08-28 20:10:48 UTC (rev 
64493)
+++ trunk/release/packaging/defs/monodevelop    2006-08-28 20:11:50 UTC (rev 
64494)
@@ -33,6 +33,7 @@
        gtk-sharp
        gecko-sharp
        nant
+       mono-basic
 )
 
 # The above gtk# 1 deps had to be added because of the gtk-sharp-2.0 -> 
mono-tools req

Modified: trunk/release/packaging/do-install-zip-pkgs
===================================================================
--- trunk/release/packaging/do-install-zip-pkgs 2006-08-28 20:10:48 UTC (rev 
64493)
+++ trunk/release/packaging/do-install-zip-pkgs 2006-08-28 20:11:50 UTC (rev 
64494)
@@ -158,7 +158,8 @@
 
 for root, dirs, files in os.walk('.'):
        for file in files:
-               if re.compile('\.config$').search(file):
+               # Also search /etc/mono/config
+               if re.compile('\.config$').search(file) or file == "config":
                        utils.substitute_parameters_in_file(os.path.join(root, 
file), parameter_map)
 
 # Relocate files on macos

Modified: trunk/release/packaging/do-msvn-tar
===================================================================
--- trunk/release/packaging/do-msvn-tar 2006-08-28 20:10:48 UTC (rev 64493)
+++ trunk/release/packaging/do-msvn-tar 2006-08-28 20:11:50 UTC (rev 64494)
@@ -166,7 +166,8 @@
 ### End of source creating functions ###
 
 ### Finish moving things around
-shutil.rmtree('/tmp/built-tarball')
+if os.path.exists('/tmp/built-tarball'):
+       shutil.rmtree('/tmp/built-tarball')
 os.mkdir('/tmp/built-tarball')
 
 found_source_file = 0

Modified: trunk/release/packaging/mktarball
===================================================================
--- trunk/release/packaging/mktarball   2006-08-28 20:10:48 UTC (rev 64493)
+++ trunk/release/packaging/mktarball   2006-08-28 20:11:50 UTC (rev 64494)
@@ -49,7 +49,13 @@
 
 # Check to see if this is already there
 if repo.contains(HEAD_or_RELEASE, package, version):
-       print "Source file for %s version %s (%s) exists" % (package, version, 
HEAD_or_RELEASE) 
+       # Check to see if the state is failure
+        repo_info = repo.get_tarball_state_info(HEAD_or_RELEASE, package, 
read_info=False)
+       if repo_info['state'][version] == "failure":
+               print "Tarball creation for %s version %s (%s) failed already" 
% (package, version, HEAD_or_RELEASE) 
+               print "  Remove from tarball_map if you want to try again"
+       else:
+               print "Source file for %s version %s (%s) exists" % (package, 
version, HEAD_or_RELEASE) 
        sys.exit(1)
 
 LOGFILE = "%s/%s/%s/%s.log" % (config.mktarball_logs, HEAD_or_RELEASE, 
package, version)

Modified: trunk/release/pyutils/config.py
===================================================================
--- trunk/release/pyutils/config.py     2006-08-28 20:10:48 UTC (rev 64493)
+++ trunk/release/pyutils/config.py     2006-08-28 20:11:50 UTC (rev 64494)
@@ -59,7 +59,7 @@
 td_num_sequential = 10
 
 # static list of packages to create tarballs for
-td_packages = ['mono', 'mono-1.1.13', 'mono-1.1.7', 'mono-1.1.8', 'libgdiplus']
+td_packages = ['mono', 'mono-1.1.13', 'mono-1.1.7', 'mono-1.1.8', 
'libgdiplus', 'mono-basic', 'mono-tools', 'monodevelop', 'monodoc', 'xsp', 
'gecko-sharp-2.0', 'gtksourceview-sharp-2.0', 'mono-debugger', 'gtk-sharp', 
'mod_mono' ]
 
 # builds each and every checkin if true, otherwise, only build the latest 
checkin
 td_sequential = False
@@ -79,7 +79,7 @@
 sd_sequential_build_packages = [ 'mono', 'mono-1.1.13' ]
 
 # List of platforms/packages
-sd_latest_build_distros = [ 'sles-9-x86_64', 'redhat-9-i386', 'win-4-i386', 
'macos-10-ppc', 'macos-10-x86', 'sunos-8-sparc', 'sunos-10-x86', 'sles-9-ia64', 
'sles-9-s390', 'sles-9-s390x' ]
+sd_latest_build_distros = [ 'redhat-9-i386', 'sles-9-x86_64', 'win-4-i386', 
'macos-10-ppc', 'macos-10-x86', 'sunos-8-sparc', 'sunos-10-x86', 'sles-9-ia64', 
'sles-9-s390', 'sles-9-s390x', 'fedora-3-i386', 'nld-9-i586', 'suse-93-i586' ]
 sd_latest_build_packages = td_packages
 ##############################################
 

Modified: trunk/release/sunos/buildpackage
===================================================================
--- trunk/release/sunos/buildpackage    2006-08-28 20:10:48 UTC (rev 64493)
+++ trunk/release/sunos/buildpackage    2006-08-28 20:11:50 UTC (rev 64494)
@@ -37,7 +37,7 @@
 # Constants
 packages_to_include = {}
 
-packages_to_include['sunos-8-sparc']  = ['mono', 'libgdiplus', 'xsp', 'ikvm', 
'boo', 'monodoc', 'nant', 'ironpython' ]
+packages_to_include['sunos-8-sparc']  = ['mono', 'libgdiplus', 'xsp', 'ikvm', 
'boo', 'monodoc', 'nant', 'ironpython', 'mono-basic' ]
 
 packages_to_include['sunos-10-sparc'] = packages_to_include['sunos-8-sparc'] + 
['gtk-sharp-2.0', 'gtk-sharp', 'mono-tools', 'monodevelop', 
'gtksourceview-sharp-2.0' ]
 

Modified: trunk/release/windows-installer/Mono.iss
===================================================================
--- trunk/release/windows-installer/Mono.iss    2006-08-28 20:10:48 UTC (rev 
64493)
+++ trunk/release/windows-installer/Mono.iss    2006-08-28 20:11:50 UTC (rev 
64494)
@@ -2,24 +2,24 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 [Setup]
-AppName=Mono 1.1.16.1 with GTK# 2.8.3
-AppVerName=Mono for Windows 1.1.16.1
+AppName=Mono 1.1.17 with GTK# 2.8.3
+AppVerName=Mono for Windows 1.1.17
 AppPublisher=Mono
 AppPublisherURL=http://www.mono-project.com
 AppSupportURL=http://www.mono-project.com/about/faq.html
 AppUpdatesURL=http://www.mono-project.com/downloads/index.html
-DefaultDirName={pf}\Mono-1.1.16.1
-DefaultGroupName=Mono 1.1.16.1 for Windows
-AppID={{c466b680-1392-4a92-ae70-d368477df66f}
+DefaultDirName={pf}\Mono-1.1.17
+DefaultGroupName=Mono 1.1.17 for Windows
+AppID={{57ada2f2-f43e-4141-b883-6e43447092dd}
 Compression=lzma/max
 ;Compression=bzip/4
 ;Compression=zip
 SolidCompression=true
 DisableDirPage=false
 DisableReadyPage=false
-OutputBaseFilename=mono-1.1.16.1-gtksharp-2.8.3-win32-1
-VersionInfoVersion=1.1.16.1
-VersionInfoDescription=Mono 1.1.16.1 with Gtk# Installer for Win32
+OutputBaseFilename=mono-1.1.17-gtksharp-2.8.3-win32-0
+VersionInfoVersion=1.1.17
+VersionInfoDescription=Mono 1.1.17 with Gtk# Installer for Win32
 VersionInfoCompany=Mono
 InfoBeforeFile=build\mono\ReleaseNotes.txt
 LicenseFile=setup-files\mono-lic.txt
@@ -28,7 +28,7 @@
 UninstallDisplayIcon={app}\mono.ico
 SetupIconFile=setup-files\mono.ico
 ShowLanguageDialog=yes
-AppVersion=1.1.16.1
+AppVersion=1.1.17
 MinVersion=0,5.0
 
 
@@ -61,7 +61,7 @@
 
 [INI]
 Filename: {app}\Mono.url; Section: InternetShortcut; Components: mono; Key: 
URL; String: http://www.mono-project.com
-Filename: {app}\MonoReleaseNotes.url; Section: InternetShortcut; Components: 
mono; Key: URL; String: http://go-mono.com/archive/1.1.16.1/
+Filename: {app}\MonoReleaseNotes.url; Section: InternetShortcut; Components: 
mono; Key: URL; String: http://go-mono.com/archive/1.1.17/
 Filename: {app}\GtkPlus.url; Section: InternetShortcut; Components: gtk; Key: 
URL; String: http://www.gtk.org
 Filename: {app}\GtkSharp.url; Section: InternetShortcut; Components: 
gtk\gtkSharp; Key: URL; String: http://gtk-sharp.sourceforge.net/index.html
 Filename: {app}\Xsplocal.url; Section: InternetShortcut; Components: xsp; Key: 
URL; String: {code:GetURLAndPort}/index.aspx
@@ -70,9 +70,9 @@
 ;Filename: {app}\MonoDocWeb.url; Section: InternetShortcut; Components: xsp 
and gtk\gtkSharp\monodoc; Key: URL; String: {code:GetURLAndPort}/header.html
 
 [Icons]
-Name: {group}\Mono-1.1.16.1 Command Prompt; Filename: {cmd}; Parameters: "/k 
""{app}\bin\setmonopath.bat"""; Comment: Open Mono 1.1.16.1 Command Prompt
+Name: {group}\Mono-1.1.17 Command Prompt; Filename: {cmd}; Parameters: "/k 
""{app}\bin\setmonopath.bat"""; Comment: Open Mono 1.1.17 Command Prompt
 Name: {group}\Readme; Filename: {app}\ReleaseNotes.txt; Comment: Combined 
Installer Release Notes
-Name: {group}\{cm:ProgramOnTheWeb,Mono-1.1.16.1 Release Notes}; Filename: 
{app}\MonoReleaseNotes.url
+Name: {group}\{cm:ProgramOnTheWeb,Mono-1.1.17 Release Notes}; Filename: 
{app}\MonoReleaseNotes.url
 Name: {group}\Applications\Gtk# Demo; Filename: {app}\bin\GtkDemo.bat; 
Components: gtk\gtkSharp\samples; Comment: Gtk# Demo
 Name: {group}\Applications\Sql# GTK; Filename: {app}\bin\sqlsharpgtk.bat; 
Components: gtk\gtkSharp\samples; Comment: SQL# GUI version
 Name: {group}\Applications\Prj2Make# GTK; Filename: 
{app}\bin\prj2make-sharp-gtk.bat; Components: gtk\gtkSharp\samples; Comment: 
Makefile generator tool.
@@ -83,7 +83,7 @@
 Name: {group}\XSP\XSP Test Web Server; Filename: {app}\bin\startXSP.bat; 
Components: xsp; Comment: ASP.NET Web Server with Sample Mono content
 Name: {group}\XSP\XSP 2.0 Test Web Server; Filename: {app}\bin\startXSP2.bat; 
Components: xsp; Comment: ASP.NET Web Server with Sample Mono content
 Name: {group}\{cm:ProgramOnTheWeb,Mono}; IconFilename: {app}\mono.ico; 
Filename: {app}\Mono.url
-Name: {group}\{cm:UninstallProgram,Mono-1.1.16.1 Win32}; Filename: 
{uninstallexe}
+Name: {group}\{cm:UninstallProgram,Mono-1.1.17 Win32}; Filename: {uninstallexe}
 Name: {group}\{cm:ProgramOnTheWeb,Gtk+}; Components: gtk; Filename: 
{app}\GtkPlus.url
 Name: {group}\{cm:ProgramOnTheWeb,Gtk#}; Components: gtk\gtkSharp; Filename: 
{app}\GtkSharp.url
 Name: {group}\XSP\XSP Index Page; Components: xsp; Filename: {app}\Xsplocal.url
@@ -92,14 +92,14 @@
 
 [Registry]
 Root: HKLM; Subkey: SOFTWARE\Novell\Mono; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: Software\Novell\Mono; ValueType: string; ValueName: 
DefaultCLR; ValueData: 1.1.16.1; Flags: uninsdeletevalue
-Root: HKLM; Subkey: SOFTWARE\Novell\Mono\1.1.16.1; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: Software\Novell\Mono\1.1.16.1; ValueType: string; 
ValueName: FrameworkAssemblyDirectory; ValueData: {app}\lib; Flags: 
uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.1.16.1; ValueType: string; 
ValueName: MonoConfigDir; ValueData: {app}\etc; Flags: uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.1.16.1; ValueType: string; 
ValueName: SdkInstallRoot; ValueData: {app}; Flags: uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.1.16.1; Components: xsp; ValueType: 
dword; ValueName: XSPIsInstalled; ValueData: 1; Flags: uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.1.16.1; Components: gtk\gtkSharp; 
ValueType: dword; ValueName: GtkSharpIsInstalled; ValueData: 1; Flags: 
uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.1.16.1; Components: gtk; ValueType: 
dword; ValueName: GtkPlusDevIsInstalled; ValueData: 1; Flags: uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono; ValueType: string; ValueName: 
DefaultCLR; ValueData: 1.1.17; Flags: uninsdeletevalue
+Root: HKLM; Subkey: SOFTWARE\Novell\Mono\1.1.17; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: Software\Novell\Mono\1.1.17; ValueType: string; ValueName: 
FrameworkAssemblyDirectory; ValueData: {app}\lib; Flags: uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.1.17; ValueType: string; ValueName: 
MonoConfigDir; ValueData: {app}\etc; Flags: uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.1.17; ValueType: string; ValueName: 
SdkInstallRoot; ValueData: {app}; Flags: uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.1.17; Components: xsp; ValueType: 
dword; ValueName: XSPIsInstalled; ValueData: 1; Flags: uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.1.17; Components: gtk\gtkSharp; 
ValueType: dword; ValueName: GtkSharpIsInstalled; ValueData: 1; Flags: 
uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.1.17; Components: gtk; ValueType: 
dword; ValueName: GtkPlusDevIsInstalled; ValueData: 1; Flags: uninsdeletevalue
 Root: HKLM; Subkey: SOFTWARE\Novell\Mono DefaultCLR; Flags: 
uninsdeletekeyifempty
 Root: HKLM; Subkey: Software\Novell\Mono DefaultCLR; ValueType: string; 
ValueName: Installer Language; ValueData: 1033; Flags: uninsdeletevalue
 
@@ -126,7 +126,7 @@
     bRc: Boolean;
 begin
     // Get the registry value
-    bRc := RegQueryStringValue(HKLM, 'SOFTWARE\Novell\Mono\1.1.16.1', 
'SdkInstallRoot',
+    bRc := RegQueryStringValue(HKLM, 'SOFTWARE\Novell\Mono\1.1.17', 
'SdkInstallRoot',
     strMonoBaseDir
     );
 
@@ -136,10 +136,10 @@
     end;
 end;
 
-// Checks to see if Mono 1.1.16.1 is Installed
+// Checks to see if Mono 1.1.17 is Installed
 Function IsMonoInstalled() : Boolean;
 begin
-    Result := RegValueExists(HKLM, 'SOFTWARE\Novell\Mono\1.1.16.1', 
'SdkInstallRoot');
+    Result := RegValueExists(HKLM, 'SOFTWARE\Novell\Mono\1.1.17', 
'SdkInstallRoot');
 end;
 
 Function SayMessage(const strMsg: String; const typMsgBox: TMsgBoxType) : 
Integer;

Modified: trunk/release/windows-installer/buildwindows-installer
===================================================================
--- trunk/release/windows-installer/buildwindows-installer      2006-08-28 
20:10:48 UTC (rev 64493)
+++ trunk/release/windows-installer/buildwindows-installer      2006-08-28 
20:11:50 UTC (rev 64494)
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 
+# TODO: gnome doesn't keep their win32 builds on deps around... hmm...
+
 # Collect list of files/rpms for each install group:
 #  Mono (glib)
 #  Gtk
@@ -125,7 +127,7 @@
 files_used_in_installer = []
 selections = []
 
-selections += [ Selection('mono', packages = "mono boo ikvm nant 
ironpython".split(), deps=['mono'] ) ]
+selections += [ Selection('mono', packages = "mono boo ikvm nant ironpython 
mono-basic".split(), deps=['mono'] ) ]
 
 # TODO: try out gtk-sharp-2.8
 #  Everything works except monodoc browser... fails on glade-sharp glade 2.5 
seems to be killing this

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

Reply via email to