From eaefed434da2ccc007e289a1a630e0272ba44814 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Fri, 25 Jan 2019 16:45:06 -0800 Subject: [PATCH] make_pkg.sh to build with CMake instead of Xcode --- build_tools/make_pkg.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build_tools/make_pkg.sh b/build_tools/make_pkg.sh index 84888321c..53a20dd21 100755 --- a/build_tools/make_pkg.sh +++ b/build_tools/make_pkg.sh @@ -23,10 +23,11 @@ set -e PKGDIR=`mktemp -d` +SRC_DIR=$PWD OUTPUT_PATH=${FISH_ARTEFACT_PATH:-~/fish_built} -mkdir -p $PKGDIR/root $PKGDIR/intermediates $PKGDIR/dst -xcodebuild install -scheme install_tree -configuration Release DSTROOT=$PKGDIR/root/ +mkdir -p $PKGDIR/build $PKGDIR/root $PKGDIR/intermediates $PKGDIR/dst +( cd "$PKGDIR/build" && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo "$SRC_DIR" && make -j 4 && env DESTDIR=$PKGDIR/root/ make install ) pkgbuild --scripts build_tools/osx_package_scripts --root $PKGDIR/root/ --identifier 'com.ridiculousfish.fish-shell-pkg' --version "$VERSION" $PKGDIR/intermediates/fish.pkg productbuild --package-path $PKGDIR/intermediates --distribution build_tools/osx_distribution.xml --resources build_tools/osx_package_resources/ $OUTPUT_PATH/fish-$VERSION.pkg