Mercurial > hg > easyhg
diff deploy/osx/deploy.sh @ 672:88fa1544b407
Merge from branch qt5. There's much more to be done before we can make another release, but clearly it's going to be done using qt5
author | Chris Cannam |
---|---|
date | Wed, 05 Dec 2018 09:44:10 +0000 |
parents | 8f3075eeaac2 |
children | 8121a6f9abca |
line wrap: on
line diff
--- a/deploy/osx/deploy.sh Wed Mar 23 14:49:49 2016 +0000 +++ b/deploy/osx/deploy.sh Wed Dec 05 09:44:10 2018 +0000 @@ -1,5 +1,7 @@ #!/bin/bash +set -e + # Execute this from the top-level directory of the project (the one # that contains the .app bundle). Supply the name of the .app bundle # as argument (the target will use $app.app regardless, but we need @@ -13,6 +15,8 @@ fi app=EasyMercurial +set -u + version=`perl -p -e 's/^[^"]*"([^"]*)".*$/$1/' src/version.h` case "$version" in [0-9].[0-9]) bundleVersion="$version".0 ;; @@ -21,6 +25,36 @@ esac echo +echo "Copying in frameworks and plugins from Qt installation directory." + +deploy/osx/copy-qt.sh "$app" || exit 2 + +echo +echo "Fixing up paths." + +deploy/osx/paths.sh "$app" + +echo +echo "Copying in qt.conf to set local-only plugin paths." +echo "Make sure all necessary Qt plugins are in $source/Contents/plugins/*" +echo "You probably want platforms/, accessible/ and imageformats/ subdirectories." +cp deploy/osx/qt.conf "$source"/Contents/Resources/qt.conf + +echo "Writing version $bundleVersion in to bundle." +echo "(This should be a three-part number: major.minor.point)" + +perl -p -e "s/EASYHG_VERSION/$bundleVersion/" deploy/osx/Info.plist \ + > "$source"/Contents/Info.plist + +echo "Done: check $source/Contents/Info.plist for sanity please" + +echo +echo "Copying in helper scripts" +cp easyhg-extdiff.sh "$source"/Contents/MacOS/ +cp easyhg-merge.sh "$source"/Contents/MacOS/ +chmod +x "$source"/Contents/MacOS/easyhg-extdiff.sh "$source"/Contents/MacOS/easyhg-merge.sh + +echo echo "Making target tree." volume="$app"-"$version" @@ -31,17 +65,11 @@ ln -s /Applications "$volume"/Applications cp COPYING "$volume/COPYING.txt" -cp -RPp "$source" "$target" +cp -rp "$source" "$target" echo "Done" -echo "Writing version $bundleVersion in to bundle." -echo "(This should be a three-part number: major.minor.point)" - -perl -p -e "s/EASYHG_VERSION/$bundleVersion/" deploy/osx/Info.plist \ - > "$target"/Contents/Info.plist - -echo "Done: check $target/Contents/Info.plist for sanity please" +deploy/osx/sign.sh "$volume" || exit 1 echo echo "Making dmg..."