Merge pull request #74 from PropGit/demo

Mac build/sign/package updates plus project version script

Author: PropGit

.gitignore

@@ -6,6 +6,7 @@ venv/
 VPython/
 *.app
 *.pkg
+*.bak
 
 #################
 ## Eclipse

BlocklyPropClient.macos.spec

@@ -43,8 +43,7 @@ coll = COLLECT(exe,
 app = BUNDLE(coll,
              name='BlocklyPropClient.app',
              icon='BlocklyPropClient.icns',
-             bundle_identifier='com.ParallaxInc.BlocklyPropClient',
-             info_plist={'CFBundleShortVersionString': '0.5.3'})
+             bundle_identifier='com.ParallaxInc.BlocklyPropClient')
 
 # From Analysis
 #            pathex=['/Users/<username>/PythonProjects/BlocklyPropClient'],

about.txt

@@ -1,4 +1,4 @@
-CurrentVersion: v0.5.3
+Version: v0.5.3
 
 Contributors:
 - Michel Lampo
@@ -8,4 +8,4 @@ Contributors:
 
 Repository Source Code: http://github.com/parallaxinc/BlocklyPropClient
 
-Copyright 2015 - 2017 Parallax Inc
+Copyright 2015 - 2017 Parallax Inc.

package/blocklypropclient-installer.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "BlocklyPropClient"
 #define MyAppVersion "0.5.3"
-#define MyAppPublisher "Parallax, Inc."
+#define MyAppPublisher "Parallax Inc."
 #define MyAppURL "http://blockly.parallax.com/"
 #define MyAppExeName "BlocklyPropClient.exe"
 

package/mac_app_sign_and_package.sh

@@ -243,6 +243,31 @@ fi
 
 echo
 
+#
+# Set bundle version number (in Info.plist)
+#
+if [[ -e ${DISTRIBUTION}${APP_BUNDLE} ]]
+then
+    if [[ -e ${DISTRIBUTION}${APP_BUNDLE}/Contents/Info.plist ]]
+    then
+        if sed -i.bak s_\<string\>0.0.0\<\/string\>_\<string\>${VERSION}\<\/string\>_ ${DISTRIBUTION}${APP_BUNDLE}/Contents/Info.plist > ${DISTRIBUTION}${APP_BUNDLE}/Contents/Info2.plist
+        then
+            echo "Set bundle's Info.plist to version: \"${VERSION}\""
+        else
+            echo "[Error] Could not set bundle's version in Info.plist."
+            exit 1
+        fi
+    else
+        echo "[Error] Application bundle does not include an Info.plist file."
+        exit 1
+    fi
+else
+    echo "[Error] Application bundle not found: ${DISTRIBUTION}${APP_BUNDLE}"
+    exit 1
+fi
+
+echo
+
 #
 # Attempt to deeply codesign the app bundle
 #

set_version.sh

@@ -0,0 +1,75 @@
+#!/bin/sh --
+#
+# This script sets version number entries in various files in the BlocklyPropClient project.
+# Works in Ubuntu and OS X.
+#
+# Usage: $ ./set_version "1.2.3"
+
+
+#
+# Error if no version string declared
+#
+# if [ $1X == X ]     <-- this doesn't work in Ubuntu
+if [ -z "$1" ]
+then
+    echo "ERROR: Must specify a version number.  Ex: \$ $0 \"1.2.3\""
+    exit 1
+fi
+
+
+#
+# Get version string
+#
+VERSION=$1
+
+
+#
+# FindAndSetVersion function
+#   Find and update version string in form "Version = #.#.#" 
+#   Search is: case-insensitive, space, tabs, or nothing around '=', and one or more # in each placeholder.
+#   Replace is: performed in-place inside of file; however, a backup (.bak) of the original file is also made.  
+#
+# NOTE: sed on Mac doesn't include a case-insensitive option.  To keep the search pattern equivalent for both
+#       grep and sed, must use an expanded pattern for text where each letter is expressed in both upper/lower case.
+#       ex: Ver should be [vV][eE][rR]  
+#
+# function FindAndSetVersion {     <-- this doesn't work in Ubuntu
+FindAndSetVersion() {
+if grep -q -E ${VERSIONPATTERN} ${VERSIONFILE} ; then
+    if sed -i.bak -E "s/${VERSIONPATTERN}/${VERSIONSTRING}/" ${VERSIONFILE} ; then
+        echo "Updated file \"${VERSIONFILE}\" to include: ${VERSIONSTRING}"
+    fi
+else
+    echo "ERROR: Unable to find version string in file \"${VERSIONFILE}\""
+fi
+}
+
+
+#
+# Adjust BlocklyPropClient.py file - [format: VERSION = "#.#.#"]
+#
+VERSIONFILE=BlocklyPropClient.py
+VERSIONPATTERN=[vV][eE][rR][sS][iI][oO][nN][[:blank:]]*=[[:blank:]]*\"[0-9]+\.[0-9]+\.[0-9]+\"
+VERSIONSTRING="VERSION = \"${VERSION}\""
+
+FindAndSetVersion
+
+
+#
+# Adjust about.txt file - [format: Version: v#.#.#]
+#
+VERSIONFILE=about.txt
+VERSIONPATTERN=[vV][eE][rR][sS][iI][oO][nN]:[[:blank:]]*v[[:blank:]]*[0-9]+\.[0-9]+\.[0-9]+
+VERSIONSTRING="Version: v${VERSION}"
+
+FindAndSetVersion
+
+
+#
+# Adjust package/blocklypropclient-installer.iss file - [format: MyAppVersion "#.#.#"]
+#
+VERSIONFILE=package/blocklypropclient-installer.iss
+VERSIONPATTERN=[mM][yY][aA][pP][pP][vV][eE][rR][sS][iI][oO][nN][[:blank:]]+\"[0-9]+\.[0-9]+\.[0-9]+\"
+VERSIONSTRING="MyAppVersion \"${VERSION}\""
+
+FindAndSetVersion