Merge branch 'feature/bundle-version' into develop

smhc · Nov 13, 2018 · 41e9646 · 41e9646
2 parents 2f7c212 + 11b0cac
commit 41e9646
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/contrib/[email protected] b/contrib/[email protected]
@@ -18,6 +18,8 @@ else
     export OC_TAG=v7.08
     export STOKEN_TAG=v0.92
 fi
+export OC_URL=git://git.infradead.org/users/dwmw2/openconnect.git
+export STOKEN_URL=https://github.com/cernekee/stoken
 
 pacman --needed --noconfirm -S \
     mingw-w64-i686-gnutls \
@@ -37,9 +39,9 @@ pacman --needed --noconfirm -S \
 [ -d work ] || mkdir work
 cd work
 
-[ -d stoken ] ||  git clone https://github.com/cernekee/stoken
+[ -d stoken ] ||  git clone ${STOKEN_URL}
 cd stoken
-git checkout ${STOKEN_TAG}
+git checkout -b ${STOKEN_TAG} ${STOKEN_TAG}
 ./autogen.sh
 [ -d build32 ] || mkdir build32
 cd build32
@@ -49,10 +51,10 @@ mingw32-make -j4
 mingw32-make install
 cd ../../
 
-[ -d openconnect ] || git clone git://git.infradead.org/users/dwmw2/openconnect.git
+[ -d openconnect ] || git clone ${OC_URL}
 cd openconnect
 git reset --hard
-git checkout ${OC_TAG}
+git checkout -b ${OC_TAG} ${OC_TAG}
 ./autogen.sh
 [ -d build32 ] || mkdir build32
 cd build32

diff --git a/contrib/[email protected] b/contrib/[email protected]
@@ -18,6 +18,8 @@ else
     export OC_TAG=v7.08
     export STOKEN_TAG=v0.92
 fi
+export OC_URL=git://git.infradead.org/users/dwmw2/openconnect.git
+export STOKEN_URL=https://github.com/cernekee/stoken
 
 pacman --needed --noconfirm -S \
     mingw-w64-x86_64-gnutls \
@@ -37,9 +39,9 @@ pacman --needed --noconfirm -S \
 [ -d work ] || mkdir work
 cd work
 
-[ -d stoken ] ||  git clone https://github.com/cernekee/stoken
+[ -d stoken ] ||  git clone ${STOKEN_URL}
 cd stoken
-git checkout ${STOKEN_TAG}
+git checkout -b ${STOKEN_TAG} ${STOKEN_TAG}
 ./autogen.sh
 [ -d build64 ] || mkdir build64
 cd build64
@@ -49,10 +51,10 @@ mingw32-make -j4
 mingw32-make install
 cd ../../
 
-[ -d openconnect ] || git clone git://git.infradead.org/users/dwmw2/openconnect.git
+[ -d openconnect ] || git clone ${OC_URL}
 cd openconnect
 git reset --hard
-git checkout ${OC_TAG}
+git checkout -b ${OC_TAG} ${OC_TAG}
 ./autogen.sh
 [ -d build64 ] || mkdir build64
 cd build64

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -122,13 +122,11 @@ if(APPLE)
         OUTPUT_NAME ${PRODUCT_NAME_SHORT}
         MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.plist"
         MACOSX_BUNDLE_BUNDLE_NAME ${PRODUCT_NAME_SHORT}
-        MACOSX_BUNDLE_BUNDLE_VERSION "1.0.0"
+        MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
         MACOSX_BUNDLE_COPYRIGHT "${PRODUCT_NAME_COPYRIGHT_SHORT}"
         MACOSX_BUNDLE_GUI_IDENTIFIER io.github.openconnect.openconnect-gui
         MACOSX_BUNDLE_ICON_FILE mono_lock.icns
         MACOSX_BUNDLE_INFO_STRING ${PRODUCT_NAME_LONG}
-        MACOSX_BUNDLE_LONG_VERSION_STRING ${PROJECT_VERSION}
-        MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
     )
 endif()
 

diff --git a/src/Resources/openconnect-gui.plist.in b/src/Resources/openconnect-gui.plist.in
@@ -14,14 +14,12 @@
 	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
-	<key>CFBundleLongVersionString</key>
-	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
 	<key>CFBundleName</key>
 	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
 	<key>CFBundleSignature</key>
 	<string></string>
 	<key>CFBundleVersion</key>