From 160cec311bcb566640023124a97ca1d5a1b61a0d Mon Sep 17 00:00:00 2001 From: Manuel M T Chakravarty Date: Thu, 7 Feb 2008 03:05:28 +0000 Subject: [PATCH] Fixed permissions and other cleanup in Mac installer package --- distrib/MacOS/GHC-system.pmdoc/01ghc-contents.xml | 1 - distrib/MacOS/GHC-system.pmdoc/01ghc.xml | 2 +- distrib/MacOS/GHC-system.pmdoc/index.xml | 4 +-- distrib/MacOS/Makefile | 37 ++++++++++++++++++--- distrib/MacOS/installer-scripts/Uninstaller | 3 +- 5 files changed, 37 insertions(+), 10 deletions(-) delete mode 100644 distrib/MacOS/GHC-system.pmdoc/01ghc-contents.xml diff --git a/distrib/MacOS/GHC-system.pmdoc/01ghc-contents.xml b/distrib/MacOS/GHC-system.pmdoc/01ghc-contents.xml deleted file mode 100644 index fb3ad84..0000000 --- a/distrib/MacOS/GHC-system.pmdoc/01ghc-contents.xml +++ /dev/null @@ -1 +0,0 @@ -modemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemode \ No newline at end of file diff --git a/distrib/MacOS/GHC-system.pmdoc/01ghc.xml b/distrib/MacOS/GHC-system.pmdoc/01ghc.xml index 2509a6b..f313f78 100644 --- a/distrib/MacOS/GHC-system.pmdoc/01ghc.xml +++ b/distrib/MacOS/GHC-system.pmdoc/01ghc.xml @@ -1 +1 @@ -org.haskell.glasgowHaskellCompiler.ghc.pkg1/tmp/GHC.dst/Library/Frameworks/GHC.framework/Library/FrameworksallowRevertscripts.scriptsDirectoryPath.isRelativeTypescripts.postinstall.isRelativeTypeinstallTo.isRelativeTypescripts.postinstall.isAbsoluteTypeinstallFrom.isAbsoluteTypeparentscripts.postinstall.pathrequireAuthorizationrelocatableinstallFrom.isRelativeTypeinstallFrom.pathinstallToinstaller-scripts/create-linksinstaller-scripts01ghc-contents.xmlisDowngradeable/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +org.haskell.glasgowHaskellCompiler.ghc.pkg1/tmp/GHC.dst/Library/Frameworks/GHC.framework/Library/FrameworksallowRevertscripts.scriptsDirectoryPath.isRelativeTypescripts.postinstall.isRelativeTypeinstallTo.isRelativeTypescripts.postinstall.isAbsoluteTypeinstallFrom.isAbsoluteTypeincludeRootparentscripts.postinstall.pathrequireAuthorizationrelocatableinstallFrom.isRelativeTypeinstallFrom.pathinstallToinstaller-scripts/create-linksinstaller-scripts01ghc-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file diff --git a/distrib/MacOS/GHC-system.pmdoc/index.xml b/distrib/MacOS/GHC-system.pmdoc/index.xml index 7936bd0..65e8544 100644 --- a/distrib/MacOS/GHC-system.pmdoc/index.xml +++ b/distrib/MacOS/GHC-system.pmdoc/index.xml @@ -1,4 +1,4 @@ -Glasgow Haskell Compiler/Users/chak/Desktop/Glasgow Haskell Compiler.pkgorg.haskellThe Glasgow Haskell Compiler (GHC) is a state-of-the-art, open source, compiler and interactive environment for the functional language Haskell. GHC supports the entire Haskell 98 language plus a wide variety of extensions. GHC generates fast code, is available on a range of platforms, and includes an extensive set of libraries. For more information, please consult <http://haskell.org/ghc>.lambda-logo.png../../LICENSEGlasgow Haskell Compiler/Users/chak/Desktop/Glasgow Haskell Compiler.pkgorg.haskellThe Glasgow Haskell Compiler (GHC) is a state-of-the-art, open source, compiler and interactive environment for the functional language Haskell. GHC supports the entire Haskell 98 language plus a wide variety of extensions. GHC generates fast code, is available on a range of platforms, and includes an extensive set of libraries. For more information, please consult <http://haskell.org/ghc>.lambda-logo.png../../LICENSE01ghc.xml02uninstaller.xmlproperties.userDomainproperties.titledescriptionproperties.systemDomainproperties.anywhereDomain \ No newline at end of file + /Library/Frameworks/GHC.framework/Tools/Uninstaller}]]>01ghc.xmlproperties.userDomainproperties.titledescriptionproperties.systemDomainproperties.anywhereDomain \ No newline at end of file diff --git a/distrib/MacOS/Makefile b/distrib/MacOS/Makefile index cd82e14..7f4698a 100644 --- a/distrib/MacOS/Makefile +++ b/distrib/MacOS/Makefile @@ -31,14 +31,39 @@ CURRENT_PROJECT_VERSION = $(ProjectVersionInt).$(ProjectPatchLevel) # version number. SHORT_VERSION_STRING = $(ProjectVersion) +# Name of the installer package +PACKAGE_NAME = GHC-$(ProjectVersion)-$(TargetArch_CPP).pkg + +# Xcode's installation build product location (this is where the GHC.framework +# is assembled) +DSTROOT=/tmp/GHC.dst + +# Tools directory for a system volume install +TOOLS_SYSTEM=$(DSTROOT)/Library/Frameworks/GHC.framework/Tools + +PACKAGEMAKER=/Developer/usr/bin/packagemaker + +# Build and package GHC.framework for /Library/Frameworks +# +# * Be careful to clean out Xcode's build product location first, as Xcode +# sets permissions such that a second install on top of an existing one +# fails +# * Make there are no contents component descriptions in the .pmdoc. These are +# created by the PackageMaker GUI and have per default the wrong ownership +# and permissions for all files (as well as prevent correct setting of those +# for files that are not in the content list). framework-pkg: - xcodebuild -target GHC-systemwide install\ + -chmod -R u+w $(DSTROOT) + -$(RM) -rf $(DSTROOT) + mkdir -p $(TOOLS_SYSTEM) + cp installer-scripts/Uninstaller $(TOOLS_SYSTEM) + xcodebuild -target GHC-systemwide clean install\ CURRENT_PROJECT_VERSION=$(CURRENT_PROJECT_VERSION)\ SHORT_VERSION_STRING=$(SHORT_VERSION_STRING)\ FRAMEWORK_VERSION=$(FRAMEWORK_VERSION)\ CURRENT_LIBRARY_VERSION=$(FRAMEWORK_VERSION) - @echo "FIXME: What about the contents list?!?"; exit 1 - @echo "FIXME: call the packager"; exit 1 + -$(RM) -f GHC-system.pmdoc/*-contents.xml + $(PACKAGEMAKER) -v --doc GHC-system.pmdoc -o $(TOP)/$(PACKAGE_NAME) # Instead of making 'binary-dist' a Makefile dependency, we let xcodebuild call # 'make binary-dist'. This has the advantage that xcode knows the framework @@ -47,9 +72,13 @@ framework-pkg: # tree yet another time. # framework-binary-dist: - xcodebuild -target GHC-relocatable build\ + xcodebuild -target GHC-relocatable clean build\ CURRENT_PROJECT_VERSION=$(CURRENT_PROJECT_VERSION)\ SHORT_VERSION_STRING=$(SHORT_VERSION_STRING)\ FRAMEWORK_VERSION=$(FRAMEWORK_VERSION)\ CURRENT_LIBRARY_VERSION=$(FRAMEWORK_VERSION) @echo "FIXME: call the packager"; exit 1 + # FIXME: The approach with the binary-dist in the package has the + # problem that the BOM is wrong and the installer relocation feature + # isn't sufficient as the layout in the binary-dist and the installed + # tree is different diff --git a/distrib/MacOS/installer-scripts/Uninstaller b/distrib/MacOS/installer-scripts/Uninstaller index 6ad00d3..de4141b 100644 --- a/distrib/MacOS/installer-scripts/Uninstaller +++ b/distrib/MacOS/installer-scripts/Uninstaller @@ -55,8 +55,7 @@ done echo "Removing ${INSTALL_DEST}/GHC.framework" rm -rf ${INSTALL_DEST}/GHC.framework -echo "Removing package recipts" +echo "Removing package recipt" rm -f /Library/Receipts/boms/org.haskell.glasgowHaskellCompiler.ghc.pkg.bom -rm -f /Library/Receipts/boms/org.haskell.glasgowHaskellCompiler.uninstaller.pkg echo "${INSTALL_DEST}/GHC.framework has been purged!" -- 1.7.10.4