Fix version and packaging

acidanthera · Oct 5, 2020 · 16fb0f5 · 16fb0f5
1 parent dc6700f
commit 16fb0f5
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ matrix:
     deploy:
       provider: releases
       skip_cleanup: true
-      file: "build/*/*/*.zip"
+      file: "build/*/*.zip"
       file_glob: true
       api_key:
         secure: mV9Io9CT8ej8gWk6yz0i1p/VecHsDHSk55JIBUPKX6oge4ME1wYj4q1HLogiNn3dlNUeIPuAi0793NQwcUgAvjFgvTVhFZM89cZon0nCjMRJ0aAZQtuCis0zCtT2joe2n+kc8jvULJqM9Mp5psfiN4LBVO0feT+mbkRMyaOE1J3LfX/zbKpYbTgadEMQBGSlVFeySJPWknUZzo9OGVQAhW+I7K49nwsXW6it2mlnk/SH+XyUZgNv+LOJJzt5pDLEyOa8ZE9cH7jHD+lLBni6Lu/sCLRtj0fWAJflmME7FnVIhiNzwcD8va42/DtbFsF3WWzWeGssvMpVlr7QjOCkURoYgd8XFzdnc/ngv5QwcwH8CiFXjlimDO+q7dFoAysXhmcLKoNowfnn51OyI2cI5eHRgVPpsRybRQAxBqJIHzhgymiBKLQvFqQ4EzxsaklA2WQ5q7BfRjhQJDfRpQHwc/MJprNGyBy/zE9ie6WWn70lz4m+vkl/5mUSQaT9ygrhjUOROwO8hgGdujx6IvnhEUgw9CZBAW8UhcM8mzIU145R9dfAYQW4cvHaqlsjhoQgcdUNsDjCXEnwme7RHpVoHNFjZ/WDwdtEvyc4tBbCReYKsKYT7O3W9jltfrIq3ppAFD68cW8mujxG7CcnTC9Xj5xsB5E2nOzmlFdFm3iNLiE=

diff --git a/BrightnessKeys.xcodeproj/project.pbxproj b/BrightnessKeys.xcodeproj/project.pbxproj
@@ -89,6 +89,7 @@
 				3573FE2A25223B8500DFC9F4 /* Sources */,
 				3573FE2B25223B8500DFC9F4 /* Frameworks */,
 				3573FE2C25223B8500DFC9F4 /* Resources */,
+				CE36C7C1252B87670093C599 /* Archive */,
 			);
 			buildRules = (
 			);
@@ -140,6 +141,27 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		CE36C7C1252B87670093C599 /* Archive */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = Archive;
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "cd \"${TARGET_BUILD_DIR}\"\n\ndist=(\"$FULL_PRODUCT_NAME\")\nif [ -d \"$DWARF_DSYM_FILE_NAME\" ]; then dist+=(\"$DWARF_DSYM_FILE_NAME\"); fi\n\narchive=\"${PRODUCT_NAME}-${MODULE_VERSION}-$(echo $CONFIGURATION | tr /a-z/ /A-Z/).zip\"\nrm -rf *.zip\nif [ \"$CONFIGURATION\" == \"Release\" ]; then strip -x -T \"${EXECUTABLE_PATH}\"; fi\nzip -qry -FS \"${archive}\" \"${dist[@]}\"\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		3573FE2A25223B8500DFC9F4 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -185,6 +207,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = "$(MODULE_VERSION)";
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -204,6 +227,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MODULE_VERSION = 1.0.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -244,6 +268,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = "$(MODULE_VERSION)";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -260,6 +285,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MODULE_VERSION = 1.0.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = macosx;
@@ -272,7 +298,6 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.0.0d1;
 				HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/Lilu.kext/Contents/Resources";
 				INFOPLIST_FILE = BrightnessKeys/Info.plist;
 				KERNEL_EXTENSION_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/MacKernelSDK/Headers";
@@ -283,7 +308,6 @@
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MODULE_NAME = as.acidanthera.BrightnessKeys;
-				MODULE_VERSION = 1.0.0d1;
 				PRODUCT_BUNDLE_IDENTIFIER = as.acidanthera.BrightnessKeys;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				RUN_CLANG_STATIC_ANALYZER = YES;
@@ -297,7 +321,6 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.0.0d1;
 				HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/Lilu.kext/Contents/Resources";
 				INFOPLIST_FILE = BrightnessKeys/Info.plist;
 				KERNEL_EXTENSION_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/MacKernelSDK/Headers";
@@ -308,7 +331,6 @@
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MODULE_NAME = as.acidanthera.BrightnessKeys;
-				MODULE_VERSION = 1.0.0d1;
 				PRODUCT_BUNDLE_IDENTIFIER = as.acidanthera.BrightnessKeys;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				RUN_CLANG_STATIC_ANALYZER = YES;

diff --git a/BrightnessKeys/Info.plist b/BrightnessKeys/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>IOKitPersonalities</key>
 	<dict>
 		<key>BrightnessKeys</key>
@@ -36,6 +36,8 @@
 	</dict>
 	<key>OSBundleLibraries</key>
 	<dict>
+		<key>as.vit9696.Lilu</key>
+		<string>1.2.0</string>
 		<key>com.apple.iokit.IOACPIFamily</key>
 		<string>1.0.0d1</string>
 		<key>com.apple.iokit.IOHIDFamily</key>
@@ -50,8 +52,6 @@
 		<string>8.0.0</string>
 		<key>com.apple.kpi.unsupported</key>
 		<string>8.0.0</string>
-		<key>as.vit9696.Lilu</key>
-		<string>1.2.0</string>
 	</dict>
 	<key>OSBundleRequired</key>
 	<string>Console</string>