Commit 5db43861 authored by chak@cse.unsw.edu.au.'s avatar chak@cse.unsw.edu.au.
Browse files

MacOS installer: terminate build on intermediate failure

parent bc5b8fb6
......@@ -152,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;
......
......@@ -82,7 +82,12 @@ framework-pkg:
-$(RM) -rf $(DSTROOT)
mkdir -p $(TOOLS_SYSTEM)
cp installer-scripts/Uninstaller $(TOOLS_SYSTEM)
xcodebuild -target GHC-systemwide clean build install\
xcodebuild -target GHC-systemwide clean build\
CURRENT_PROJECT_VERSION=$(CURRENT_PROJECT_VERSION)\
SHORT_VERSION_STRING=$(SHORT_VERSION_STRING)\
FRAMEWORK_VERSION=$(FRAMEWORK_VERSION)\
CURRENT_LIBRARY_VERSION=$(FRAMEWORK_VERSION)
xcodebuild -target GHC-systemwide install\
CURRENT_PROJECT_VERSION=$(CURRENT_PROJECT_VERSION)\
SHORT_VERSION_STRING=$(SHORT_VERSION_STRING)\
FRAMEWORK_VERSION=$(FRAMEWORK_VERSION)\
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment