MacOS installer: terminate build on intermediate failure

[ghc-hetmet.git] / distrib / MacOS / GHC.xcodeproj / project.pbxproj

diff --git a/distrib/MacOS/GHC.xcodeproj/project.pbxproj b/distrib/MacOS/GHC.xcodeproj/project.pbxproj
index 5501e10..3374bfa 100644 (file)
--- a/distrib/MacOS/GHC.xcodeproj/project.pbxproj
+++ b/distrib/MacOS/GHC.xcodeproj/project.pbxproj
@@ -15,8 +15,7 @@
                089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
                8D07F2C70486CC7A007CD1D0 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
                8D07F2C80486CC7A007CD1D0 /* GHC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GHC.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-               E72A15EE0D54ADB90059C234 /* GHC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GHC.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-               E72A15EF0D54ADB90059C234 /* Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info copy.plist"; sourceTree = "<group>"; };
+               E7D5AE720DF3CEE3001262D2 /* GHC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GHC.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXGroup section */
@@ -24,7 +23,7 @@
                        isa = PBXGroup;
                        children = (
                                8D07F2C80486CC7A007CD1D0 /* GHC.framework */,
-                               E72A15EE0D54ADB90059C234 /* GHC.framework */,
+                               E7D5AE720DF3CEE3001262D2 /* GHC.framework */,
                        );
                        name = Products;
                        sourceTree = "<group>";
@@ -52,7 +51,6 @@
                        children = (
                                8D07F2C70486CC7A007CD1D0 /* Info.plist */,
                                089C1666FE841158C02AAC07 /* InfoPlist.strings */,
-                               E72A15EF0D54ADB90059C234 /* Info copy.plist */,
                        );
                        name = Resources;
                        sourceTree = "<group>";
@@ -100,7 +98,7 @@
                        name = "GHC-systemwide";
                        productInstallPath = "$(HOME)/Library/Frameworks";
                        productName = GHC;
-                       productReference = E72A15EE0D54ADB90059C234 /* GHC.framework */;
+                       productReference = E7D5AE720DF3CEE3001262D2 /* GHC.framework */;
                        productType = "com.apple.product-type.framework";
                };
 /* End PBXNativeTarget section */
@@ -154,7 +152,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "# We need to be at the top of the ghc tree\ncd ../..\n\nPREFIX=${INSTALL_PATH}/${CONTENTS_FOLDER_PATH}/usr\n\nif [ ${ACTION} = build ]; then\n  # put explicit --prefix last, in case the extra configure args contain a prefix\n  ./configure \"${XCODE_EXTRA_CONFIGURE_ARGS}\" --prefix=${PREFIX}\n  MAKE_ACTION=\n  DOCS_ACTION=html\nelse\n  MAKE_ACTION=${ACTION}\n  DOCS_ACTION=install-docs\nfi\n\n# - Yes, it's the vanilla install target that must see HADDOCK_DOCS=YES, not the install-docs target.\n# - We must explictly force the creation of a symbol table in .a files on BSD, and not all versions of Cabal\n#   do that consistently; hence, the EXTRA_AR_ARGS.\nmake DESTDIR=${DSTROOT} HADDOCK_DOCS=YES EXTRA_AR_ARGS=-s ${MAKE_ACTION}\nmake DESTDIR=${DSTROOT} XMLDocWays=html ${DOCS_ACTION}";
+                       shellScript = "# We need to be at the top of the ghc tree\ncd ../..\n\nPREFIX=${INSTALL_PATH}/${CONTENTS_FOLDER_PATH}/usr\n\nif [ ${ACTION} = build ]; then\n  # put explicit --prefix last, in case the extra configure args contain a prefix\n  ./configure \"${XCODE_EXTRA_CONFIGURE_ARGS}\" --prefix=${PREFIX} || exit 1\n  MAKE_ACTION=\n  DOCS_ACTION=html\nelse\n  MAKE_ACTION=${ACTION}\n  DOCS_ACTION=install-docs\nfi\n\n# - Yes, it's the vanilla install target that must see HADDOCK_DOCS=YES, not the install-docs target.\n# - We must explictly force the creation of a symbol table in .a files on BSD, and not all versions of Cabal\n#   do that consistently; hence, the EXTRA_AR_ARGS.\nmake DESTDIR=${DSTROOT} HADDOCK_DOCS=YES EXTRA_AR_ARGS=-s ${MAKE_ACTION} || exit 1\nmake DESTDIR=${DSTROOT} XMLDocWays=html ${DOCS_ACTION} || exit 1";
                };
                E76B00450D52DFDB00A05A2F /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
@@ -253,29 +251,6 @@
                        };
                        name = Release;
                };
-               E72A15EC0D54ADB90059C234 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               FRAMEWORK_VERSION = A;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = GHC_Prefix.pch;
-                               INFOPLIST_FILE = "/Users/chak/Code/ghc/distrib/MacOS/Info copy.plist";
-                               INSTALL_PATH = "$(HOME)/Library/Frameworks";
-                               LIBRARY_STYLE = DYNAMIC;
-                               MACH_O_TYPE = mh_dylib;
-                               PRODUCT_NAME = GHC;
-                               WRAPPER_EXTENSION = framework;
-                               ZERO_LINK = YES;
-                       };
-                       name = Debug;
-               };
                E72A15ED0D54ADB90059C234 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
@@ -290,7 +265,7 @@
                                GCC_MODEL_TUNING = G5;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_PREFIX_HEADER = GHC_Prefix.pch;
-                               INFOPLIST_FILE = "/Users/chak/Code/ghc/distrib/MacOS/Info copy.plist";
+                               INFOPLIST_FILE = Info.plist;
                                INSTALL_PATH = /Library/Frameworks;
                                LIBRARY_STYLE = DYNAMIC;
                                MACH_O_TYPE = mh_dylib;
@@ -324,7 +299,6 @@
                E72A15EB0D54ADB90059C234 /* Build configuration list for PBXNativeTarget "GHC-systemwide" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
-                               E72A15EC0D54ADB90059C234 /* Debug */,
                                E72A15ED0D54ADB90059C234 /* Release */,
                        );
                        defaultConfigurationIsVisible = 0;