Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

mono:

don't disable oracle tests, Gert said he'd take care of it

buildwindows-installer:
-remove gecko since it was removed

linux-installer:
-remove monodevelop
-update release notes



svn path=/trunk/release/; revision=107014
  • Loading branch information...
commit 76efd2e0a0947aa6e8435d18368b44d467798545 1 parent a58e440
authored July 01, 2008
72  linux-installer/buildlinux-installer
@@ -40,12 +40,12 @@ external_rpms_list = """
40 40
 	ftp://ftp.suse.com/pub/suse/discontinued/i386/9.1/suse/i586/libexif-0.5.12-118.i586.rpm
41 41
 """.split()
42 42
 
43  
-# What's gal2 for?
44  
-	#http://suse.mirrors.tds.net/pub/opensuse/distribution/SL-10.0-OSS/inst-source/suse/i586/gal2-2.5.3-5.i586.rpm
45  
-custom_rpms_list = """
46  
-	http://suse.mirrors.tds.net/pub/opensuse/distribution/SL-10.1/inst-source/suse/i586/gtkhtml2-3.10.0-15.i586.rpm
47  
-	http://suse.mirrors.tds.net/pub/opensuse/distribution/SL-10.1/inst-source/suse/i586/gtksourceview-1.5.6-18.i586.rpm
48  
-""".split()
  43
+## What's gal2 for?
  44
+#	#http://suse.mirrors.tds.net/pub/opensuse/distribution/SL-10.0-OSS/inst-source/suse/i586/gal2-2.5.3-5.i586.rpm
  45
+#custom_rpms_list = """
  46
+#	http://suse.mirrors.tds.net/pub/opensuse/distribution/SL-10.1/inst-source/suse/i586/gtkhtml2-3.10.0-15.i586.rpm
  47
+#	http://suse.mirrors.tds.net/pub/opensuse/distribution/SL-10.1/inst-source/suse/i586/gtksourceview-1.5.6-18.i586.rpm
  48
+#""".split()
49 49
 
50 50
 # rpm locations we build locally
51 51
 local_rpms = { 
@@ -64,18 +64,19 @@ local_rpms = {
64 64
 		"mono-basic",
65 65
 
66 66
 		],
67  
-	'suse-101-i586': [
68  
-		"gluezilla",
69  
-		"gtk-sharp28",
70  
-                "mono-tools",
71  
-                "mono-addins",
72  
-                "monodevelop",
73  
-                "monodevelop-boo",
74  
-                "monodevelop-database",
75  
-                "monodevelop-java",
76  
-                "gecko-sharp2",
77  
-                "gtksourceview-sharp2",
78  
-		],
  67
+#	'sles-10-i586': [
  68
+#		"gluezilla",
  69
+#		"gtk-sharp28",
  70
+#		"mono-tools",
  71
+#		"mono-addins",
  72
+#		"monodevelop",
  73
+#		"monodevelop-boo",
  74
+#		"monodevelop-database",
  75
+#		"monodevelop-java",
  76
+#		"gecko-sharp",
  77
+#		"gecko-sharp2",
  78
+#		"gtksourceview-sharp2",
  79
+#		],
79 80
 }
80 81
 
81 82
 prefix = os.getcwd()
@@ -168,7 +169,8 @@ cwd = os.getcwd()
168 169
 if not os.path.exists(external_rpms):
169 170
 	os.mkdir(external_rpms)
170 171
 
171  
-for url in external_rpms_list + custom_rpms_list:
  172
+#for url in external_rpms_list + custom_rpms_list:
  173
+for url in external_rpms_list:
172 174
 	utils.get_url(url, external_rpms)
173 175
 	files.append(external_rpms + os.sep + os.path.basename(url))
174 176
 
@@ -197,9 +199,10 @@ p = buildroot
197 199
 
198 200
 os.chdir(p)
199 201
 
200  
-## Move files under usr instead of using opt
201  
-distutils.dir_util.copy_tree("opt/gnome", "usr", preserve_symlinks=1)
202  
-shutil.rmtree('opt')
  202
+# This is only when we're shipping gtk# and friends
  203
+### Move files under usr instead of using opt
  204
+#distutils.dir_util.copy_tree("opt/gnome", "usr", preserve_symlinks=1)
  205
+#shutil.rmtree('opt')
203 206
 
204 207
 # Move etc under usr since we will collect all files under usr for installer
205 208
 os.rename("etc", "usr/etc")
@@ -243,18 +246,19 @@ for f in executable_wrappers:
243 246
 	else:
244 247
 		print "***Not found %s/usr/bin/%s***" % (p, f)
245 248
 
246  
-# Fix wrappers that have .desktop entries so that the user doesn't need to reload their environment in order to load the apps
247  
-# TODO: These may need to be updated as these wrappers change
248  
-for f in ['monodoc', 'monodevelop']:
249  
-	utils.substitute_parameters_in_file(p + "/usr/bin/" + f,
250  
-		{ '#! ?/bin/sh'	:
251  
-"""#!/bin/sh
252  
-
253  
-# Added by Mono Bitrock installer
254  
-. @@BITROCK_MONO_ROOTDIR@@/bin/setup.sh
255  
-"""
256  
-		}
257  
-	)
  249
+# Don't substitute these anymore because we don't ship md and mono-tools
  250
+## Fix wrappers that have .desktop entries so that the user doesn't need to reload their environment in order to load the apps
  251
+## TODO: These may need to be updated as these wrappers change
  252
+#for f in ['monodoc', 'monodevelop']:
  253
+#	utils.substitute_parameters_in_file(p + "/usr/bin/" + f,
  254
+#		{ '#! ?/bin/sh'	:
  255
+#"""#!/bin/sh
  256
+#
  257
+## Added by Mono Bitrock installer
  258
+#. @@BITROCK_MONO_ROOTDIR@@/bin/setup.sh
  259
+#"""
  260
+#		}
  261
+#	)
258 262
 
259 263
 
260 264
 # This glob should only return one file...
15  linux-installer/projects/Readme.txt
... ...
@@ -1,14 +1,6 @@
1 1
 Visit http://mono-project.com/Downloads for release details.
2 2
 
3  
-Please file any bugs or issues at http://bugzilla.ximian.com
4  
-
5  
-Warning: gtk-sharp apps (Monodoc, MonoDevelop, etc...)
6  
-  may not work on all distros.  This is due to differing
7  
-  gtk+ versions.  Also, if you want to run MonoDevelop,
8  
-  you must have the Gnome libraries installed.  During the
9  
-  installation, bin/.installer_post_libscan was run to try
10  
-  to find any libraries with unresolved symbols.  This should
11  
-  help locate missing libraries.
  3
+Please file any bugs or issues at http://bugzilla.novell.com
12 4
 
13 5
 Note: If you selected to have your environment modified by
14 6
   the installer, you will need to restart your shell for
@@ -25,6 +17,11 @@ source <install dir>/bin/setup.sh
25 17
 
26 18
 Installer changes:
27 19
 
  20
+1.9.2:
  21
+- Remove MonoDevelop from installer (it will be reinstated
  22
+  when we ship our own gtk+ in order to reliably run on
  23
+  several distros)
  24
+
28 25
 1.9.1-3:
29 26
 - Resctrict installation target to user's home dir and
30 27
   /opt/mono for root.  This way it won't override the
2  linux-installer/projects/mono.xml
@@ -77,6 +77,7 @@
77 77
              <path>${installdir}</path>
78 78
              <platforms>linux</platforms>
79 79
            </shortcut>
  80
+           <!--
80 81
            <shortcut>
81 82
              <comment>Mono Develop</comment>
82 83
              <exec>${installdir}/bin/monodevelop</exec>
@@ -93,6 +94,7 @@
93 94
              <path>${installdir}/bin</path>
94 95
              <platforms>linux</platforms>
95 96
            </shortcut>
  97
+           -->
96 98
            <shortcut>
97 99
              <comment>Mono @@VERSION@@ Terminal</comment>
98 100
              <exec>/bin/bash --init-file ${installdir}/bin/setup.sh</exec>
4  linux-installer/projects/post_install
@@ -45,8 +45,8 @@ done
45 45
 
46 46
 if test "x$collective" == "x" ; then
47 47
 	echo "Congratulations!  You should "
48  
-	echo " have no problems running winforms,"
49  
-	echo " gtk#, and gecko# apps."
  48
+	echo " have no problems running winforms."
  49
+	#echo " gtk#, and gecko# apps."
50 50
 else
51 51
 
52 52
 	collective=$(echo "$collective" | sort | uniq)
5  packaging/defs/mono
@@ -513,13 +513,13 @@ POSTBUILD_TEST28 () {
513 513
 POSTBUILD_TEST_NAME29="test-System_Data_OracleClient-1.0"
514 514
 POSTBUILD_TEST29 () {
515 515
 	cd mcs/class/System.Data.OracleClient
516  
-	$make_path run-test || true
  516
+	$make_path run-test
517 517
 }
518 518
 
519 519
 POSTBUILD_TEST_NAME30="test-System_Data_OracleClient-2.0"
520 520
 POSTBUILD_TEST30 () {
521 521
 	cd mcs/class/System.Data.OracleClient
522  
-	$make_path run-test PROFILE=net_2_0 || true
  522
+	$make_path run-test PROFILE=net_2_0
523 523
 }
524 524
 
525 525
 POSTBUILD_TEST_NAME31="test-System_Design-1.0"
@@ -956,3 +956,4 @@ CLEAN_UP () {
956 956
 }
957 957
 
958 958
 
  959
+
2  release_process.README
@@ -4,4 +4,6 @@ http://www.mono-project.com/BuildSystem/MonoBuild
4 4
 http://www.mono-project.com/BuildSystem/MonoBuild/DetailedDocs
5 5
 http://www.mono-project.com/BuildSystem/ReleaseProcess
6 6
 
  7
+# For download stat notes
  8
+http://mono-project.com/DownloadStats
7 9
 
2  windows-installer/buildwindows-installer
@@ -161,7 +161,7 @@ selections += [ Selection('monodoc', packages = "monodoc mono-tools".split() ) ]
161 161
 # TODO: Also, why am I distributing gnome?.... ? adds some to gtk-sharp 1.0.10
162 162
 #   monodoc browser needs gconf-sharp, which depends on gnome-sharp...
163 163
 #  So, until the GRE for gecko-sharp gets easier to distribute, including gnome is how it is
164  
-selections += [ Selection('gecko-sharp', packages = "gecko-sharp gecko-sharp2".split() ) ]
  164
+selections += [ Selection('gecko-sharp', packages = "gecko-sharp2".split() ) ]
165 165
 
166 166
 # Hmm... needs to be a better way to package up these samples...
167 167
 selections += [ Selection('samples', urls = """

0 notes on commit 76efd2e

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