From 230a1c0c5e53f5e1c30847247024b86acfe22ffc Mon Sep 17 00:00:00 2001
From: ivanbuhov <ivanbuhov@gmail.com>
Date: Tue, 2 May 2017 10:41:53 +0300
Subject: [PATCH] Strip NativeScript.framework version suffixes (e.g. -rc,
 rc.2)

---
 CMakeLists.txt                  | 1 +
 build/scripts/get_version.py    | 5 ++++-
 src/NativeScript/CMakeLists.txt | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 466b6bf9e..d22558414 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,7 @@ execute_process(
 
 list(GET VERSIONS 0 BASE_NATIVESCRIPT_VERSION)
 list(GET VERSIONS 1 NATIVESCRIPT_VERSION)
+list(GET VERSIONS 2 NATIVESCRIPT_FRAMEWORK_VERSION)
 
 # TODO: Clang Analyzer, Tidy ...
 
diff --git a/build/scripts/get_version.py b/build/scripts/get_version.py
index b5d9ffc88..a787d7b2a 100755
--- a/build/scripts/get_version.py
+++ b/build/scripts/get_version.py
@@ -15,9 +15,12 @@ def getPackageVersion(baseVersion):
 		return baseVersion
 	return baseVersion + "-" + buildVersion
 
+def getFrameworkVersion(baseVersion):
+	return baseVersion.split("-")[0]
+
 if __name__ == "__main__":
 	if len(sys.argv) < 2:
 		print "Package.json location argument is missing"
 		sys.exit(2)
 	data = readPackageJSON(sys.argv[1]);
-	print "{};{}".format(data["version"], getPackageVersion(data["version"]))
+	print "{};{};{}".format(data["version"], getPackageVersion(data["version"]), getFrameworkVersion(data["version"]))
diff --git a/src/NativeScript/CMakeLists.txt b/src/NativeScript/CMakeLists.txt
index f45a5e124..43df2cbfe 100644
--- a/src/NativeScript/CMakeLists.txt
+++ b/src/NativeScript/CMakeLists.txt
@@ -224,9 +224,9 @@ if(${BUILD_SHARED_LIBS})
         FRAMEWORK TRUE
         # FRAMEWORK_VERSION "1.0" # TODO
         INSTALL_NAME_DIR "@executable_path/Frameworks"
-        MACOSX_FRAMEWORK_BUNDLE_VERSION "${BASE_NATIVESCRIPT_VERSION}"
+        MACOSX_FRAMEWORK_BUNDLE_VERSION "${NATIVESCRIPT_FRAMEWORK_VERSION}"
         MACOSX_FRAMEWORK_IDENTIFIER "org.nativescript.NativeScript"
-        MACOSX_FRAMEWORK_SHORT_VERSION_STRING "${BASE_NATIVESCRIPT_VERSION}"
+        MACOSX_FRAMEWORK_SHORT_VERSION_STRING "${NATIVESCRIPT_FRAMEWORK_VERSION}"
         PUBLIC_HEADER "${NativeScript_PUBLIC_HEADERS}"
         XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT[variant=Debug] "DWARF"
     )