Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

move ppc64 to sle-11

svn path=/trunk/release/; revision=120780
  • Loading branch information...
commit 794b41d224cdfe9d693932a81cbb99339e21435c 1 parent df718b7
authored December 04, 2008
2  macosx/buildpackage
@@ -19,7 +19,7 @@ import packaging
19 19
 # Which noarch packages to include in the various packages
20 20
 packages_to_include = {}
21 21
 
22  
-packages_to_include['macos-10-ppc'] = ['libgdiplus', 'mono', 'cocoa-sharp', 'xsp', 'monodoc', 'boo', 'ikvm', 'nant', 'IPCE', 'mono-basic', 'gtk-sharp212', 'mono-addins' ]
  22
+packages_to_include['macos-10-ppc'] = ['libgdiplus', 'mono', 'cocoa-sharp', 'xsp', 'boo', 'ikvm', 'nant', 'IPCE', 'mono-basic', 'gtk-sharp212', 'mono-addins' ]
23 23
 
24 24
 packages_to_include['macos-10-x86'] = packages_to_include['macos-10-ppc']
25 25
 
1  monobuild/buildserver.py
@@ -383,6 +383,7 @@ def run(self):
383 383
 #  This will let the threads finish when CTRL-C is pushed
384 384
 def keyboard_interrupt(signum, frame):
385 385
 	print "*** Signaling all threads to finish ***"
  386
+	sync_log.log("*** Signaling all threads to finish ***\n")
386 387
 	sigint_event.set()
387 388
 
388 389
 # Set up event object
61  packaging/bundles/PRE-RELEASE
... ...
@@ -1,48 +1,51 @@
1 1
 # Directory used when created go-mono.com/archive/<archive_version>
2 2
 #  This will need to be manually bumped each time on head... don't forget!!
3  
-archive_version="2.0"
  3
+archive_version="2.2"
4 4
 
5 5
 bundle_urlname="preview"
6 6
 
7  
-bundle_short_desc="Release Candidate 3"
  7
+bundle_short_desc="Preview 1"
8 8
 bundle_desc="Preview packages before an official release"
9 9
 
10 10
 obs_repos=(
11  
-	rsync://rsync.opensuse.org/buildservice-repos-main/Mono:/Preview/openSUSE_11.0/
12  
-	rsync://rsync.opensuse.org/buildservice-repos-main/Mono:/Preview/SLE_10/
  11
+	rsync://rsync.opensuse.org/buildservice-repos-full/Mono:/Preview/openSUSE_11.0/
  12
+	rsync://rsync.opensuse.org/buildservice-repos-full/Mono:/Preview/SLE_10/
13 13
 )
14 14
 
15 15
 versions=(
16  
-	mono=""
17  
-	mono-basic=""
18  
-	libgdiplus=""
19  
-	gluezilla=""
20  
-	webserver=""
21  
-	xsp=""
22  
-	mod_mono=""
  16
+	IPCE=""
  17
+	boo=""
23 18
 	devtools=""
24  
-	monodoc=""
25  
-	mono-tools=""
26 19
 	gecko-sharp2=""
  20
+	gluezilla=""
  21
+	gnome-desktop-sharp2=""
  22
+	gnome-sharp220=""
  23
+	gnome-sharp2=""
  24
+	gtk-sharp-2.0=""
  25
+	gtk-sharp210=""
  26
+	gtk-sharp212=""
  27
+	gtk-sharp28=""
  28
+	gtk-sharp2=""
27 29
 	gtksourceview-sharp2=""
28  
-	boo=""
  30
+	heap-buddy=""
29 31
 	ikvm=""
  32
+	libgdiplus=""
  33
+	mod_mono=""
  34
+	mono-addins=""
  35
+	mono-basic=""
30 36
 	mono-debugger=""
31  
-	heap-buddy=""
  37
+	mono-tools=""
  38
+	mono=""
  39
+	monodevelop-boo=""
  40
+	monodevelop-database=""
  41
+	monodevelop-debugger-gdb=""
  42
+	monodevelop-debugger-mdb=""
  43
+	monodevelop-java=""
  44
+	monodevelop-vala=""
  45
+	monodevelop=""
  46
+	monodoc=""
32 47
 	nant=""
33  
-	IPCE=""
34  
-	mono-addins=""
35  
-	gtk-sharp-2.0=""
36  
-	gtk-sharp2=""
37  
-	gtk-sharp28=""
38  
-	gtk-sharp210=""
39  
-	gnome-sharp2=""
40  
-	gtk-sharp212=""
41  
-	gnome-sharp220=""
42  
-	gnome-desktop-sharp2=""
43  
-	monodevelop="1.0"
44  
-	monodevelop-boo="1.0"
45  
-	monodevelop-database="1.0"
46  
-	monodevelop-java="1.0"
47 48
 	webkit-sharp=""
  49
+	webserver=""
  50
+	xsp=""
48 51
 )
9  packaging/bundles/RELEASE
... ...
@@ -1,17 +1,14 @@
1 1
 # Directory used when created go-mono.com/archive/<archive_version>
2 2
 #  This will need to be manually bumped each time on head... don't forget!!
3  
-archive_version="2.0"
  3
+archive_version="2.0.1"
4 4
 
5 5
 bundle_urlname="stable"
6 6
 
7 7
 bundle_desc="Packages from the latest release"
8 8
 
9 9
 obs_repos=(
10  
-	rsync://ftp5.gwdg.de/pub/opensuse/repositories/Mono:/Preview/openSUSE_11.0/
11  
-	rsync://ftp5.gwdg.de/pub/opensuse/repositories/Mono:/Preview/SLE_10/
12  
-## These don't have debuginfo packages for some reason!
13  
-#	rsync://rsync.opensuse.org/buildservice-repos-main/Mono:/Preview/openSUSE_11.0/
14  
-#	rsync://rsync.opensuse.org/buildservice-repos-main/Mono:/Preview/SLE_10/
  10
+	rsync://rsync.opensuse.org/buildservice-repos-full/Mono:/Preview/openSUSE_11.0/
  11
+	rsync://rsync.opensuse.org/buildservice-repos-full/Mono:/Preview/SLE_10/
15 12
 )
16 13
 
17 14
 # Actually, for now we have to use the stable version of monodevelop
2  packaging/conf/scratchbox-0.9.8-arm
... ...
@@ -1,5 +1,5 @@
1 1
 username=builder
2  
-hostname=x64-linux-2.mono.lab.novell.com
  2
+hostname=x64-linux-1.mono.lab.novell.com
3 3
 root_dir=/jails/scratchbox-0.9.8-arm
4 4
 
5 5
 arch_change_path=/usr/bin/linux32
2  packaging/conf/sles-10-x86_64
... ...
@@ -1,5 +1,5 @@
1 1
 username=builder
2  
-hostname=x64-linux-2.mono.lab.novell.com
  2
+hostname=x64-linux-3.mono.lab.novell.com
3 3
 root_dir=/jails/sles-10-x86_64
4 4
 chroot_path=/usr/bin/chroot
5 5
 
2  packaging/conf/sles-10-x86_64-1
... ...
@@ -1,5 +1,5 @@
1 1
 username=builder
2  
-hostname=x64-linux-3.mono.lab.novell.com
  2
+hostname=x64-linux-2.mono.lab.novell.com
3 3
 root_dir=/jails/sles-10-x86_64
4 4
 chroot_path=/usr/bin/chroot
5 5
 
2  packaging/defs/gluezilla
@@ -61,7 +61,7 @@ win_4_i386_ZIP_BUILD () {
61 61
 	done
62 62
 	chmod 755 xpidl.exe *.dll
63 63
 	chmod 755 make.cmd
64  
-	make.cmd c:\\cygwin\\tmp\\build_deps\\gecko-sdk
  64
+	./make.cmd c:\\cygwin\\tmp\\build_deps\\gecko-sdk
65 65
 	cd ..
66 66
 
67 67
 	cd src
31  packaging/defs/libgdiplus
@@ -162,14 +162,14 @@ macos_10_ppc_ZIP_DEPS=(
162 162
 
163 163
 	# See http://primates.ximian.com/~wberrier/macos/deps/README
164 164
 
165  
-        http://primates.ximian.com/~wberrier/macos/deps/ppc/glib-2.14.1-0.macos10.novell.ppc.zip
166  
-        http://primates.ximian.com/~wberrier/macos/deps/ppc/pkg-config-0.22-0.macos10.novell.ppc.zip
167  
-        http://primates.ximian.com/~wberrier/macos/deps/ppc/gettext-0.16.1-0.macos10.novell.ppc.zip
  165
+        http://primates.ximian.com/~wberrier/macos/deps/ppc/glib-2.18.1-0.macos10.novell.ppc.zip
  166
+        http://primates.ximian.com/~wberrier/macos/deps/ppc/pkg-config-0.23-0.macos10.novell.ppc.zip
  167
+        http://primates.ximian.com/~wberrier/macos/deps/ppc/gettext-0.17-0.macos10.novell.ppc.zip
168 168
 
169  
-	http://primates.ximian.com/~wberrier/macos/deps/ppc/jpeg-6b-0.macos10.novell.ppc.zip
170  
-	http://primates.ximian.com/~wberrier/macos/deps/ppc/libpng-1.2.20-0.macos10.novell.ppc.zip
171  
-	http://primates.ximian.com/~wberrier/macos/deps/ppc/giflib-4.1.6-0.macos10.novell.ppc.zip
172  
-	http://primates.ximian.com/~wberrier/macos/deps/ppc/tiff-3.8.2-0.macos10.novell.ppc.zip
  169
+        http://primates.ximian.com/~wberrier/macos/deps/ppc/jpeg-6b-0.macos10.novell.ppc.zip
  170
+        http://primates.ximian.com/~wberrier/macos/deps/ppc/libpng-1.2.32-0.macos10.novell.ppc.zip
  171
+        http://primates.ximian.com/~wberrier/macos/deps/ppc/giflib-4.1.6-0.macos10.novell.ppc.zip
  172
+        http://primates.ximian.com/~wberrier/macos/deps/ppc/tiff-3.8.2-0.macos10.novell.ppc.zip
173 173
 
174 174
 	# Freetype...
175 175
 	# Panther's freetype is too old... Tiger's is ok.  we need it here
@@ -183,15 +183,14 @@ macos_10_ppc_ZIP_DEPS=(
183 183
 macos_10_x86_ZIP_DEPS=(
184 184
 
185 185
 	# See http://primates.ximian.com/~wberrier/macos/deps/README
186  
-
187  
-        http://primates.ximian.com/~wberrier/macos/deps/x86/glib-2.14.1-0.macos10.novell.x86.zip
188  
-        http://primates.ximian.com/~wberrier/macos/deps/x86/pkg-config-0.22-0.macos10.novell.x86.zip
189  
-        http://primates.ximian.com/~wberrier/macos/deps/x86/gettext-0.16.1-0.macos10.novell.x86.zip
190  
-
191  
-	http://primates.ximian.com/~wberrier/macos/deps/x86/jpeg-6b-0.macos10.novell.x86.zip
192  
-	http://primates.ximian.com/~wberrier/macos/deps/x86/libpng-1.2.20-0.macos10.novell.x86.zip
193  
-	http://primates.ximian.com/~wberrier/macos/deps/x86/giflib-4.1.6-0.macos10.novell.x86.zip
194  
-	http://primates.ximian.com/~wberrier/macos/deps/x86/tiff-3.8.2-0.macos10.novell.x86.zip
  186
+        http://primates.ximian.com/~wberrier/macos/deps/x86/glib-2.18.1-0.macos10.novell.x86.zip
  187
+        http://primates.ximian.com/~wberrier/macos/deps/x86/pkg-config-0.23-0.macos10.novell.x86.zip
  188
+        http://primates.ximian.com/~wberrier/macos/deps/x86/gettext-0.17-0.macos10.novell.x86.zip
  189
+
  190
+        http://primates.ximian.com/~wberrier/macos/deps/x86/jpeg-6b-0.macos10.novell.x86.zip
  191
+        http://primates.ximian.com/~wberrier/macos/deps/x86/libpng-1.2.32-0.macos10.novell.x86.zip
  192
+        http://primates.ximian.com/~wberrier/macos/deps/x86/giflib-4.1.6-0.macos10.novell.x86.zip
  193
+        http://primates.ximian.com/~wberrier/macos/deps/x86/tiff-3.8.2-0.macos10.novell.x86.zip
195 194
 
196 195
 	# Freetype...
197 196
 	# Panther's freetype is too old... Tiger's is ok.  we need it here
6  packaging/defs/maemo-sharp
@@ -10,6 +10,12 @@ MONO_DEPS=(
10 10
 	mono
11 11
 )
12 12
 
  13
+MONO_RECOMMEND_DEPS=(
  14
+	gtk-sharp2
  15
+	gtk-sharp28
  16
+	gtk-sharp210
  17
+	gtk-sharp212
  18
+)
13 19
 
14 20
 get_destroot () {
15 21
 	DEST_ROOT=noarch
4  packaging/defs/mono
@@ -10,7 +10,7 @@ BUILD_HOSTS=(
10 10
 	sles-10-i586
11 11
 	sles-10-ia64
12 12
 	sles-10-ppc
13  
-	sles-10-ppc64
  13
+	sle-11-ppc64
14 14
 	sles-10-x86_64
15 15
 	sunos-10-sparc
16 16
 	sunos-10-x86
@@ -26,7 +26,7 @@ USE_HOSTS=(
26 26
 	sles-10-i586
27 27
 	sles-10-ia64
28 28
 	sles-10-ppc
29  
-	sles-10-ppc64
  29
+	sle-11-ppc64
30 30
 	sles-10-x86_64
31 31
 	sunos-10-sparc
32 32
 	sunos-10-x86
4  packaging/defs/mono-debugger
@@ -27,12 +27,12 @@ USE_HOSTS=(
27 27
 )
28 28
 
29 29
 MONO_DEPS=(
30  
-	mono-branch
  30
+	mono
31 31
 	xsp
32 32
 )
33 33
 
34 34
 MONO_RECOMMEND_DEPS=(
35  
-	libgdiplus-branch
  35
+	libgdiplus
36 36
 )
37 37
 
38 38
 get_destroot () {
5  packaging/defs/monodevelop
... ...
@@ -1,10 +1,5 @@
1 1
 web_index=2
2 2
 
3  
-MKTARBALL_HEAD_DEPS=1
4  
-
5  
-# Not needed anymore... ?
6  
-#fresh_checkout=1
7  
-
8 3
 BUILD_HOSTS=(
9 4
 	sles-10-i586
10 5
 	macos-10-x86
3  packaging/defs/monodevelop-boo
@@ -3,9 +3,6 @@ BUILD_HOSTS=(
3 3
 	sles-10-i586
4 4
 )
5 5
 
6  
-# Temporary?
7  
-MKTARBALL_HEAD_DEPS=1
8  
-
9 6
 USE_HOSTS=(
10 7
 	sles-10-i586
11 8
 	sles-10-ppc
3  packaging/defs/monodevelop-debugger-gdb
@@ -3,9 +3,6 @@ BUILD_HOSTS=(
3 3
 	sles-10-i586
4 4
 )
5 5
 
6  
-# Temporary?
7  
-MKTARBALL_HEAD_DEPS=1
8  
-
9 6
 USE_HOSTS=(
10 7
 	sles-10-i586
11 8
 	sles-10-ppc
3  packaging/defs/monodevelop-debugger-mdb
@@ -3,9 +3,6 @@ BUILD_HOSTS=(
3 3
 	sles-10-i586
4 4
 )
5 5
 
6  
-# Temporary?
7  
-MKTARBALL_HEAD_DEPS=1
8  
-
9 6
 USE_HOSTS=(
10 7
 	sles-10-i586
11 8
 	sles-10-ppc
3  packaging/defs/monodevelop-java
@@ -3,9 +3,6 @@ BUILD_HOSTS=(
3 3
 	sles-10-i586
4 4
 )
5 5
 
6  
-# Temporary?
7  
-MKTARBALL_HEAD_DEPS=1
8  
-
9 6
 USE_HOSTS=(
10 7
 	sles-10-i586
11 8
 	sles-10-ppc
2  packaging/defs/olive
... ...
@@ -1,7 +1,7 @@
1 1
 web_index=5
2 2
 
3 3
 BUILD_HOSTS=(
4  
-	sles-10-i586
  4
+	suse-110-i586
5 5
 )
6 6
 
7 7
 USE_HOSTS=(
6  packaging/rpm_defs/gtk-sharp2/gtk-sharp2.spec
@@ -255,9 +255,9 @@ This package contains Mono bindings for gconf and gconf peditors.
255 255
 
256 256
 %prep
257 257
 %setup -q -n %{_name}-%{version}
258  
-if [ %version \< 2.10.3 ] ; then
259  
-%patch0 -p1
260  
-fi
  258
+#if [ %version \< 2.10.3 ] ; then
  259
+#%patch0 -p1
  260
+#fi
261 261
 %if %platform_desktop_split == 0
262 262
 %patch1 -p1
263 263
 # 2.8.4 and later on 2.8.x branch doesn't need this patch
14  packaging/upload-preview
@@ -10,10 +10,10 @@ TARGET_DIR="~/release/monobuild/www/preview"
10 10
 TARGET_URL="/monobuild/preview"
11 11
 
12 12
 ## For publishing to a local lan in Provo
13  
-#TARGET_USER="root"
14  
-#TARGET_HOST="c100.mono.lab.novell.com"
15  
-#TARGET_DIR="/share/sw/mono-project.org/mono-previews/2.0p2"
16  
-#TARGET_URL="/software/mono-project.org/mono-previews/2.0p2"
  13
+TARGET_USER="root"
  14
+TARGET_HOST="c100.mono.lab.novell.com"
  15
+TARGET_DIR="/share/sw/mono-project.org/mono-previews/2.2-p1"
  16
+TARGET_URL="/software/mono-project.org/mono-previews/2.2-p1"
17 17
 
18 18
 mkdir -p $STAGE_DIR
19 19
 
@@ -26,9 +26,9 @@ cp packaging.css $STAGE_DIR
26 26
 ./mk-archive-index.py           $BUNDLE $STAGE_DIR
27 27
 
28 28
 # Publish stage
29  
-#ssh $TARGET_USER@$TARGET_HOST "mkdir -p $TARGET_DIR"
30  
-#cd $STAGE_DIR
31  
-#rsync -avzH --delete . $TARGET_USER@$TARGET_HOST:$TARGET_DIR
  29
+ssh $TARGET_USER@$TARGET_HOST "mkdir -p $TARGET_DIR"
  30
+cd $STAGE_DIR
  31
+rsync -avzH --delete . $TARGET_USER@$TARGET_HOST:$TARGET_DIR
32 32
 
33 33
 # TODO: notify x-m-l by mail
34 34
 
2  pyutils/config.py
@@ -121,7 +121,7 @@
121 121
 	sles-10-i586
122 122
 	sles-10-ia64
123 123
 	sles-10-ppc
124  
-	sles-10-ppc64
  124
+	sle-11-ppc64
125 125
 	sles-10-x86_64
126 126
 	sunos-10-sparc
127 127
 	sunos-10-x86
2  website/distro-index
@@ -24,7 +24,7 @@
24 24
 #	monodevelop monodevelop monodevelop-boo monodevelop-database monodevelop-java
25 25
 
26 26
 	<h3>Other</h3>
27  
-#	mono-other uiaatkbridge uiautomationwinforms
  27
+#	mono-other uiaatkbridge uiautomationwinforms olive
28 28
 
29 29
 !	get_external_deps
30 30
 
1  website/repo-config/config.py
@@ -27,6 +27,7 @@
27 27
 mono-debugger
28 28
 mono-tools
29 29
 nant
  30
+olive
30 31
 uiaatkbridge
31 32
 uiautomationwinforms
32 33
 xsp
1  website/sync-bundle.py
@@ -202,6 +202,7 @@ def find_base_distro(pack_name, distro_name):
202 202
 		archive_path = os.path.join(dest, "archive", archive_version, "download")
203 203
 		distutils.dir_util.mkpath(archive_path)
204 204
 		# Hardlink copy into archive
  205
+		os.system("rm -rf %s/%s" % (archive_path, repo_name))
205 206
 		os.system("cp -al %s %s/" % (dest_path, archive_path))
206 207
 
207 208
 #print files
6  windows-installer/Mono_template.iss
@@ -45,7 +45,6 @@ Name: gtk\gtkSharp\monodoc; Description: Monodoc; Types: full custom
45 45
 Name: gtk\gtkSharp\geckosharp; Description: Gecko# Files; Types: full custom
46 46
 Name: gtk\gtkSharp\samples; Description: Samples; Types: full custom
47 47
 Name: xsp; Description: XSP files; Types: full custom
48  
-Name: xsp\xsp_shell; Description: XSP Shell Integration; Types: full custom
49 48
 Name: xsp\xsp2_shell; Description: XSP 2.0 Shell Integration; Types: full custom
50 49
 
51 50
 [Tasks]
@@ -85,13 +84,11 @@ Name: {group}\Applications\Samples Directory; Filename: {app}\samples; Component
85 84
 Name: {group}\Applications\Glade 3; Filename: {app}\bin\glade-3.exe; Components: gtk; Comment: Glade 3 Gui Builder
86 85
 Name: {group}\Applications\Gtk Theme Selector; Filename: {app}\bin\gtkthemeselector.exe; Components: gtk; Comment: GTK Theme Selector
87 86
 ;Name: {group}\Applications\Monodoc Browser; IconFilename: {app}\mono.ico; Filename: {app}\bin\monodoc.bat; Components: gtk\gtkSharp\monodoc; Comment: Mono Documentation Browser
88  
-Name: {group}\XSP\XSP Test Web Server; Filename: {app}\bin\startXSP.bat; Components: xsp; Comment: ASP.NET Web Server with Sample Mono content
89 87
 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
90 88
 Name: {group}\{cm:ProgramOnTheWeb,Mono}; IconFilename: {app}\mono.ico; Filename: {app}\Mono.url
91 89
 Name: {group}\{cm:UninstallProgram,Mono-@@MONO_VERSION@@ Win32}; Filename: {uninstallexe}
92 90
 Name: {group}\{cm:ProgramOnTheWeb,Gtk+}; Components: gtk; Filename: {app}\GtkPlus.url
93 91
 Name: {group}\{cm:ProgramOnTheWeb,Gtk#}; Components: gtk\gtkSharp; Filename: {app}\GtkSharp.url
94  
-Name: {group}\XSP\XSP Index Page; Components: xsp; Filename: {app}\Xsplocal.url
95 92
 Name: {group}\XSP\XSP 2.0 Index Page; Components: xsp; Filename: {app}\Xsplocal2.url
96 93
 
97 94
 [Registry]
@@ -107,8 +104,6 @@ Root: HKLM; Subkey: Software\Novell\Mono\@@MONO_VERSION@@; Components: gtk; Valu
107 104
 Root: HKLM; Subkey: SOFTWARE\Novell\Mono DefaultCLR; Flags: uninsdeletekeyifempty
108 105
 Root: HKLM; Subkey: Software\Novell\Mono DefaultCLR; ValueType: string; ValueName: Installer Language; ValueData: 1033; Flags: uninsdeletevalue
109 106
 ; XSP Shell Integration (Thanks to Joseph Hill)
110  
-Root: HKLM; Subkey: SOFTWARE\Classes\Folder\shell\XSP WebServer @@MONO_VERSION@@; Components: xsp\xsp_shell; ValueType: string; ValueData: XSP Web Server Here @@MONO_VERSION@@; Flags: uninsdeletekey
111  
-Root: HKLM; Subkey: SOFTWARE\Classes\Folder\shell\XSP WebServer @@MONO_VERSION@@\command; Components: xsp\xsp_shell; ValueType: string; ValueData: "{app}\bin\xsp.bat --root ""%1"" --port {code:GetPort} --applications /:."; Flags: uninsdeletekey
112 107
 Root: HKLM; Subkey: SOFTWARE\Classes\Folder\shell\XSP2 WebServer @@MONO_VERSION@@; Components: xsp\xsp2_shell; ValueType: string; ValueData: XSP 2.0 Web Server Here @@MONO_VERSION@@; Flags: uninsdeletekey
113 108
 Root: HKLM; Subkey: SOFTWARE\Classes\Folder\shell\XSP2 WebServer @@MONO_VERSION@@\command; Components: xsp\xsp2_shell; ValueType: string; ValueData: "{app}\bin\xsp2.bat --root ""%1"" --port {code:GetPort} --applications /:."; Flags: uninsdeletekey
114 109
 
@@ -248,7 +243,6 @@ begin
248 243
 	end;  // For
249 244
 
250 245
 	// Set the Port for XSP
251  
-	substituteInFile(cstrBasePath + '\bin\startXSP.bat', '8089', PortForXSP.Values[0]);
252 246
 	substituteInFile(cstrBasePath + '\bin\startXSP2.bat', '8089', PortForXSP.Values[0]);
253 247
 	
254 248
 end;
39  windows-installer/buildwindows-installer
@@ -155,7 +155,7 @@ if gtk_sharp_version.count('-'):
155 155
 
156 156
 # Had to remove mono-tools, since the latest requires gtkhtml-sharp2 (which we don't ship on windows), 
157 157
 #  and 1.1.11 is crashing with the lib update (probably libglade?)
158  
-selections += [ Selection('monodoc', packages = "monodoc mono-tools".split() ) ]
  158
+selections += [ Selection('monodoc', packages = "mono-tools".split() ) ]
159 159
 
160 160
 # TODO: Why am I distributing gecko-sharp without the GRE?
161 161
 # TODO: Also, why am I distributing gnome?.... ? adds some to gtk-sharp 1.0.10
@@ -539,41 +539,6 @@ utils.add_dll_map('mono/etc/mono/config', '<dllmap dll="gtkhtml-3.0" target="lib
539 539
 #
540 540
 ##############################################
541 541
 
542  
-##############################################
543  
-# monodoc .bat wrapper hacks
544  
-
545  
-parameter_map = {}
546  
-parameter_map[re.compile(r"\\assembler")] = r"\\lib\\monodoc\\assembler"
547  
-utils.substitute_parameters_in_file("monodoc/bin/mdassembler.bat", parameter_map)
548  
-
549  
-parameter_map = {}
550  
-parameter_map[re.compile(r"\\cs2ecma")] = r"\\lib\\monodoc\\cs2ecma"
551  
-utils.substitute_parameters_in_file("monodoc/bin/mdcs2ecma.bat", parameter_map)
552  
-
553  
-parameter_map = {}
554  
-parameter_map[re.compile(r"\\normalize")] = r"\\lib\\monodoc\\normalize"
555  
-utils.substitute_parameters_in_file("monodoc/bin/mdnormalizer.bat", parameter_map)
556  
-
557  
-parameter_map = {}
558  
-parameter_map[re.compile(r"\\validate")] = r"\\lib\\monodoc\\validate"
559  
-utils.substitute_parameters_in_file("monodoc/bin/mdvalidater.bat", parameter_map)
560  
-
561  
-parameter_map = {}
562  
-parameter_map[re.compile(r"\\mod")] = r"\\lib\\monodoc\\mod"
563  
-utils.substitute_parameters_in_file("monodoc/bin/mod.bat", parameter_map)
564  
-
565  
-parameter_map = {}
566  
-parameter_map[re.compile(r"\\monodocer")] = r"\\lib\\monodoc\\monodocer"
567  
-utils.substitute_parameters_in_file("monodoc/bin/monodocer.bat", parameter_map)
568  
-
569  
-parameter_map = {}
570  
-parameter_map[re.compile(r"\\monodocs2html")] = r"\\lib\\monodoc\\monodocs2html"
571  
-utils.substitute_parameters_in_file("monodoc/bin/monodocs2html.bat", parameter_map)
572  
-
573  
-parameter_map = {}
574  
-parameter_map[re.compile(r"\\monodocs2slashdoc")] = r"\\lib\\monodoc\\monodocs2slashdoc"
575  
-utils.substitute_parameters_in_file("monodoc/bin/monodocs2slashdoc.bat", parameter_map)
576  
-
577 542
 
578 543
 ## From mono-tools
579 544
 #parameter_map = {}
@@ -591,7 +556,7 @@ utils.substitute_parameters_in_file("monodoc/bin/monodocs2slashdoc.bat", paramet
591 556
 # Substitute the config file to point to the docs
592 557
 parameter_map = {}
593 558
 parameter_map[re.compile(r"/usr")] = r"@@WIN_MONO_INST_DIR@@"
594  
-utils.substitute_parameters_in_file("monodoc/lib/mono/gac/monodoc/1.0.0.0__0738eb9f132ed756/monodoc.dll.config", parameter_map)
  559
+utils.substitute_parameters_in_file("mono/lib/mono/gac/monodoc/1.0.0.0__0738eb9f132ed756/monodoc.dll.config", parameter_map)
595 560
 
596 561
 #
597 562
 ##############################################

0 notes on commit 794b41d

Please sign in to comment.
Something went wrong with that request. Please try again.