mirror of
https://github.com/fish-shell/fish-shell.git
synced 2026-06-06 00:31:13 -03:00
build_tools/make_pkg: fixups for versioning and Xcode preferences
[ci skip]
This commit is contained in:
@@ -1,9 +1,13 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
VERSION=`sed -E -n 's/^.*PACKAGE_VERSION "([0-9.]+)"/\1/p' osx/config.h`
|
VERSION=`git describe --always --dirty 2>/dev/null`
|
||||||
if test -z "$VERSION" ; then
|
if test -z "$VERSION" ; then
|
||||||
echo "Could not get version from osx/config.h"
|
echo "Could not get version from git"
|
||||||
exit 1
|
VERSION=`sed -E -n 's/^.*PACKAGE_VERSION "([0-9a-z.\-]+)"/\1/p' osx/config.h`
|
||||||
|
if test -z "$VERSION"; then
|
||||||
|
echo "Could not get version from osx/config.h"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Version is $VERSION"
|
echo "Version is $VERSION"
|
||||||
@@ -20,11 +24,11 @@ mkdir -p /tmp/fish_pkg/root /tmp/fish_pkg/intermediates /tmp/fish_pkg/dst
|
|||||||
xcodebuild install -scheme install_tree -configuration Release DSTROOT=/tmp/fish_pkg/root/
|
xcodebuild install -scheme install_tree -configuration Release DSTROOT=/tmp/fish_pkg/root/
|
||||||
pkgbuild --scripts build_tools/osx_package_scripts --root /tmp/fish_pkg/root/ --identifier 'com.ridiculousfish.fish-shell-pkg' --version "$VERSION" /tmp/fish_pkg/intermediates/fish.pkg
|
pkgbuild --scripts build_tools/osx_package_scripts --root /tmp/fish_pkg/root/ --identifier 'com.ridiculousfish.fish-shell-pkg' --version "$VERSION" /tmp/fish_pkg/intermediates/fish.pkg
|
||||||
|
|
||||||
productbuild --package-path /tmp/fish_pkg/intermediates --distribution build_tools/osx_distribution.xml --resources build_tools/osx_package_resources/ ~/fish_built/fish.pkg
|
productbuild --package-path /tmp/fish_pkg/intermediates --distribution build_tools/osx_distribution.xml --resources build_tools/osx_package_resources/ ~/fish_built/fish-$VERSION.pkg
|
||||||
|
|
||||||
|
|
||||||
# Make the app
|
# Make the app
|
||||||
xcodebuild -scheme fish.app -configuration Release DSTROOT=/tmp/fish_app/
|
xcodebuild -scheme fish.app -configuration Release DSTROOT=/tmp/fish_app/ SYMROOT=DerivedData/fish/Build/Products
|
||||||
rm -f ~/fish_built/fish.app.zip
|
rm -f ~/fish_built/fish.app.zip
|
||||||
cd DerivedData/fish/Build/Products/Release/
|
cd DerivedData/fish/Build/Products/Release/
|
||||||
zip -r ~/fish_built/fish.app.zip fish.app
|
zip -r ~/fish_built/fish-$VERSION.app.zip fish.app
|
||||||
|
|||||||
Reference in New Issue
Block a user