diff options
| author |  jan Iversen <jani@libreoffice.org> | 2018-05-08 18:31:33 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-05-10 20:43:22 -0700 |
| commit | 1d5d7d0c471a7743d1d76b2952a2a396167e2bb2 (patch) | |
| tree | e1c1f032f60ce5472b2003c230e5b55a5bf1acb8 /packaging | |
| parent | 6019688b98979c04c162b06326f970e24e7e8525 (diff) | |
| download | subsurface-1d5d7d0c471a7743d1d76b2952a2a396167e2bb2.tar.gz | |
iOS: cleaned/bumped versions
Made versioning identical to scripts/build.sh
Having the same version of 3rd party libraries across platforms
secures a more stable product.
Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/ios/build.sh | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh index 2e1579759..4f926da4c 100755 --- a/packaging/ios/build.sh +++ b/packaging/ios/build.sh @@ -45,28 +45,10 @@ fi # Which versions are we building against? LIBXSLT_VERSION=1.1.28 -LIBZIP_VERSION=0.11.2 -LIBGIT2_VERSION=0.26.0 - -# not on iOS so far, but kept here for completeness -LIBUSB_VERSION=1.0.19 -LIBFTDI_VERSION=1.2 - -# NOTE: NOT IDENTICAL TO OTHER PLATFORMS -# in order not to make "technical version" bumps -# script/build.sh contains: -# -# CURRENT_LIBZIP="1.2.0" (very different) -# CURRENT_HIDAPI="hidapi-0.7.0" (not used) -# CURRENT_LIBCURL="curl-7_54_1" (not used) -# CURRENT_LIBUSB="v1.0.21" (different but not used) -# CURRENT_OPENSSL="OpenSSL_1_1_0f" (not used) -# CURRENT_LIBSSH2="libssh2-1.8.0" (not used) -# CURRENT_LIBGIT2="v0.26.0" (different, remark the v, which is the branch name) -# -# LIBXSLT are only used on this platform -# - +LIBZIP_VERSION=1.2.0 +LIBGIT2_VERSION=v0.26.0 +# remark LIBXSLT are only used on this platform +# due to Apple not publizing the version included in iOS # set up the Subsurface versions by hand GITVERSION=$(git describe --abbrev=12) @@ -189,7 +171,7 @@ echo next building for $ARCH fi pushd libgit2 git fetch origin - if ! git checkout v$LIBGIT2_VERSION ; then + if ! git checkout $LIBGIT2_VERSION ; then echo "Can't find the right tag in libgit2 - giving up" exit 1 fi |