Author: wade
Date: 2007-03-17 01:28:30 -0500 (Sat, 17 Mar 2007)
New Revision: 74512
Added:
trunk/release/packaging/bundles/RTL
Modified:
trunk/release/conf/mono/ximian-build.conf
trunk/release/monobuild/buildserver.py
trunk/release/packaging/conf/sunos-10-x86
trunk/release/packaging/mktarball
trunk/release/packaging/upload-preview
trunk/release/website/mk-repos.py
trunk/release/website/repo-config/config.py
trunk/release/windows-installer/Mono.iss
Log:
RTL 1.2.3.50 specific changes:
packaging/bundles/RTL
packaging/upload-preview
conf/mono/ximian-build.conf
windows-installer/Mono.iss
monobuild/buildserver.py:
-stop after current operation instead of finish list of items
website/mk-repos.py
website/repo-config/config.py
-add gnome-sharp and gtk-sharp-2.10 to list for sync bundle,
-handle errors better (shouldn't happen, but sometimes rmtree doesn't do it's
job...??)
Modified: trunk/release/conf/mono/ximian-build.conf
===================================================================
--- trunk/release/conf/mono/ximian-build.conf 2007-03-17 03:28:05 UTC (rev
74511)
+++ trunk/release/conf/mono/ximian-build.conf 2007-03-17 06:28:30 UTC (rev
74512)
@@ -24,6 +24,7 @@
</source>
<build id="default">
+ <!-- <unstripped /> -->
<prepare>
CFLAGS="-O2 [[mono_cflags]]" [[usrconfigure]]
[[mono_configure_options]] --with-preview=yes
</prepare>
@@ -350,6 +351,7 @@
<i>[[usrprefix]]/lib/mono/2.0/httpcfg.exe*</i>
<i>[[usrprefix]]/lib/mono/1.0/ilasm.exe*</i>
<i>[[usrprefix]]/lib/mono/2.0/ilasm.exe*</i>
+ <i>[[usrprefix]]/lib/mono/1.0/installvst.exe*</i>
<i>[[usrprefix]]/lib/mono/1.0/mkbundle.exe*</i>
<i>[[usrprefix]]/lib/mono/2.0/mkbundle.exe*</i>
<i>[[usrprefix]]/lib/mono/1.0/monop.exe*</i>
@@ -400,6 +402,7 @@
<i>[[usrprefix]]/bin/httpcfg</i>
<i>[[usrprefix]]/bin/ilasm</i>
<i>[[usrprefix]]/bin/ilasm2</i>
+ <i>[[usrprefix]]/bin/installvst</i>
<i>[[usrprefix]]/bin/makecert</i>
<i>[[usrprefix]]/bin/mkbundle</i>
<i>[[usrprefix]]/bin/mkbundle2</i>
@@ -458,6 +461,7 @@
<i>[[usrprefix]]/lib/mono/2.0/Microsoft.Common.tasks</i>
<i>[[usrprefix]]/lib/mono/2.0/Microsoft.Common.targets</i>
<i>[[usrprefix]]/lib/mono/2.0/Microsoft.CSharp.targets</i>
+ <i>[[usrprefix]]/lib/mono/2.0/Microsoft.VisualBasic.targets</i>
<i>[[usrprefix]]/lib/mono/2.0/MSBuild</i>
<i>[[usrprefix]]/lib/mono/2.0/xbuild.rsp</i>
Modified: trunk/release/monobuild/buildserver.py
===================================================================
--- trunk/release/monobuild/buildserver.py 2007-03-17 03:28:05 UTC (rev
74511)
+++ trunk/release/monobuild/buildserver.py 2007-03-17 06:28:30 UTC (rev
74512)
@@ -79,20 +79,30 @@
for pack in config.td_packages:
self.pack_objs[pack] = packaging.package("", pack)
+ def cancelled(self):
+ self.load_info()
+
+ if config.td_active and not sigint_event.isSet():
+ return False
+ else:
+ return True
+
+
def run(self):
tarball_log.log("Tarball creator starting...\n")
- while not sigint_event.isSet() and self.td_active:
+ while not self.cancelled():
start_time = utils.get_time()
- self.load_info()
-
# routinely check for updates (sleep every so often)
for pack_name, pack_obj in self.pack_objs.iteritems():
+ # We are reloading pack_objs, but this for loop
won't notice it until we enter it again
+ if self.cancelled(): continue
+
# get latest version from the tree
latest_tree_rev =
self.src_repo.latest_tree_revision()
#print "Latest tree rev: %d (%s)" %
(latest_tree_rev, pack_name)
@@ -123,7 +133,7 @@
# Skip to next pack...
break
- if not self.distfiles.contains('HEAD',
pack_name, str(latest_for_package)) and not sigint_event.isSet():
+ if not self.distfiles.contains('HEAD',
pack_name, str(latest_for_package)) and not self.cancelled():
command = "cd %s; ./mktarball
--snapshot %s %d" % (config.packaging_dir, pack_name, latest_for_package)
tarball_log.log("Executing:
%s\n" % (command) )
@@ -151,7 +161,7 @@
# Only sleep if this loop was shorter than
max_poll_interval
# and if we do sleep, discount the time_duration
- if not sigint_event.isSet() and time_duration <
self.max_poll_interval:
+ if not self.cancelled() and time_duration <
self.max_poll_interval:
#tarball_log.log("Sleeping for %d seconds...\n"
% (self.max_poll_interval - time_duration) )
time.sleep(self.max_poll_interval -
time_duration)
@@ -170,29 +180,23 @@
self.setName(distro)
- def exit_if_interrupted(self):
- if sigint_event.isSet():
- # TODO: what's the best way to exit a thread? _exit?
return?
- scheduler_log.log("%s:\tExiting because of user
interruption\n" % self.distro)
- sys.exit(1)
-
# We can unschedule this platform by removing it from the list in
pyutils/config.py or turning off the scheduler
# Reload config info (only useful for sleep times and which packages to
build for a distro)
- def scheduled(self):
+ def cancelled(self):
# reload python module
reload(config)
- if config.sd_latest_build_distros.count(self.distro) and
config.sd_active:
+ if config.sd_latest_build_distros.count(self.distro) and
config.sd_active and not sigint_event.isSet():
+ return False
+ else:
return True
- else:
- return False
def run(self):
distro = self.distro
scheduler_log.log("%s:\tStarting scheduler\n" % (distro) )
- while self.scheduled():
+ while not self.cancelled():
packages_to_build = []
for pack_def in config.sd_latest_build_packages:
@@ -206,7 +210,8 @@
# Build each package for this jail
for package_name in packages_to_build:
- self.exit_if_interrupted()
+ # Skip builds so we can exit
+ if self.cancelled(): continue
# Check to see what the latest tarball is
# The src_repo class is not threadsafe, so
provide a mutex here
@@ -261,6 +266,7 @@
scheduler_log.log("%s:\tExiting upon user request...\n" %
distro)
+# TODO: When CTRL-C is pressed, this should keep running until the other
threads stop... ?
class sync(threading.Thread):
@@ -279,11 +285,19 @@
self.sync_num_builds = config.sync_num_builds
self.sync_sleep_time = config.sync_sleep_time
+ def cancelled(self):
+ # Don't shut this thread down until the tarball and build
threads are done
+ # Are these vars available across threads? (if not, we'll
have to use a signal)
+ if len(build_threads) == 0 and not tarball_thread.isAlive():
+ return True
+ else:
+ return False
+
def run(self):
sync_log.log("sync thread starting...\n")
- while not sigint_event.isSet() and self.sync_active:
+ while not self.cancelled():
self.load_info()
@@ -336,6 +350,9 @@
# Set up event object
sigint_event = threading.Event()
+# Keep track of build threads
+build_threads = []
+
# Set signal handler
signal.signal(signal.SIGINT, keyboard_interrupt)
@@ -347,9 +364,6 @@
tarball_thread = tarball_builder()
tarball_thread.start()
-# Keep track of build threads
-build_threads = []
-
# Sleep if threads are still alive
# Wow... here was the key... the main thread would exit, but pressing ctrl-c
would go to the main thread (which had already exited)
# source:
http://groups.google.com/group/comp.lang.python/browse_thread/thread/bb177d4cff9cde4e/d39dbc7e71a897c2?lnk=st&q=threading+sigint+group%3Acomp.lang.python&rnum=4&hl=en#d39dbc7e71a897c2
@@ -380,6 +394,7 @@
thread.start()
build_threads.append(thread)
+ # TODO: when ctrl-C is pressed, don't stop the sync thread. Only stop
the sync thread if the td and build threads are done
# Check if we need to start up the sync thread
if not sync_thread.isAlive() and not sigint_event.isSet() and
config.sync_active:
sync_thread = sync()
Added: trunk/release/packaging/bundles/RTL
===================================================================
--- trunk/release/packaging/bundles/RTL 2007-03-17 03:28:05 UTC (rev 74511)
+++ trunk/release/packaging/bundles/RTL 2007-03-17 06:28:30 UTC (rev 74512)
@@ -0,0 +1,13 @@
+# 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.2.3.50"
+
+bundle_urlname="rtl"
+
+bundle_desc="Race To Linux Release"
+
+# This is left empty, because versions on RELEASE will always be the latest
from sources/packages
+# specifying versions is more for a released branch
+#versions=(
+#)
+
Modified: trunk/release/packaging/conf/sunos-10-x86
===================================================================
--- trunk/release/packaging/conf/sunos-10-x86 2007-03-17 03:28:05 UTC (rev
74511)
+++ trunk/release/packaging/conf/sunos-10-x86 2007-03-17 06:28:30 UTC (rev
74512)
@@ -2,11 +2,11 @@
USE_ZIP_PKG=1
# Use the gnu and opensource software
-target_command_prefix='export PATH=/usr/sfw/bin:/usr/ccs/bin:$PATH; '
+target_command_prefix='export PATH=/usr/sfw/bin:/usr/ccs/bin:$PATH; export
CC=/usr/sfw/bin/gcc; '
# Notes about this arch:
# Removed -mt flag from /usr/lib/pkgconfig/gthread-2.0.pc (it's a compiler
flag for forte, which isn't valid with gcc)
-# created symlink cc -> gcc for runtime test
+# created symlink cc -> gcc for runtime test (set CC instead)
strip_path=/usr/ccs/bin/strip
tar_path=/usr/sfw/bin/gtar
Modified: trunk/release/packaging/mktarball
===================================================================
--- trunk/release/packaging/mktarball 2007-03-17 03:28:05 UTC (rev 74511)
+++ trunk/release/packaging/mktarball 2007-03-17 06:28:30 UTC (rev 74512)
@@ -20,7 +20,7 @@
def usage():
print ""
- print "Usage: ./mktarball [--snapshot] [--force] <package> <version|srv
rev>"
+ print "Usage: ./mktarball [--snapshot] [--force] <package> <version|svn
rev>"
print " where version is a tagged released version or an svn revision"
print " Note: if you specify snapshot, you must specify 'svn rev'
instead of 'version'"
print " --force is used to override an already existing tarball, "
Modified: trunk/release/packaging/upload-preview
===================================================================
--- trunk/release/packaging/upload-preview 2007-03-17 03:28:05 UTC (rev
74511)
+++ trunk/release/packaging/upload-preview 2007-03-17 06:28:30 UTC (rev
74512)
@@ -1,14 +1,16 @@
#!/bin/sh
-BUNDLE="PRE-RELEASE"
+BUNDLE="RTL"
TARGET_USER="mono-web"
TARGET_HOST="mono.ximian.com"
-BASE_DIR="~/release/monobuild/www/preview"
-BASE_URL="/monobuild/preview"
+BASE_DIR="~/release/monobuild/www/rtl"
+BASE_URL="/monobuild/rtl"
+ssh [EMAIL PROTECTED] "mkdir -p $BASE_DIR"
cd ../website
-./sync-bundle.py $BUNDLE [EMAIL PROTECTED]:$BASE_DIR
+# Need skip missing, because we don't build packages for gnome-sharp and
gtk-sharp 2.10 yet... but we still want to publish the sources
+./sync-bundle.py --skip_missing $BUNDLE [EMAIL PROTECTED]:$BASE_DIR
scp packaging.css [EMAIL PROTECTED]:$BASE_DIR
ssh [EMAIL PROTECTED] "cd release/website; ./mk-sources-index.py
$BUNDLE $BASE_DIR $BASE_URL $BASE_DIR/sources"
Modified: trunk/release/website/mk-repos.py
===================================================================
--- trunk/release/website/mk-repos.py 2007-03-17 03:28:05 UTC (rev 74511)
+++ trunk/release/website/mk-repos.py 2007-03-17 06:28:30 UTC (rev 74512)
@@ -96,10 +96,13 @@
for file in rpms:
arch_dir = distro_obj.name + os.sep +
utils.rpm_query('ARCH', file)
if not os.path.exists(arch_dir):
distutils.dir_util.mkpath(arch_dir)
-
- os.link(file, os.path.join(arch_dir,
os.path.basename(file)))
+ # Hrm... seems the shutil.rmtree didn't work... ?
+ link = arch_dir + os.sep + os.path.basename(file)
+ if not os.path.exists(link):
+ os.link(file, link)
+
# Start creating repositories
if utils.get_dict_var('USE_OC', distro_obj.info):
Modified: trunk/release/website/repo-config/config.py
===================================================================
--- trunk/release/website/repo-config/config.py 2007-03-17 03:28:05 UTC (rev
74511)
+++ trunk/release/website/repo-config/config.py 2007-03-17 06:28:30 UTC (rev
74512)
@@ -3,9 +3,11 @@
cocoa-sharp
gecko-sharp
gecko-sharp-2.0
+gnome-sharp
gtk-sharp
gtk-sharp-2.0
gtk-sharp-2.8
+gtk-sharp-2.10
gtksourceview-sharp-2.0
heap-buddy
ikvm
Modified: trunk/release/windows-installer/Mono.iss
===================================================================
--- trunk/release/windows-installer/Mono.iss 2007-03-17 03:28:05 UTC (rev
74511)
+++ trunk/release/windows-installer/Mono.iss 2007-03-17 06:28:30 UTC (rev
74512)
@@ -2,24 +2,24 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
[Setup]
-AppName=Mono 1.2.3.1 with GTK# 2.8.3
-AppVerName=Mono for Windows 1.2.3.1
+AppName=Mono 1.2.3.50 with GTK# 2.8.3
+AppVerName=Mono for Windows 1.2.3.50
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.3.1
-DefaultGroupName=Mono 1.2.3.1 for Windows
-AppID={{d260e99b-de29-44b6-a01d-30049361be1a}
+DefaultDirName={pf}\Mono-1.2.3.50
+DefaultGroupName=Mono 1.2.3.50 for Windows
+AppID={{161ee224-8c66-4176-9ad9-6bca176130ac}
Compression=lzma/max
;Compression=bzip/4
;Compression=zip
SolidCompression=true
DisableDirPage=false
DisableReadyPage=false
-OutputBaseFilename=mono-1.2.3.1-gtksharp-2.8.3-win32-0
-VersionInfoVersion=1.2.3.1
-VersionInfoDescription=Mono 1.2.3.1 with Gtk# Installer for Win32
+OutputBaseFilename=mono-1.2.3.50-gtksharp-2.8.3-win32-rtl0
+VersionInfoVersion=1.2.3.50
+VersionInfoDescription=Mono 1.2.3.50 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.3.1
+AppVersion=1.2.3.50
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.3.1/
+Filename: {app}\MonoReleaseNotes.url; Section: InternetShortcut; Components:
mono; Key: URL; String: http://go-mono.com/archive/1.2.3.50/
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.3.1 Command Prompt; Filename: {cmd}; Parameters: "/k
""{app}\bin\setmonopath.bat"""; Comment: Open Mono 1.2.3.1 Command Prompt
+Name: {group}\Mono-1.2.3.50 Command Prompt; Filename: {cmd}; Parameters: "/k
""{app}\bin\setmonopath.bat"""; Comment: Open Mono 1.2.3.50 Command Prompt
Name: {group}\Readme; Filename: {app}\ReleaseNotes.txt; Comment: Combined
Installer Release Notes
-Name: {group}\{cm:ProgramOnTheWeb,Mono-1.2.3.1 Release Notes}; Filename:
{app}\MonoReleaseNotes.url
+Name: {group}\{cm:ProgramOnTheWeb,Mono-1.2.3.50 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.3.1 Win32}; Filename:
{uninstallexe}
+Name: {group}\{cm:UninstallProgram,Mono-1.2.3.50 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.3.1; Flags: uninsdeletevalue
-Root: HKLM; Subkey: SOFTWARE\Novell\Mono\1.2.3.1; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: Software\Novell\Mono\1.2.3.1; ValueType: string;
ValueName: FrameworkAssemblyDirectory; ValueData: {app}\lib; Flags:
uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.2.3.1; ValueType: string;
ValueName: MonoConfigDir; ValueData: {app}\etc; Flags: uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.2.3.1; ValueType: string;
ValueName: SdkInstallRoot; ValueData: {app}; Flags: uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.2.3.1; Components: xsp; ValueType:
dword; ValueName: XSPIsInstalled; ValueData: 1; Flags: uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.2.3.1; Components: gtk\gtkSharp;
ValueType: dword; ValueName: GtkSharpIsInstalled; ValueData: 1; Flags:
uninsdeletevalue
-Root: HKLM; Subkey: Software\Novell\Mono\1.2.3.1; Components: gtk; ValueType:
dword; ValueName: GtkPlusDevIsInstalled; ValueData: 1; Flags: uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono; ValueType: string; ValueName:
DefaultCLR; ValueData: 1.2.3.50; Flags: uninsdeletevalue
+Root: HKLM; Subkey: SOFTWARE\Novell\Mono\1.2.3.50; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: Software\Novell\Mono\1.2.3.50; ValueType: string;
ValueName: FrameworkAssemblyDirectory; ValueData: {app}\lib; Flags:
uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.2.3.50; ValueType: string;
ValueName: MonoConfigDir; ValueData: {app}\etc; Flags: uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.2.3.50; ValueType: string;
ValueName: SdkInstallRoot; ValueData: {app}; Flags: uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.2.3.50; Components: xsp; ValueType:
dword; ValueName: XSPIsInstalled; ValueData: 1; Flags: uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.2.3.50; Components: gtk\gtkSharp;
ValueType: dword; ValueName: GtkSharpIsInstalled; ValueData: 1; Flags:
uninsdeletevalue
+Root: HKLM; Subkey: Software\Novell\Mono\1.2.3.50; 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.3.1;
Components: xsp\xsp_shell; ValueType: string; ValueData: XSP Web Server Here
1.2.3.1; Flags: uninsdeletekey
-Root: HKLM; Subkey: SOFTWARE\Classes\Folder\shell\XSP WebServer
1.2.3.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.3.1;
Components: xsp\xsp2_shell; ValueType: string; ValueData: XSP 2.0 Web Server
Here 1.2.3.1; Flags: uninsdeletekey
-Root: HKLM; Subkey: SOFTWARE\Classes\Folder\shell\XSP2 WebServer
1.2.3.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.3.50;
Components: xsp\xsp_shell; ValueType: string; ValueData: XSP Web Server Here
1.2.3.50; Flags: uninsdeletekey
+Root: HKLM; Subkey: SOFTWARE\Classes\Folder\shell\XSP WebServer
1.2.3.50\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.3.50;
Components: xsp\xsp2_shell; ValueType: string; ValueData: XSP 2.0 Web Server
Here 1.2.3.50; Flags: uninsdeletekey
+Root: HKLM; Subkey: SOFTWARE\Classes\Folder\shell\XSP2 WebServer
1.2.3.50\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.3.1',
'SdkInstallRoot',
+ bRc := RegQueryStringValue(HKLM, 'SOFTWARE\Novell\Mono\1.2.3.50',
'SdkInstallRoot',
strMonoBaseDir
);
@@ -145,10 +145,10 @@
end;
end;
-// Checks to see if Mono 1.2.3.1 is Installed
+// Checks to see if Mono 1.2.3.50 is Installed
Function IsMonoInstalled() : Boolean;
begin
- Result := RegValueExists(HKLM, 'SOFTWARE\Novell\Mono\1.2.3.1',
'SdkInstallRoot');
+ Result := RegValueExists(HKLM, 'SOFTWARE\Novell\Mono\1.2.3.50',
'SdkInstallRoot');
end;
Function SayMessage(const strMsg: String; const typMsgBox: TMsgBoxType) :
Integer;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
