Set version to 0.2.0

indianakernick · Aug 3, 2020 · bb42be9 · bb42be9
1 parent 0202f2f
commit bb42be9
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 18 deletions.
diff --git a/Animera.xcodeproj/project.pbxproj b/Animera.xcodeproj/project.pbxproj
@@ -2301,6 +2301,7 @@
 				455F284F220688FD00C73F39 /* Resources */,
 				455F288A2206A17600C73F39 /* Mac Deploy */,
 				457D74FC239F8B06009B4E4B /* Trim */,
+				45FBDCFA24D7ADA700B6D82F /* Create DMG */,
 			);
 			buildRules = (
 			);
@@ -3150,6 +3151,24 @@
 			shellPath = /bin/sh;
 			shellScript = "/usr/local/opt/qt/bin/moc -i \"$SCRIPT_INPUT_FILE_0\" > \"$SCRIPT_OUTPUT_FILE_0\"\necho \"\" >> \"$SCRIPT_OUTPUT_FILE_0\"\n/usr/local/opt/qt/bin/moc -i \"$SCRIPT_INPUT_FILE_1\" >> \"$SCRIPT_OUTPUT_FILE_0\"\n";
 		};
+		45FBDCFA24D7ADA700B6D82F /* Create DMG */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Create DMG";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# \"$PROJECT_DIR/scripts/create-dmg-icon.sh\"\n# \"$PROJECT_DIR/scripts/create-dmg.sh\"\n# rm \"$PROJECT_DIR/VolumeIcon.icns\"\n";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -3396,17 +3415,14 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = QY44MADGVC;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					/usr/local/opt/qt/lib,
 				);
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					GLM_FORCE_SILENT_WARNINGS,
-					"$(inherited)",
-				);
+				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				HEADER_SEARCH_PATHS = (
 					$PROJECT_DIR/third_party/Graphics/include,
 					$PROJECT_DIR/third_party/span/include,
@@ -3430,7 +3446,7 @@
 				);
 				LLVM_LTO = NO;
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 0.1.0;
+				MARKETING_VERSION = 0.2.0;
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-Wall",
@@ -3463,7 +3479,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = QY44MADGVC;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -3472,11 +3488,7 @@
 					/usr/local/opt/qt/lib,
 				);
 				GCC_OPTIMIZATION_LEVEL = z;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					GLM_FORCE_SILENT_WARNINGS,
-					NDEBUG,
-					ENABLE_SCOPE_TIME,
-				);
+				GCC_PREPROCESSOR_DEFINITIONS = NDEBUG;
 				HEADER_SEARCH_PATHS = (
 					$PROJECT_DIR/third_party/Graphics/include,
 					$PROJECT_DIR/third_party/span/include,
@@ -3500,7 +3512,7 @@
 				);
 				LLVM_LTO = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 0.1.0;
+				MARKETING_VERSION = 0.2.0;
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-Wall",

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # cxx_std_20 added in 3.12
 cmake_minimum_required(VERSION 3.12)
 project(Animera
-    VERSION 0.1.0
+    VERSION 0.2.0
     DESCRIPTION "A cross-platform Qt tool for making pixel-art animations for games"
     HOMEPAGE_URL "https://github.com/Kerndog73/Animera"
     LANGUAGES CXX
@@ -313,6 +313,7 @@ include(InstallRequiredSystemLibraries)
 
 set(CPACK_PACKAGE_NAME "Animera")
 set(CPACK_PACKAGE_VENDOR "Indiana Kernick")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "Animera")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
 set(CPACK_STRIP_FILES ON)
 set(CPACK_GENERATOR "NSIS64")

diff --git a/scripts/create-dmg.sh b/scripts/create-dmg.sh
@@ -12,13 +12,18 @@
 alias animera="$BUILT_PRODUCTS_DIR/$EXECUTABLE_PATH"
 BACKGROUND="$PROJECT_DIR/Resources/Animations/dmg background.animera"
 
-animera export --name=background --scale=4 "$BACKGROUND"
-animera export --name=background@2x --scale=8 "$BACKGROUND"
+animera export << EOF
+{
+  "animations": [
+    { "file": "$BACKGROUND", "name": "background",    "scale": 4 },
+    { "file": "$BACKGROUND", "name": "background@2x", "scale": 8 }
+  ]
+}
+EOF
 
 envsubst < "$PROJECT_DIR/scripts/dmg.json" > expanded.json
-appdmg expanded.json "$PROJECT_DIR/Animera-$MARKETING_VERSION.dmg"
+appdmg expanded.json "$PROJECT_DIR/Animera-$MARKETING_VERSION-macos.dmg"
 
 rm expanded.json
 rm background.png
 rm [email protected]
-rm VolumeIcon.icns