Author: wade
Date: 2006-10-06 12:59:42 -0400 (Fri, 06 Oct 2006)
New Revision: 66363
Modified:
trunk/release/macosx/new/buildpackage
trunk/release/windows-installer/Mono.iss
Log:
macosx/new/buildpackage:
-don't ship .a files
Mono.iss:
-check in file for 1.1.17.2
Modified: trunk/release/macosx/new/buildpackage
===================================================================
--- trunk/release/macosx/new/buildpackage 2006-10-06 16:53:20 UTC (rev
66362)
+++ trunk/release/macosx/new/buildpackage 2006-10-06 16:59:42 UTC (rev
66363)
@@ -101,6 +101,9 @@
# This is what the old installer script would do, except it deleted the
.a files instead of stripping them
#env.ssh.execute("cd %s%s/bin; strip pedump monodiet monodis jay
monograph; cd ../lib strip -S *.a " % (remote_PKGROOT, prefix) )
+ # Miguel doesn't want to ship the .a files
+ env.ssh.execute("cd %s%s/lib; rm -f *.a" % (remote_PKGROOT, prefix) )
+
if os.path.exists(temp_dir): shutil.rmtree(temp_dir)
distutils.dir_util.mkpath(temp_dir)
Modified: trunk/release/windows-installer/Mono.iss
===================================================================
--- trunk/release/windows-installer/Mono.iss 2006-10-06 16:53:20 UTC (rev
66362)
+++ trunk/release/windows-installer/Mono.iss 2006-10-06 16:59:42 UTC (rev
66363)
@@ -2,24 +2,24 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
[Setup]
-AppName=Mono 1.1.17.1 with GTK# 2.8.3
-AppVerName=Mono for Windows 1.1.17.1
+AppName=Mono 1.1.17.2 with GTK# 2.8.3
+AppVerName=Mono for Windows 1.1.17.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.1.17.1
-DefaultGroupName=Mono 1.1.17.1 for Windows
-AppID={{8e5f8088-aed4-4446-a553-4582912041ac}
+DefaultDirName={pf}\Mono-1.1.17.2
+DefaultGroupName=Mono 1.1.17.2 for Windows
+AppID={{0cef6991-e947-49d9-872e-021df4b4a126}
Compression=lzma/max
;Compression=bzip/4
;Compression=zip
SolidCompression=true
DisableDirPage=false
DisableReadyPage=false
-OutputBaseFilename=mono-1.1.17.1-gtksharp-2.8.3-win32-2
-VersionInfoVersion=1.1.17.1
-VersionInfoDescription=Mono 1.1.17.1 with Gtk# Installer for Win32
+OutputBaseFilename=mono-1.1.17.2-gtksharp-2.8.3-win32-0
+VersionInfoVersion=1.1.17.2
+VersionInfoDescription=Mono 1.1.17.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.1.17.1
+AppVersion=1.1.17.2
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.17.1/
+Filename: {app}\MonoReleaseNotes.url; Section: InternetShortcut; Components:
mono; Key: URL; String: http://go-mono.com/archive/1.1.17.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
@@ -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.17.1 Command Prompt; Filename: {cmd}; Parameters: "/k
""{app}\bin\setmonopath.bat"""; Comment: Open Mono 1.1.17.1 Command Prompt
+Name: {group}\Mono-1.1.17.2 Command Prompt; Filename: {cmd}; Parameters: "/k
""{app}\bin\setmonopath.bat"""; Comment: Open Mono 1.1.17.2 Command Prompt
Name: {group}\Readme; Filename: {app}\ReleaseNotes.txt; Comment: Combined
Installer Release Notes
-Name: {group}\{cm:ProgramOnTheWeb,Mono-1.1.17.1 Release Notes}; Filename:
{app}\MonoReleaseNotes.url
+Name: {group}\{cm:ProgramOnTheWeb,Mono-1.1.17.2 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.17.1 Win32}; Filename:
{uninstallexe}
+Name: {group}\{cm:UninstallProgram,Mono-1.1.17.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
@@ -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.17.1; Flags: uninsdeletevalue
-Root: HKLM; Subkey: SOFTWARE\Novell\Mono\1.1.17.1; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: Software\Novell\Mono\1.1.17.1; ValueType: string;
ValueName: FrameworkAssemblyDirectory; ValueData: {app}\lib; Flags:
uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.1.17.1; ValueType: string;
ValueName: MonoConfigDir; ValueData: {app}\etc; Flags: uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.1.17.1; ValueType: string;
ValueName: SdkInstallRoot; ValueData: {app}; Flags: uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.1.17.1; Components: xsp; ValueType:
dword; ValueName: XSPIsInstalled; ValueData: 1; Flags: uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.1.17.1; Components: gtk\gtkSharp;
ValueType: dword; ValueName: GtkSharpIsInstalled; ValueData: 1; Flags:
uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.1.17.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.2; Flags: uninsdeletevalue
+Root: HKLM; Subkey: SOFTWARE\Novell\Mono\1.1.17.2; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: Software\Novell\Mono\1.1.17.2; ValueType: string;
ValueName: FrameworkAssemblyDirectory; ValueData: {app}\lib; Flags:
uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.1.17.2; ValueType: string;
ValueName: MonoConfigDir; ValueData: {app}\etc; Flags: uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.1.17.2; ValueType: string;
ValueName: SdkInstallRoot; ValueData: {app}; Flags: uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.1.17.2; Components: xsp; ValueType:
dword; ValueName: XSPIsInstalled; ValueData: 1; Flags: uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.1.17.2; Components: gtk\gtkSharp;
ValueType: dword; ValueName: GtkSharpIsInstalled; ValueData: 1; Flags:
uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.1.17.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
@@ -126,7 +126,7 @@
bRc: Boolean;
begin
// Get the registry value
- bRc := RegQueryStringValue(HKLM, 'SOFTWARE\Novell\Mono\1.1.17.1',
'SdkInstallRoot',
+ bRc := RegQueryStringValue(HKLM, 'SOFTWARE\Novell\Mono\1.1.17.2',
'SdkInstallRoot',
strMonoBaseDir
);
@@ -136,10 +136,10 @@
end;
end;
-// Checks to see if Mono 1.1.17.1 is Installed
+// Checks to see if Mono 1.1.17.2 is Installed
Function IsMonoInstalled() : Boolean;
begin
- Result := RegValueExists(HKLM, 'SOFTWARE\Novell\Mono\1.1.17.1',
'SdkInstallRoot');
+ Result := RegValueExists(HKLM, 'SOFTWARE\Novell\Mono\1.1.17.2',
'SdkInstallRoot');
end;
Function SayMessage(const strMsg: String; const typMsgBox: TMsgBoxType) :
Integer;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
