Use project settings to control version Info.plist keys.

This also enables apple-generic versioning.

diff --git a/Info.plist b/Info.plist
index 88342fe0435d23180ce26fdd83b7b0904a2e65a6..f2eafc4483f7ae8499965aa6f35935fdab675b5f 100644 (file)
--- a/Info.plist
+++ b/Info.plist
@@ -7,7 +7,7 @@
        <key>CFBundleExecutable</key>
        <string>${EXECUTABLE_NAME}</string>
        <key>CFBundleGetInfoString</key>
-       <string>${EXECUTABLE_NAME} 2.0.1, Copyright 2007-2020 Blue Static</string>
+       <string>${EXECUTABLE_NAME} ${MARKETING_VERSION}, Copyright 2007-2020 Blue Static</string>
        <key>CFBundleIconFile</key>
        <string>MacGDBp</string>
        <key>CFBundleIdentifier</key>
@@ -19,11 +19,11 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>2.0.1</string>
+       <string>${MARKETING_VERSION}</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>201.0</string>
+       <string>${CURRENT_PROJECT_VERSION}</string>
        <key>NSMainNibFile</key>
        <string>MainMenu</string>
        <key>NSPrincipalClass</key>

diff --git a/MacGDBp.xcodeproj/project.pbxproj b/MacGDBp.xcodeproj/project.pbxproj
index 744b3718e45884c7c47554d9ec7ecaf14d4af5da..339a0e48b6c0f196d0dee5f83b0103705ec0ca52 100644 (file)
--- a/MacGDBp.xcodeproj/project.pbxproj
+++ b/MacGDBp.xcodeproj/project.pbxproj
@@ -736,6 +736,7 @@
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CODE_SIGN_ENTITLEMENTS = MacGDBp.entitlements;
                                COMBINE_HIDPI_IMAGES = YES;
+                               CURRENT_PROJECT_VERSION = 201.0;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(SRCROOT)",
@@ -746,8 +747,10 @@
                                INSTALL_PATH = "$(HOME)/Applications";
                                LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
                                MACGDBP_APP_SANDBOX = 1;
+                               MARKETING_VERSION = 2.0.1;
                                PRODUCT_BUNDLE_IDENTIFIER = org.bluestatic.macgdbp;
                                PRODUCT_NAME = MacGDBp;
+                               VERSIONING_SYSTEM = "apple-generic";
                                WRAPPER_EXTENSION = app;
                        };
                        name = "Release-AppSandbox";
@@ -778,6 +781,7 @@
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                COPY_PHASE_STRIP = NO;
+                               CURRENT_PROJECT_VERSION = 201.0;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(SRCROOT)",
@@ -788,8 +792,10 @@
                                INSTALL_PATH = "$(HOME)/Applications";
                                LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
                                MACGDBP_APP_SANDBOX = 0;
+                               MARKETING_VERSION = 2.0.1;
                                PRODUCT_BUNDLE_IDENTIFIER = org.bluestatic.macgdbp;
                                PRODUCT_NAME = MacGDBp;
+                               VERSIONING_SYSTEM = "apple-generic";
                                WRAPPER_EXTENSION = app;
                        };
                        name = Debug;
@@ -802,6 +808,7 @@
                                CODE_SIGN_IDENTITY = "";
                                CODE_SIGN_STYLE = Manual;
                                COMBINE_HIDPI_IMAGES = YES;
+                               CURRENT_PROJECT_VERSION = 201.0;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(SRCROOT)",
@@ -812,8 +819,10 @@
                                INSTALL_PATH = "$(HOME)/Applications";
                                LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
                                MACGDBP_APP_SANDBOX = 0;
+                               MARKETING_VERSION = 2.0.1;
                                PRODUCT_BUNDLE_IDENTIFIER = org.bluestatic.macgdbp;
                                PRODUCT_NAME = MacGDBp;
+                               VERSIONING_SYSTEM = "apple-generic";
                                WRAPPER_EXTENSION = app;
                        };
                        name = Release;