Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
Wade Berrier authored
View
72 linux-installer/buildlinux-installer
@@ -40,12 +40,12 @@ external_rpms_list = """
ftp://ftp.suse.com/pub/suse/discontinued/i386/9.1/suse/i586/libexif-0.5.12-118.i586.rpm
""".split()
-# What's gal2 for?
- #http://suse.mirrors.tds.net/pub/opensuse/distribution/SL-10.0-OSS/inst-source/suse/i586/gal2-2.5.3-5.i586.rpm
-custom_rpms_list = """
- http://suse.mirrors.tds.net/pub/opensuse/distribution/SL-10.1/inst-source/suse/i586/gtkhtml2-3.10.0-15.i586.rpm
- http://suse.mirrors.tds.net/pub/opensuse/distribution/SL-10.1/inst-source/suse/i586/gtksourceview-1.5.6-18.i586.rpm
-""".split()
+## What's gal2 for?
+# #http://suse.mirrors.tds.net/pub/opensuse/distribution/SL-10.0-OSS/inst-source/suse/i586/gal2-2.5.3-5.i586.rpm
+#custom_rpms_list = """
+# http://suse.mirrors.tds.net/pub/opensuse/distribution/SL-10.1/inst-source/suse/i586/gtkhtml2-3.10.0-15.i586.rpm
+# http://suse.mirrors.tds.net/pub/opensuse/distribution/SL-10.1/inst-source/suse/i586/gtksourceview-1.5.6-18.i586.rpm
+#""".split()
# rpm locations we build locally
local_rpms = {
@@ -64,18 +64,19 @@ local_rpms = {
"mono-basic",
],
- 'suse-101-i586': [
- "gluezilla",
- "gtk-sharp28",
- "mono-tools",
- "mono-addins",
- "monodevelop",
- "monodevelop-boo",
- "monodevelop-database",
- "monodevelop-java",
- "gecko-sharp2",
- "gtksourceview-sharp2",
- ],
+# 'sles-10-i586': [
+# "gluezilla",
+# "gtk-sharp28",
+# "mono-tools",
+# "mono-addins",
+# "monodevelop",
+# "monodevelop-boo",
+# "monodevelop-database",
+# "monodevelop-java",
+# "gecko-sharp",
+# "gecko-sharp2",
+# "gtksourceview-sharp2",
+# ],
}
prefix = os.getcwd()
@@ -168,7 +169,8 @@ cwd = os.getcwd()
if not os.path.exists(external_rpms):
os.mkdir(external_rpms)
-for url in external_rpms_list + custom_rpms_list:
+#for url in external_rpms_list + custom_rpms_list:
+for url in external_rpms_list:
utils.get_url(url, external_rpms)
files.append(external_rpms + os.sep + os.path.basename(url))
@@ -197,9 +199,10 @@ p = buildroot
os.chdir(p)
-## Move files under usr instead of using opt
-distutils.dir_util.copy_tree("opt/gnome", "usr", preserve_symlinks=1)
-shutil.rmtree('opt')
+# This is only when we're shipping gtk# and friends
+### Move files under usr instead of using opt
+#distutils.dir_util.copy_tree("opt/gnome", "usr", preserve_symlinks=1)
+#shutil.rmtree('opt')
# Move etc under usr since we will collect all files under usr for installer
os.rename("etc", "usr/etc")
@@ -243,18 +246,19 @@ for f in executable_wrappers:
else:
print "***Not found %s/usr/bin/%s***" % (p, f)
-# Fix wrappers that have .desktop entries so that the user doesn't need to reload their environment in order to load the apps
-# TODO: These may need to be updated as these wrappers change
-for f in ['monodoc', 'monodevelop']:
- utils.substitute_parameters_in_file(p + "/usr/bin/" + f,
- { '#! ?/bin/sh' :
-"""#!/bin/sh
-
-# Added by Mono Bitrock installer
-. @@BITROCK_MONO_ROOTDIR@@/bin/setup.sh
-"""
- }
- )
+# Don't substitute these anymore because we don't ship md and mono-tools
+## Fix wrappers that have .desktop entries so that the user doesn't need to reload their environment in order to load the apps
+## TODO: These may need to be updated as these wrappers change
+#for f in ['monodoc', 'monodevelop']:
+# utils.substitute_parameters_in_file(p + "/usr/bin/" + f,
+# { '#! ?/bin/sh' :
+#"""#!/bin/sh
+#
+## Added by Mono Bitrock installer
+#. @@BITROCK_MONO_ROOTDIR@@/bin/setup.sh
+#"""
+# }
+# )
# This glob should only return one file...
View
15 linux-installer/projects/Readme.txt
@@ -1,14 +1,6 @@
Visit http://mono-project.com/Downloads for release details.
-Please file any bugs or issues at http://bugzilla.ximian.com
-
-Warning: gtk-sharp apps (Monodoc, MonoDevelop, etc...)
- may not work on all distros. This is due to differing
- gtk+ versions. Also, if you want to run MonoDevelop,
- you must have the Gnome libraries installed. During the
- installation, bin/.installer_post_libscan was run to try
- to find any libraries with unresolved symbols. This should
- help locate missing libraries.
+Please file any bugs or issues at http://bugzilla.novell.com
Note: If you selected to have your environment modified by
the installer, you will need to restart your shell for
@@ -25,6 +17,11 @@ source <install dir>/bin/setup.sh
Installer changes:
+1.9.2:
+- Remove MonoDevelop from installer (it will be reinstated
+ when we ship our own gtk+ in order to reliably run on
+ several distros)
+
1.9.1-3:
- Resctrict installation target to user's home dir and
/opt/mono for root. This way it won't override the
View
2  linux-installer/projects/mono.xml
@@ -77,6 +77,7 @@
<path>${installdir}</path>
<platforms>linux</platforms>
</shortcut>
+ <!--
<shortcut>
<comment>Mono Develop</comment>
<exec>${installdir}/bin/monodevelop</exec>
@@ -93,6 +94,7 @@
<path>${installdir}/bin</path>
<platforms>linux</platforms>
</shortcut>
+ -->
<shortcut>
<comment>Mono @@VERSION@@ Terminal</comment>
<exec>/bin/bash --init-file ${installdir}/bin/setup.sh</exec>
View
4 linux-installer/projects/post_install
@@ -45,8 +45,8 @@ done
if test "x$collective" == "x" ; then
echo "Congratulations! You should "
- echo " have no problems running winforms,"
- echo " gtk#, and gecko# apps."
+ echo " have no problems running winforms."
+ #echo " gtk#, and gecko# apps."
else
collective=$(echo "$collective" | sort | uniq)
View
5 packaging/defs/mono
@@ -513,13 +513,13 @@ POSTBUILD_TEST28 () {
POSTBUILD_TEST_NAME29="test-System_Data_OracleClient-1.0"
POSTBUILD_TEST29 () {
cd mcs/class/System.Data.OracleClient
- $make_path run-test || true
+ $make_path run-test
}
POSTBUILD_TEST_NAME30="test-System_Data_OracleClient-2.0"
POSTBUILD_TEST30 () {
cd mcs/class/System.Data.OracleClient
- $make_path run-test PROFILE=net_2_0 || true
+ $make_path run-test PROFILE=net_2_0
}
POSTBUILD_TEST_NAME31="test-System_Design-1.0"
@@ -956,3 +956,4 @@ CLEAN_UP () {
}
+
View
2  release_process.README
@@ -4,4 +4,6 @@ http://www.mono-project.com/BuildSystem/MonoBuild
http://www.mono-project.com/BuildSystem/MonoBuild/DetailedDocs
http://www.mono-project.com/BuildSystem/ReleaseProcess
+# For download stat notes
+http://mono-project.com/DownloadStats
View
2  windows-installer/buildwindows-installer
@@ -161,7 +161,7 @@ selections += [ Selection('monodoc', packages = "monodoc mono-tools".split() ) ]
# TODO: Also, why am I distributing gnome?.... ? adds some to gtk-sharp 1.0.10
# monodoc browser needs gconf-sharp, which depends on gnome-sharp...
# So, until the GRE for gecko-sharp gets easier to distribute, including gnome is how it is
-selections += [ Selection('gecko-sharp', packages = "gecko-sharp gecko-sharp2".split() ) ]
+selections += [ Selection('gecko-sharp', packages = "gecko-sharp2".split() ) ]
# Hmm... needs to be a better way to package up these samples...
selections += [ Selection('samples', urls = """
Please sign in to comment.
Something went wrong with that request. Please try again.