Author: wade
Date: 2006-07-06 20:04:20 -0400 (Thu, 06 Jul 2006)
New Revision: 62332
Modified:
trunk/release/macosx/new/buildpackage
trunk/release/packaging/bundles/RELEASE
trunk/release/packaging/defs/gtk-sharp-2.0
trunk/release/packaging/defs/mono
trunk/release/packaging/dep_builder
trunk/release/packaging/do-dep-build
trunk/release/packaging/do-install-zip-pkgs
trunk/release/packaging/do-zip-build
trunk/release/packaging/install-deps
trunk/release/sunos/buildpackage
trunk/release/windows-installer/Mono.iss
trunk/release/windows-installer/buildwindows-installer
Log:
sunos/buildpackage:
-prune unneeded files from package
-use rpm2cpio.py on solaris box now instead of a linux host
-run platforms in parallel
macosx/buildpackage:
-strip without breaking
-run platforms in parallel
windows-installer/buildwindows-installer:
-strip without breaking
Mono.iss:
-1.1.16 .iss file
packaging/dep_builder:
-dep_builder now honors build_location
do-zip-build / install-deps do-dep-build defs/mono:
-build_location and relocation fixes for zip build system
Modified: trunk/release/macosx/new/buildpackage
===================================================================
--- trunk/release/macosx/new/buildpackage 2006-07-06 23:53:38 UTC (rev
62331)
+++ trunk/release/macosx/new/buildpackage 2006-07-07 00:04:20 UTC (rev
62332)
@@ -86,7 +86,8 @@
# Strip files to save space
# These were in the old script as "cleanup"
env.ssh.print_command=1
- env.ssh.execute("cd %s%s; strip bin/* " % (remote_PKGROOT, prefix ) )
+ # Hmm... stripping all dylibs causes issues on mac x86 as well as for
libgdiplus on both plats, only strip some
+ env.ssh.execute("cd %s%s/bin; strip * ; cd ../lib; strip *.a
libmono*.dylib " % (remote_PKGROOT, prefix ) )
if os.path.exists(temp_dir): shutil.rmtree(temp_dir)
distutils.dir_util.mkpath(temp_dir)
@@ -212,7 +213,11 @@
threads = []
for target in targets:
thread = threading.Thread(target=build_package, args=(target,))
- thread.run()
+
+ # Run one at a time...
+ #thread.run()
+
+ thread.start()
threads.append(thread)
Modified: trunk/release/packaging/bundles/RELEASE
===================================================================
--- trunk/release/packaging/bundles/RELEASE 2006-07-06 23:53:38 UTC (rev
62331)
+++ trunk/release/packaging/bundles/RELEASE 2006-07-07 00:04:20 UTC (rev
62332)
@@ -1,6 +1,6 @@
# Directory used when created go-mono.com/archive/<archive_version>
# This will need to be manually bumped each time on head... don't forget!!
-archive_version="1.1.15"
+archive_version="1.1.16"
bundle_urlname="latest"
Modified: trunk/release/packaging/defs/gtk-sharp-2.0
===================================================================
--- trunk/release/packaging/defs/gtk-sharp-2.0 2006-07-06 23:53:38 UTC (rev
62331)
+++ trunk/release/packaging/defs/gtk-sharp-2.0 2006-07-07 00:04:20 UTC (rev
62332)
@@ -47,7 +47,7 @@
# 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/\.[1234567890]\./\.x\./`
+ new_version=`echo $VERSION | sed s/\.[0-9]\./\.x\./`
new_path=${SVN_PATHS//$gtksharp2ver_match/${new_version}}
echo "New path: $new_path"
Modified: trunk/release/packaging/defs/mono
===================================================================
--- trunk/release/packaging/defs/mono 2006-07-06 23:53:38 UTC (rev 62331)
+++ trunk/release/packaging/defs/mono 2006-07-07 00:04:20 UTC (rev 62332)
@@ -163,13 +163,13 @@
./configure --prefix=/opt/mono
gmake || exit 1
- rm -Rf $build_location/tmp/temp_install
- gmake install DESTDIR=$build_location/tmp/temp_install || exit 1
+ rm -Rf $build_location/temp_install
+ gmake install DESTDIR=$build_location/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 $build_location/install
- cd $build_location/tmp/temp_install/opt/mono
- mv * $build_location/install
+ mkdir /tmp/install
+ cd $build_location/temp_install/opt/mono
+ mv * /tmp/install
}
Modified: trunk/release/packaging/dep_builder
===================================================================
--- trunk/release/packaging/dep_builder 2006-07-06 23:53:38 UTC (rev 62331)
+++ trunk/release/packaging/dep_builder 2006-07-07 00:04:20 UTC (rev 62332)
@@ -8,7 +8,7 @@
import packaging
-if len(sys.argv) < 3:
+if len(sys.argv) < 4:
print "Usage: dep_builder <jail> <dep_def filename> <release>"
sys.exit(1)
@@ -18,17 +18,19 @@
env = packaging.buildenv(jail)
+build_location = env.env_vars['build_location']
+
#pdb.set_trace()
-env.ssh.copy_to(['do-dep-build', 'dep_defs/' + def_filename,
'../pyutils/*.py', 'do-install-zip-pkgs', '../pyutils/rpm2cpio.py', 'conf/' +
jail], '/tmp')
+env.ssh.copy_to(['do-dep-build', 'dep_defs/' + def_filename,
'../pyutils/*.py', 'do-install-zip-pkgs', '../pyutils/rpm2cpio.py', 'conf/' +
jail], build_location)
-code, output = env.ssh.execute('/tmp/do-dep-build %s %s %s' % (jail,
def_filename, release) )
+code, output = env.ssh.execute('%s/do-dep-build %s %s %s %s' %
(build_location, jail, def_filename, release, build_location) )
if code:
print "Error building deps..."
sys.exit(1)
# Copy files back
-env.ssh.copy_from('/tmp/builder/built-packages/*', 'external_zip_pkg')
+env.ssh.copy_from(build_location + '/builder/built-packages/*',
'external_zip_pkg')
Modified: trunk/release/packaging/do-dep-build
===================================================================
--- trunk/release/packaging/do-dep-build 2006-07-06 23:53:38 UTC (rev
62331)
+++ trunk/release/packaging/do-dep-build 2006-07-07 00:04:20 UTC (rev
62332)
@@ -22,14 +22,15 @@
import packaging
if len(sys.argv) < 4:
- print "Usage: ./do-dep-build <distro> <def filename> <release>"
+ print "Usage: ./do-dep-build <distro> <def filename> <release>
<build_location>"
sys.exit(1)
distro = sys.argv[1]
def_filename = sys.argv[2]
release = sys.argv[3]
+build_location = sys.argv[4]
-os.chdir('/tmp')
+os.chdir(build_location)
env = packaging.buildenv(distro)
@@ -43,12 +44,10 @@
built_packages = []
-current_dir = os.getcwd()
+if os.path.exists('builder/built-packages'):
shutil.rmtree('builder/built-packages')
+distutils.dir_util.mkpath('builder/built-packages')
+if not os.path.exists('sources'): os.mkdir('sources')
-if os.path.exists('/tmp/builder/built-packages'):
shutil.rmtree('/tmp/builder/built-packages')
-distutils.dir_util.mkpath('/tmp/builder/built-packages')
-if not os.path.exists('/tmp/sources'): os.mkdir('/tmp/sources')
-
for pack in packages:
# Gather build info
@@ -67,7 +66,7 @@
make install || exit 1
"""
- filename = os.path.join('/tmp/builder/built-packages',
"-".join([pack['name'], version, release]) + "." + ".".join([build_os,
'novell', env.info['arch'], 'zip']) )
+ filename = os.path.join(build_location + '/builder/built-packages',
"-".join([pack['name'], version, release]) + "." + ".".join([build_os,
'novell', env.info['arch'], 'zip']) )
# Check for existing build...
if utils.get_dict_var('skip', pack):
@@ -81,7 +80,7 @@
print " --- Cleaning/Setting up for: " + pack['name'] + " ---"
# Clean out areas
- for path in ['/tmp/build_deps', '/tmp/install', '/tmp/scratch']:
+ for path in ['/tmp/build_deps', '/tmp/install', 'scratch']:
if os.path.exists(path):
shutil.rmtree(path)
@@ -89,11 +88,11 @@
env_string = ""
if built_packages:
package_string = " ".join(built_packages)
- utils.launch_process('/tmp/do-install-zip-pkgs
/tmp/build_deps /tmp/build_deps ' + package_string)
+ utils.launch_process(build_location +
'/do-install-zip-pkgs /tmp/build_deps /tmp/build_deps ' + package_string)
env_string = ". /tmp/build_deps/env.sh; "
- os.mkdir('/tmp/scratch')
- os.chdir('/tmp/scratch')
+ os.mkdir('scratch')
+ os.chdir('scratch')
# Get and unpack the source
print " --- Unpacking : " + pack['name'] + " ---"
@@ -124,7 +123,7 @@
print " --- Archiving: " + pack['name'] + " ---"
code, output = utils.launch_process('zip -ry %s *' % filename)
- os.chdir(current_dir)
+ os.chdir(build_location)
built_packages.append(filename)
Modified: trunk/release/packaging/do-install-zip-pkgs
===================================================================
--- trunk/release/packaging/do-install-zip-pkgs 2006-07-06 23:53:38 UTC (rev
62331)
+++ trunk/release/packaging/do-install-zip-pkgs 2006-07-07 00:04:20 UTC (rev
62332)
@@ -46,6 +46,9 @@
# This is specifically for monodoc
parameter_map[re.compile("^sourcesdir=.*", re.M)] = "sourcesdir=" + reloc +
"/lib/monodoc/sources"
+# This was done for libgdiplus on macos (Needed elsewhere?)
+parameter_map[re.compile("/tmp/build_deps")] = reloc
+
# for all of the .pc files
for root, dirs, files in os.walk('.'):
for file in files:
Modified: trunk/release/packaging/do-zip-build
===================================================================
--- trunk/release/packaging/do-zip-build 2006-07-06 23:53:38 UTC (rev
62331)
+++ trunk/release/packaging/do-zip-build 2006-07-07 00:04:20 UTC (rev
62332)
@@ -27,7 +27,7 @@
pack_def = packaging.package(env, package, inside_jail=True)
-for d in [ 'builder/built-packages', 'scratch', 'install' ]:
+for d in [ 'builder/built-packages', 'scratch', '/tmp/install' ]:
if os.path.exists(d):
shutil.rmtree(d)
@@ -86,8 +86,8 @@
print "Build failed..."
sys.exit(1)
-# Package up the build
-os.chdir(build_location + '/install')
+# Package up the build (must not use build_location here for relocation
correctness)
+os.chdir('/tmp/install')
distutils.dir_util.mkpath(build_location + '/builder/built-packages')
os.system('zip -yr %s/builder/built-packages/%s-%s-%s.%s.zip *' %
(build_location, package, version, rev, arch) )
# Keep a copy of the "spec" file and distro conf file
Modified: trunk/release/packaging/install-deps
===================================================================
--- trunk/release/packaging/install-deps 2006-07-06 23:53:38 UTC (rev
62331)
+++ trunk/release/packaging/install-deps 2006-07-07 00:04:20 UTC (rev
62332)
@@ -81,8 +81,8 @@
build_location = target_env.env_vars['build_location']
-# Clean out deps area
-(code, output) = target_env.ssh.execute("rm -rf %s/install-packages
%s/build_deps" % (build_location, build_location) )
+# Clean out deps area (/tmp/build_deps does not use build_location for
relocation purposes)
+(code, output) = target_env.ssh.execute("rm -rf %s/install-packages
/tmp/build_deps" % (build_location) )
if code:
print "Error cleaning up... exiting"
sys.exit(1)
Modified: trunk/release/sunos/buildpackage
===================================================================
--- trunk/release/sunos/buildpackage 2006-07-06 23:53:38 UTC (rev 62331)
+++ trunk/release/sunos/buildpackage 2006-07-07 00:04:20 UTC (rev 62332)
@@ -35,15 +35,11 @@
import config
# Constants
-# Which noarch packages to include in the various packages
-rpm_packages_to_include = {}
-zip_packages_to_include = {}
+packages_to_include = {}
-zip_packages_to_include['sunos-8-sparc'] = ['mono', 'libgdiplus' ]
-rpm_packages_to_include['sunos-8-sparc'] = ['xsp', 'ikvm', 'boo', 'monodoc' ]
+packages_to_include['sunos-8-sparc'] = ['mono', 'libgdiplus', 'xsp', 'ikvm',
'boo', 'monodoc' ]
-zip_packages_to_include['sunos-10-sparc'] = ['mono', 'libgdiplus',
'gtk-sharp-2.0', 'gtk-sharp' ]
-rpm_packages_to_include['sunos-10-sparc'] = ['xsp', 'ikvm', 'boo', 'monodoc',
'mono-tools', 'monodevelop', 'gtksourceview-sharp-2.0' ]
+packages_to_include['sunos-10-sparc'] = ['mono', 'libgdiplus', 'xsp', 'ikvm',
'boo', 'monodoc', 'gtk-sharp-2.0', 'gtk-sharp', 'mono-tools', 'monodevelop',
'gtksourceview-sharp-2.0' ]
debug=1
@@ -64,42 +60,20 @@
sys.exit(1)
temp_dir = "build" + os.sep + target
- unpacking_dir = temp_dir + os.sep + "temp"
- cwd = os.getcwd()
-
- if os.path.exists(temp_dir): shutil.rmtree(temp_dir)
- distutils.dir_util.mkpath(unpacking_dir)
- os.chdir(unpacking_dir)
-
# Keep list of files used to build this package
packages_used = []
- # Gotta do this here because rpm2cpio on solaris doesn't always work
- # Extract noarch rpms
- for package in rpm_packages_to_include[target]:
- package = packaging.package(env, package)
-
- for file in package.get_files():
- utils.extract_file(file, preserve_symlinks=1)
- packages_used += [ os.path.basename(file) ]
-
-
print "Cleaning up"
env.ssh.execute("rm -Rf /tmp/install-packages; mkdir
/tmp/install-packages; rm -Rf %s; mkdir -p -m777 %s " % ( remote_temp,
remote_temp))
- print "Copying files to remote..."
- env.ssh.copy_to("*", remote_temp, mode='tar');
-
- os.chdir(cwd)
-
print "Installing mono to build env..."
# Install the rest of mono
# Get all files needed for the zip packages to include
files = []
- for zip in zip_packages_to_include[target]:
- package = packaging.package(env, zip)
+ for file in packages_to_include[target]:
+ package = packaging.package(env, file)
files += package.get_files()
files += package.get_dep_files()
@@ -121,26 +95,43 @@
env.ssh.print_output=debug
env.ssh.execute("/tmp/install-packages/do-install-zip-pkgs %s /opt/mono
/tmp/install-packages/* " % (remote_temp))
+ prune_files = """
+ bin/msg*
+ bin/*gettext*
+ bin/gobject-query
+ bin/*jpeg*
+ bin/libpng*
+ bin/*tiff*
+ bin/*rgb*
+ bin/fax*
+ bin/*gif*
+ doc
+ info
+ man/man1/*fax*
+ man/man1/*jpeg*
+ man/man1/*rgb*
+ man/man1/*tiff*
+ man/man3
+ man/man5
+ share/doc
+ share/emacs
+ share/gettext
+ share/gtk-doc
+ share/man/man1/msg*
+ share/man/man1/*gettext*
+ share/man/man3
+ """.split()
+
+ # Delete some stuff (docs, unnecessary programs, etc...) (save msgfmt
for glib building, even though we don't use it)
+ env.ssh.execute("cd %s; mv bin/msgfmt .; rm -Rf %s ; mv msgfmt bin " %
(remote_temp, " ".join(prune_files) ) )
+
# Strip files to save space
+ # Is this causing problems with libgdiplus? (works over an sshd
tunnel...)
env.ssh.execute("cd %s/bin; %s *; cd ../lib; %s * " % (remote_temp,
remote_strip_loc, remote_strip_loc))
env.ssh.print_output=debug
- print "Appending to startup environment..."
- # Add MONO_GAC_PREFIX to environment files
- # and rename env.sh to setup.sh
+ print "Set up environment files..."
- # Probably don't need this anymore since we use /opt/mono as build
prefix...
-# vars = {}
-# vars['MONO_GAC_PREFIX'] = '/opt/mono'
-# vars['MONO_PREFIX'] = '/opt/mono'
-# vars['MONO_CFG_DIR'] = '/opt/mono/etc'
-# vars['MONO_PATH'] = '/opt/mono/lib'
-#
-# for k,v in vars.iteritems():
-# env.ssh.execute("cd %s; echo '%s=%s' >> env.sh; echo 'setenv
%s %s' >> env.csh" % (remote_temp, k, v, k, v))
-#
-# env.ssh.execute("cd %s; export %s >> env.sh" % (remote_temp, "
".join(vars.keys()) ) )
-
# Rename environment files
env.ssh.execute("cd %s; mv env.sh setup.sh " % (remote_temp))
env.ssh.execute("cd %s; mv env.csh setup.csh " % (remote_temp))
@@ -166,7 +157,7 @@
revision = mono_package.get_revision(release)
# Get string of packages
- packages = rpm_packages_to_include[target] +
zip_packages_to_include[target]
+ packages = packages_to_include[target]
packages.sort()
packages_string = " ".join( packages )
@@ -260,7 +251,7 @@
threads = []
for target in targets:
thread = threading.Thread(target=build_package, args=(target,))
- thread.run()
+ thread.start()
threads.append(thread)
Modified: trunk/release/windows-installer/Mono.iss
===================================================================
--- trunk/release/windows-installer/Mono.iss 2006-07-06 23:53:38 UTC (rev
62331)
+++ trunk/release/windows-installer/Mono.iss 2006-07-07 00:04:20 UTC (rev
62332)
@@ -2,24 +2,24 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
[Setup]
-AppName=Mono 1.1.15 with GTK# 2.8.2
-AppVerName=Mono for Windows 1.1.15
+AppName=Mono 1.1.16 with GTK# 2.8.3
+AppVerName=Mono for Windows 1.1.16
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.15
-DefaultGroupName=Mono 1.1.15 for Windows
-AppID={{000f19c1-fb8c-42f5-b128-30f80b8e171b}
+DefaultDirName={pf}\Mono-1.1.16
+DefaultGroupName=Mono 1.1.16 for Windows
+AppID={{cc313a37-d749-4ad2-838a-0092da723709}
Compression=lzma/max
;Compression=bzip/4
;Compression=zip
SolidCompression=true
DisableDirPage=false
DisableReadyPage=false
-OutputBaseFilename=mono-1.1.15-gtksharp-2.8.2-win32-1
-VersionInfoVersion=1.1.15
-VersionInfoDescription=Mono 1.1.15 with Gtk# Installer for Win32
+OutputBaseFilename=mono-1.1.16-gtksharp-2.8.3-win32-0
+VersionInfoVersion=1.1.16
+VersionInfoDescription=Mono 1.1.16 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.15
+AppVersion=1.1.16
MinVersion=0,5.0
@@ -40,7 +40,7 @@
[Components]
Name: mono; Description: Mono Files; Types: full compact custom; Flags: fixed
Name: gtk; Description: GTK+ 2.8 and Gnome 2.12 Files; Types: full custom
-Name: gtk\gtkSharp; Description: Gtk# 2.8.2 Files; Types: full custom
+Name: gtk\gtkSharp; Description: Gtk# 2.8.3 Files; Types: full custom
Name: gtk\gtkSharp\monodoc; Description: Monodoc and Mono Tools; Types: full
custom
Name: gtk\gtkSharp\geckosharp; Description: Gecko# Files; Types: full custom
Name: gtk\gtkSharp\samples; Description: Samples; Types: full custom
@@ -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.15/
+Filename: {app}\MonoReleaseNotes.url; Section: InternetShortcut; Components:
mono; Key: URL; String: http://go-mono.com/archive/1.1.16/
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.15 Command Prompt; Filename: {cmd}; Parameters: "/k
""{app}\bin\setmonopath.bat"""; Comment: Open Mono 1.1.15 Command Prompt
+Name: {group}\Mono-1.1.16 Command Prompt; Filename: {cmd}; Parameters: "/k
""{app}\bin\setmonopath.bat"""; Comment: Open Mono 1.1.16 Command Prompt
Name: {group}\Readme; Filename: {app}\ReleaseNotes.txt; Comment: Combined
Installer Release Notes
-Name: {group}\{cm:ProgramOnTheWeb,Mono-1.1.15 Release Notes}; Filename:
{app}\MonoReleaseNotes.url
+Name: {group}\{cm:ProgramOnTheWeb,Mono-1.1.16 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.15 Win32}; Filename: {uninstallexe}
+Name: {group}\{cm:UninstallProgram,Mono-1.1.16 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.15; Flags: uninsdeletevalue
-Root: HKLM; Subkey: SOFTWARE\Novell\Mono\1.1.15; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: Software\Novell\Mono\1.1.15; ValueType: string; ValueName:
FrameworkAssemblyDirectory; ValueData: {app}\lib; Flags: uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.1.15; ValueType: string; ValueName:
MonoConfigDir; ValueData: {app}\etc; Flags: uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.1.15; ValueType: string; ValueName:
SdkInstallRoot; ValueData: {app}; Flags: uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.1.15; Components: xsp; ValueType:
dword; ValueName: XSPIsInstalled; ValueData: 1; Flags: uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.1.15; Components: gtk\gtkSharp;
ValueType: dword; ValueName: GtkSharpIsInstalled; ValueData: 1; Flags:
uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.1.15; Components: gtk; ValueType:
dword; ValueName: GtkPlusDevIsInstalled; ValueData: 1; Flags: uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono; ValueType: string; ValueName:
DefaultCLR; ValueData: 1.1.16; Flags: uninsdeletevalue
+Root: HKLM; Subkey: SOFTWARE\Novell\Mono\1.1.16; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: Software\Novell\Mono\1.1.16; ValueType: string; ValueName:
FrameworkAssemblyDirectory; ValueData: {app}\lib; Flags: uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.1.16; ValueType: string; ValueName:
MonoConfigDir; ValueData: {app}\etc; Flags: uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.1.16; ValueType: string; ValueName:
SdkInstallRoot; ValueData: {app}; Flags: uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.1.16; Components: xsp; ValueType:
dword; ValueName: XSPIsInstalled; ValueData: 1; Flags: uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.1.16; Components: gtk\gtkSharp;
ValueType: dword; ValueName: GtkSharpIsInstalled; ValueData: 1; Flags:
uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.1.16; 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.15',
'SdkInstallRoot',
+ bRc := RegQueryStringValue(HKLM, 'SOFTWARE\Novell\Mono\1.1.16',
'SdkInstallRoot',
strMonoBaseDir
);
@@ -136,10 +136,10 @@
end;
end;
-// Checks to see if Mono 1.1.15 is Installed
+// Checks to see if Mono 1.1.16 is Installed
Function IsMonoInstalled() : Boolean;
begin
- Result := RegValueExists(HKLM, 'SOFTWARE\Novell\Mono\1.1.15',
'SdkInstallRoot');
+ Result := RegValueExists(HKLM, 'SOFTWARE\Novell\Mono\1.1.16',
'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-07-06
23:53:38 UTC (rev 62331)
+++ trunk/release/windows-installer/buildwindows-installer 2006-07-07
00:04:20 UTC (rev 62332)
@@ -607,8 +607,9 @@
# Strip binaries for each selection
# TODO: Hmm... this broke the install (mono wouldn't run at runtime) ... will
need more investigation
-#for sel in selections:
-# (code, output) = installer_env.ssh.execute('cd
/tmp/windows-installer/build/%s/bin; strip --strip-unneeded *.dll *.exe ; cd
../lib; strip --strip-unneeded *.a' % sel.name)
+# Fixed for now, stripping some of the .dll files causes problems, so we'll
only strip the biggest ones
+for sel in selections:
+ (code, output) = installer_env.ssh.execute('cd
/tmp/windows-installer/build/%s/bin; strip --strip-unneeded *.exe mono*.dll
libgtk-win*.dll ; cd ../lib; strip --strip-unneeded *.a' % sel.name)
# Run installer on windows
(code, output) = installer_env.ssh.execute('export
PATH="$PATH:/cygdrive/c/PROGRA~1/INNOSE~1:C:\Program Files\Inno Setup5"; cd
/tmp/windows-installer; ISCC.exe Mono.iss')
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
