Retrieve inspector version from package.json

Author: KristinaKoeva

build/scripts/build-inspector.sh

@@ -8,6 +8,7 @@ MACOSX_DEPLOYMENT_TARGET="10.10"
 
 WEBKIT_SOURCE_PATH="$WORKSPACE/src/webkit"
 WEBKIT_BUILD_OUTPUT_PATH="$WORKSPACE/cmake-build/WebKit-Xcode"
+BUILD_DIR="$WORKSPACE/build"
 
 INSPECTOR_SOURCE_PATH="$WORKSPACE/src/debugging/Inspector/Inspector"
 INSPECTOR_BUILD_OUTPUT_PATH="$WORKSPACE/cmake-build/Inspector"
@@ -41,7 +42,10 @@ find "$WEBKIT_BUILD_OUTPUT_PATH/Build/Products/$CONFIGURATION" -name "*.framewor
 
 checkpoint "Building Inspector app..."
 rm -rf "$INSPECTOR_BUILD_OUTPUT_PATH"
+
+version=$(python "$BUILD_DIR/scripts/get_version.py" "$BUILD_DIR/npm/inspector_package.json" 2>&1)
 xcodebuild \
+    PACKAGE_VERSION=$version \
     -project "$INSPECTOR_SOURCE_PATH/Inspector.xcodeproj" \
     -scheme "Inspector" \
     -archivePath "$INSPECTOR_BUILD_OUTPUT_PATH/Inspector.xcarchive" \

build/scripts/get_version.py

@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+
+import os
+import sys
+import json
+from collections import OrderedDict
+
+def readPackageJSON(path):
+	with open(path, "r") as jsonFile:
+	    return json.load(jsonFile, object_pairs_hook=OrderedDict)
+
+def getPackageVersion(baseVersion):
+	buildVersion = os.environ.get('PACKAGE_VERSION')
+	if buildVersion == None:
+		return baseVersion
+	return baseVersion + "-" + buildVersion
+
+if __name__ == "__main__":
+	if len(sys.argv) < 2:
+		print "Package.json location argument is missing"
+		sys.exit(2)
+	data = readPackageJSON(sys.argv[1]);
+	print getPackageVersion(data["version"])

build/scripts/update-version.py

@@ -3,7 +3,7 @@
 import os
 import sys
 import json
-from collections import OrderedDict
+import get_version
 
 if len(sys.argv) < 2:
 	print "Package.json location argument is missing"
@@ -14,22 +14,15 @@ def getCommitSHA():
 	if commitSHA == None:
 		return  os.popen("git rev-parse HEAD").read().replace("\n", "");
 
-def getPackageVersion(baseVersion):
-	buildVersion = os.environ.get('PACKAGE_VERSION')
-	if buildVersion == None:
-		return baseVersion
-	return baseVersion + "-" + buildVersion
-
-def updatePackageVersion(data):
-	data["version"] = getPackageVersion(data["version"])
+def updatePackageVersion():
+	data = get_version.readPackageJSON(sys.argv[1])
+	data["version"] = get_version.getPackageVersion(data["version"])
 	commitSHA = getCommitSHA()
 	if commitSHA:
 		data["repository"]["url"] += "/commit/" + commitSHA
 
-with open(sys.argv[1], "r") as jsonFile:
-    data = json.load(jsonFile, object_pairs_hook=OrderedDict)    
-
-updatePackageVersion(data)
+	with open(sys.argv[1], "w") as jsonFile:
+	    jsonFile.write(json.dumps(data, indent=2))
 
-with open(sys.argv[1], "w") as jsonFile:
-    jsonFile.write(json.dumps(data, indent=2))
+if __name__ == "__main__":
+	updatePackageVersion()

src/debugging/Inspector/Inspector/NativeScript Inspector/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(PACKAGE_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>