From: Alexander Köplinger Date: Tue, 16 May 2017 22:27:43 +0000 (+0200) Subject: [MacSDK] Remove some outdated info from ReadMe.rtf X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=0ed7b3647aa196f0d453ae19c3605c503c83e6f9;p=mono.git [MacSDK] Remove some outdated info from ReadMe.rtf uninstallMono.sh is no longer installed. The website has instructions for removing Mono: http://www.mono-project.com/docs/about-mono/supported-platforms/osx/#uninstalling-mono-on-mac-os-x --- diff --git a/packaging/MacSDK/packaging/resources/ReadMe.rtf b/packaging/MacSDK/packaging/resources/ReadMe.rtf index 704571f4137..8a3c6afc363 100644 --- a/packaging/MacSDK/packaging/resources/ReadMe.rtf +++ b/packaging/MacSDK/packaging/resources/ReadMe.rtf @@ -10,22 +10,19 @@ \ This is the Mono Runtime and Development Platform (http://www.mono-project.com/).\ \ -This package installs Mono and all of its dependencies inside of /Library/Frameworks/Mono.framework. This behavior is likely to change with a future release so that dependancies will get their own frameworks.\ +This package installs Mono and all of its dependencies inside of /Library/Frameworks/Mono.framework.\ \ The following components are included inside Mono.framework:\ @@PACKAGES@@\ \ Other packages used to build Mono.framework:\ @@DEP_PACKAGES@@\ -If you want to build native Mac applications with Mono, you can use the MonoMac bindings, an add-on to this product available from http://www.mono-project.com/MonoMac\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \cf0 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 \cf0 \ \ -A simple uninstallMono.sh script is included in the disk image. This is shell script that must be run as root, and it will remove the Mono.framework and the links in /usr/bin.\ -\ This package was created by the Mono team. Major contributors to this team include (in alphabetical order): \ \ Wade Berrier\ @@ -37,5 +34,5 @@ Andy Satori\ \ Questions or problems related directly to the Mono.framework should be addressed to mono-osx@lists.xamarin.com.\ \ -Questions about Mono should be directed to an appropriate resource that can be found on http://www.mono-project.com/about. \ +Questions about Mono should be directed to an appropriate resource that can be found on http://www.mono-project.com/docs/about-mono/. \ } \ No newline at end of file diff --git a/packaging/MacSDK/packaging/uninstallMono.sh b/packaging/MacSDK/packaging/uninstallMono.sh deleted file mode 100755 index 9e88ad1a8bc..00000000000 --- a/packaging/MacSDK/packaging/uninstallMono.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -x - -#This script removes Mono from an OS X System. It must be run as root - -rm -r /Library/Frameworks/Mono.framework - -# In 10.6+ the receipts are stored here -rm /var/db/receipts/com.ximian.mono* - -for dir in /usr/local/bin; do - (cd ${dir}; - for i in `ls -al | grep /Library/Frameworks/Mono.framework/ | awk '{print $9}'`; do - rm ${i} - done); -done diff --git a/packaging/MacSDK/profile.py b/packaging/MacSDK/profile.py index 270b70d0254..9b504614ac0 100755 --- a/packaging/MacSDK/profile.py +++ b/packaging/MacSDK/profile.py @@ -136,14 +136,12 @@ class MonoReleaseProfile(DarwinProfile): self.verify_binaries() working = self.setup_working_dir() - uninstall_script = os.path.join(working, "uninstallMono.sh") # make the MDK self.apply_blacklist(working, 'mdk_blacklist.sh') self.make_updateinfo(working, self.MDK_GUID) mdk_pkg = self.run_pkgbuild(working, "MDK") title(mdk_pkg) - # self.make_dmg(mdk_dmg, title, mdk_pkg, uninstall_script) shutil.rmtree(working) @@ -174,7 +172,6 @@ class MonoReleaseProfile(DarwinProfile): # creates and returns the path to a working directory containing: # PKGROOT/ - this root will be bundled into the .pkg and extracted at / - # uninstallMono.sh - copied onto the DMG # Info{_sdk}.plist - used by packagemaker to make the installer # resources/ - other resources used by packagemaker for the installer def setup_working_dir(self):