Author: wade Date: 2007-10-18 15:33:59 -0400 (Thu, 18 Oct 2007) New Revision: 87789
Modified: trunk/release/windows-installer/Mono.iss trunk/release/windows-installer/buildwindows-installer Log: Changes for 1.2.5.2 buildwindows-installer: -make exclusive false for doing the package hack, so we don't care if the jail is in use or not Modified: trunk/release/windows-installer/Mono.iss =================================================================== --- trunk/release/windows-installer/Mono.iss 2007-10-18 19:15:20 UTC (rev 87788) +++ trunk/release/windows-installer/Mono.iss 2007-10-18 19:33:59 UTC (rev 87789) @@ -2,24 +2,24 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! [Setup] -AppName=Mono 1.2.5.1 with GTK# 2.10.2 -AppVerName=Mono for Windows 1.2.5.1 +AppName=Mono 1.2.5.2 with GTK# 2.10.2 +AppVerName=Mono for Windows 1.2.5.2 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.2.5.1 -DefaultGroupName=Mono 1.2.5.1 for Windows -AppID={{538ead72-c672-4776-ba55-49004563635b} +DefaultDirName={pf}\Mono-1.2.5.2 +DefaultGroupName=Mono 1.2.5.2 for Windows +AppID={{61ca525e-4fbf-4172-947b-be348f00d16e} Compression=lzma/max ;Compression=bzip/4 ;Compression=zip SolidCompression=true DisableDirPage=false DisableReadyPage=false -OutputBaseFilename=mono-1.2.5.1-gtksharp-2.10.2-win32-0 -VersionInfoVersion=1.2.5.1 -VersionInfoDescription=Mono 1.2.5.1 with Gtk# Installer for Win32 +OutputBaseFilename=mono-1.2.5.2-gtksharp-2.10.2-win32-0 +VersionInfoVersion=1.2.5.2 +VersionInfoDescription=Mono 1.2.5.2 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.2.5.1 +AppVersion=1.2.5.2 MinVersion=0,5.0 @@ -63,7 +63,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.2.5.1/ +Filename: {app}\MonoReleaseNotes.url; Section: InternetShortcut; Components: mono; Key: URL; String: http://go-mono.com/archive/1.2.5.2/ 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 @@ -74,9 +74,9 @@ Filename: {app}\MonoDocWeb.url; Section: InternetShortcut; Components: mono; Key: URL; String: http://www.go-mono.com/docs/ [Icons] -Name: {group}\Mono-1.2.5.1 Command Prompt; Filename: {cmd}; Parameters: "/k ""{app}\bin\setmonopath.bat"""; Comment: Open Mono 1.2.5.1 Command Prompt +Name: {group}\Mono-1.2.5.2 Command Prompt; IconFilename: {app}\mono.ico; Filename: {cmd}; Parameters: "/k ""{app}\bin\setmonopath.bat"""; Comment: Open Mono 1.2.5.2 Command Prompt Name: {group}\Readme; Filename: {app}\ReleaseNotes.txt; Comment: Combined Installer Release Notes -Name: {group}\{cm:ProgramOnTheWeb,Mono-1.2.5.1 Release Notes}; Filename: {app}\MonoReleaseNotes.url +Name: {group}\{cm:ProgramOnTheWeb,Mono-1.2.5.2 Release Notes}; Filename: {app}\MonoReleaseNotes.url Name: {group}\MonoDoc Web; Components: mono; Filename: {app}\MonoDocWeb.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 @@ -88,7 +88,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.2.5.1 Win32}; Filename: {uninstallexe} +Name: {group}\{cm:UninstallProgram,Mono-1.2.5.2 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 @@ -96,21 +96,21 @@ [Registry] Root: HKLM; Subkey: SOFTWARE\Novell\Mono; Flags: uninsdeletekeyifempty -Root: HKLM; Subkey: Software\Novell\Mono; ValueType: string; ValueName: DefaultCLR; ValueData: 1.2.5.1; Flags: uninsdeletevalue -Root: HKLM; Subkey: SOFTWARE\Novell\Mono\1.2.5.1; Flags: uninsdeletekeyifempty -Root: HKLM; Subkey: Software\Novell\Mono\1.2.5.1; ValueType: string; ValueName: FrameworkAssemblyDirectory; ValueData: {app}\lib; Flags: uninsdeletevalue -Root: HKLM; Subkey: Software\Novell\Mono\1.2.5.1; ValueType: string; ValueName: MonoConfigDir; ValueData: {app}\etc; Flags: uninsdeletevalue -Root: HKLM; Subkey: Software\Novell\Mono\1.2.5.1; ValueType: string; ValueName: SdkInstallRoot; ValueData: {app}; Flags: uninsdeletevalue -Root: HKLM; Subkey: Software\Novell\Mono\1.2.5.1; Components: xsp; ValueType: dword; ValueName: XSPIsInstalled; ValueData: 1; Flags: uninsdeletevalue -Root: HKLM; Subkey: Software\Novell\Mono\1.2.5.1; Components: gtk\gtkSharp; ValueType: dword; ValueName: GtkSharpIsInstalled; ValueData: 1; Flags: uninsdeletevalue -Root: HKLM; Subkey: Software\Novell\Mono\1.2.5.1; Components: gtk; ValueType: dword; ValueName: GtkPlusDevIsInstalled; ValueData: 1; Flags: uninsdeletevalue +Root: HKLM; Subkey: Software\Novell\Mono; ValueType: string; ValueName: DefaultCLR; ValueData: 1.2.5.2; Flags: uninsdeletevalue +Root: HKLM; Subkey: SOFTWARE\Novell\Mono\1.2.5.2; Flags: uninsdeletekeyifempty +Root: HKLM; Subkey: Software\Novell\Mono\1.2.5.2; ValueType: string; ValueName: FrameworkAssemblyDirectory; ValueData: {app}\lib; Flags: uninsdeletevalue +Root: HKLM; Subkey: Software\Novell\Mono\1.2.5.2; ValueType: string; ValueName: MonoConfigDir; ValueData: {app}\etc; Flags: uninsdeletevalue +Root: HKLM; Subkey: Software\Novell\Mono\1.2.5.2; ValueType: string; ValueName: SdkInstallRoot; ValueData: {app}; Flags: uninsdeletevalue +Root: HKLM; Subkey: Software\Novell\Mono\1.2.5.2; Components: xsp; ValueType: dword; ValueName: XSPIsInstalled; ValueData: 1; Flags: uninsdeletevalue +Root: HKLM; Subkey: Software\Novell\Mono\1.2.5.2; Components: gtk\gtkSharp; ValueType: dword; ValueName: GtkSharpIsInstalled; ValueData: 1; Flags: uninsdeletevalue +Root: HKLM; Subkey: Software\Novell\Mono\1.2.5.2; 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 ; XSP Shell Integration (Thanks to Joseph Hill) -Root: HKLM; Subkey: SOFTWARE\Classes\Folder\shell\XSP WebServer 1.2.5.1; Components: xsp\xsp_shell; ValueType: string; ValueData: XSP Web Server Here 1.2.5.1; Flags: uninsdeletekey -Root: HKLM; Subkey: SOFTWARE\Classes\Folder\shell\XSP WebServer 1.2.5.1\command; Components: xsp\xsp_shell; ValueType: string; ValueData: "{app}\bin\xsp.bat --root ""%1"" --port {code:GetPort} --applications /:."; Flags: uninsdeletekey -Root: HKLM; Subkey: SOFTWARE\Classes\Folder\shell\XSP2 WebServer 1.2.5.1; Components: xsp\xsp2_shell; ValueType: string; ValueData: XSP 2.0 Web Server Here 1.2.5.1; Flags: uninsdeletekey -Root: HKLM; Subkey: SOFTWARE\Classes\Folder\shell\XSP2 WebServer 1.2.5.1\command; Components: xsp\xsp2_shell; ValueType: string; ValueData: "{app}\bin\xsp2.bat --root ""%1"" --port {code:GetPort} --applications /:."; Flags: uninsdeletekey +Root: HKLM; Subkey: SOFTWARE\Classes\Folder\shell\XSP WebServer 1.2.5.2; Components: xsp\xsp_shell; ValueType: string; ValueData: XSP Web Server Here 1.2.5.2; Flags: uninsdeletekey +Root: HKLM; Subkey: SOFTWARE\Classes\Folder\shell\XSP WebServer 1.2.5.2\command; Components: xsp\xsp_shell; ValueType: string; ValueData: "{app}\bin\xsp.bat --root ""%1"" --port {code:GetPort} --applications /:."; Flags: uninsdeletekey +Root: HKLM; Subkey: SOFTWARE\Classes\Folder\shell\XSP2 WebServer 1.2.5.2; Components: xsp\xsp2_shell; ValueType: string; ValueData: XSP 2.0 Web Server Here 1.2.5.2; Flags: uninsdeletekey +Root: HKLM; Subkey: SOFTWARE\Classes\Folder\shell\XSP2 WebServer 1.2.5.2\command; Components: xsp\xsp2_shell; ValueType: string; ValueData: "{app}\bin\xsp2.bat --root ""%1"" --port {code:GetPort} --applications /:."; Flags: uninsdeletekey ;[Run] ;Filename: "{app}\gacutil.exe"; Description: "Install gtk-sharp in the MS GAC"; StatusMsg: "Install Gtk# in the MS GAC"; Tasks: msgac @@ -135,7 +135,7 @@ bRc: Boolean; begin // Get the registry value - bRc := RegQueryStringValue(HKLM, 'SOFTWARE\Novell\Mono\1.2.5.1', 'SdkInstallRoot', + bRc := RegQueryStringValue(HKLM, 'SOFTWARE\Novell\Mono\1.2.5.2', 'SdkInstallRoot', strMonoBaseDir ); @@ -145,10 +145,10 @@ end; end; -// Checks to see if Mono 1.2.5.1 is Installed +// Checks to see if Mono 1.2.5.2 is Installed Function IsMonoInstalled() : Boolean; begin - Result := RegValueExists(HKLM, 'SOFTWARE\Novell\Mono\1.2.5.1', 'SdkInstallRoot'); + Result := RegValueExists(HKLM, 'SOFTWARE\Novell\Mono\1.2.5.2', 'SdkInstallRoot'); end; Function SayMessage(const strMsg: String; const typMsgBox: TMsgBoxType) : Integer; Modified: trunk/release/windows-installer/buildwindows-installer =================================================================== --- trunk/release/windows-installer/buildwindows-installer 2007-10-18 19:15:20 UTC (rev 87788) +++ trunk/release/windows-installer/buildwindows-installer 2007-10-18 19:33:59 UTC (rev 87789) @@ -79,7 +79,7 @@ ## Total hack to pick the rpm version of mono-basic (contains compiler and runtime) instead of the zip version (only has the runtime) if pack == "mono-basic": - self.pack_objs[pack] = packaging.package(packaging.buildconf('suse-100-i586'),pack) + self.pack_objs[pack] = packaging.package(packaging.buildconf('suse-100-i586', exclusive=False),pack) else: self.pack_objs[pack] = packaging.package(installer_conf,pack) _______________________________________________ Mono-patches maillist - [email protected] http://lists.ximian.com/mailman/listinfo/mono-patches
