omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xcode versioning complete

Browse Source
This commit is contained in:
omigamedev
2018-09-17 00:28:07 +02:00
parent 0ea64accf3
commit 7793c2d2c4
3 changed files with 54 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PanoPainter-OSX/main.cpp
View File

@@ -465,7 +465,7 @@ static CVReturn MyDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTime
auto style = NSTitledWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask|NSClosableWindowMask; auto style = NSTitledWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask|NSClosableWindowMask;
window = [[Window alloc] initWithContentRect:r styleMask:style backing:NSBackingStoreBuffered defer:NO]; window = [[Window alloc] initWithContentRect:r styleMask:style backing:NSBackingStoreBuffered defer:NO];
[window setDelegate:controller]; [window setDelegate:controller];
[window setTitle:@"PanoPainter 0.1.2 alpha"]; [window setTitle:[NSString stringWithUTF8String:g_window_title]];
[window center]; [window center];
[window makeKeyAndOrderFront:controller]; [window makeKeyAndOrderFront:controller];
[window setContentView:view]; [window setContentView:view];

59
PanoPainter.xcodeproj/project.pbxproj
View File

@@ -598,18 +598,18 @@
name = ui; name = ui;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
AD2286BC214E97460074567E /* sripts */ = { AD2286BC214E97460074567E /* scripts */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
AD2286BE214E975D0074567E /* pre-build.py */, AD2286BE214E975D0074567E /* pre-build.py */,
); );
path = sripts; path = scripts;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
AD58E0461E107411006ACC15 = { AD58E0461E107411006ACC15 = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
AD2286BC214E97460074567E /* sripts */, AD2286BC214E97460074567E /* scripts */,
AD58E0731E3421CB006ACC15 /* libs */, AD58E0731E3421CB006ACC15 /* libs */,
AD58E0611E17F23D006ACC15 /* data */, AD58E0611E17F23D006ACC15 /* data */,
AD58E0511E107411006ACC15 /* src */, AD58E0511E107411006ACC15 /* src */,
@@ -797,10 +797,11 @@
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = AD0E5CAC1ECC6F2B00C35669 /* Build configuration list for PBXNativeTarget "PanoPainter-OSX" */; buildConfigurationList = AD0E5CAC1ECC6F2B00C35669 /* Build configuration list for PBXNativeTarget "PanoPainter-OSX" */;
buildPhases = ( buildPhases = (
ADB86F64214E9D0D004E7CB8 /* Generate Version */,
AD0E5C981ECC6F2B00C35669 /* Sources */, AD0E5C981ECC6F2B00C35669 /* Sources */,
AD0E5C991ECC6F2B00C35669 /* Frameworks */, AD0E5C991ECC6F2B00C35669 /* Frameworks */,
AD0E5C9A1ECC6F2B00C35669 /* Resources */, AD0E5C9A1ECC6F2B00C35669 /* Resources */,
AD2286BB214E96E60074567E /* Versioning */, AD2286BB214E96E60074567E /* Versioning Info.plist */,
AD30D8201F783B5600B6A112 /* CopyFiles */, AD30D8201F783B5600B6A112 /* CopyFiles */,
); );
buildRules = ( buildRules = (
@@ -850,9 +851,11 @@
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = ADD7D2851EBF9AE300D5A897 /* Build configuration list for PBXNativeTarget "PanoPainter" */; buildConfigurationList = ADD7D2851EBF9AE300D5A897 /* Build configuration list for PBXNativeTarget "PanoPainter" */;
buildPhases = ( buildPhases = (
ADB86F65214EFBCD004E7CB8 /* Generate Version */,
ADD7D2671EBF9AE300D5A897 /* Sources */, ADD7D2671EBF9AE300D5A897 /* Sources */,
ADD7D2681EBF9AE300D5A897 /* Frameworks */, ADD7D2681EBF9AE300D5A897 /* Frameworks */,
ADD7D2691EBF9AE300D5A897 /* Resources */, ADD7D2691EBF9AE300D5A897 /* Resources */,
ADB86F66214EFC04004E7CB8 /* Versioning Info.plist */,
AD06989C20CC89370010825F /* CopyFiles */, AD06989C20CC89370010825F /* CopyFiles */,
AD787AEE20D4611100C4712A /* Embed App Extensions */, AD787AEE20D4611100C4712A /* Embed App Extensions */,
); );
@@ -958,19 +961,61 @@
/* End PBXResourcesBuildPhase section */ /* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */
AD2286BB214E96E60074567E /* Versioning */ = { AD2286BB214E96E60074567E /* Versioning Info.plist */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
); );
inputPaths = ( inputPaths = (
); );
name = Versioning; name = "Versioning Info.plist";
outputPaths = ( outputPaths = (
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "# Use the commit count as CFBundleVersion\nGIT_COMMIT_COUNT=`git rev-list --count HEAD`\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion ${GIT_COMMIT_COUNT}\" \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n\n## Use the last annotated tag as CFBundleShortVersionString\nGIT_TAG=`git describe --tags --abbrev=0`\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString ${GIT_TAG}\" \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\""; shellScript = "# Use the commit count as CFBundleVersion\nGIT_COMMIT_COUNT=`git rev-list --count HEAD`\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion ${GIT_COMMIT_COUNT}\" \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n\n## Use the last annotated tag as CFBundleShortVersionString\nGIT_TAG=`git describe --tags --abbrev=0`\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString ${GIT_TAG}\" \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n";
};
ADB86F64214E9D0D004E7CB8 /* Generate Version */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Generate Version";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "python scripts/pre-build.py $CONFIGURATION";
};
ADB86F65214EFBCD004E7CB8 /* Generate Version */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Generate Version";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "python scripts/pre-build.py $CONFIGURATION";
};
ADB86F66214EFC04004E7CB8 /* Versioning Info.plist */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Versioning Info.plist";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Use the commit count as CFBundleVersion\nGIT_COMMIT_COUNT=`git rev-list --count HEAD`\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion ${GIT_COMMIT_COUNT}\" \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n\n## Use the last annotated tag as CFBundleShortVersionString\nGIT_TAG=`git describe --tags --abbrev=0`\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString ${GIT_TAG}\" \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n";
}; };
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */

2
scripts/pre-build.py
View File

@@ -8,7 +8,7 @@ branch = check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"]).rstrip().dec
shorthash = check_output(["git", "log", "--pretty=format:%h", "-n 1"]).rstrip().decode("utf-8") shorthash = check_output(["git", "log", "--pretty=format:%h", "-n 1"]).rstrip().decode("utf-8")
revcount = int(check_output(["git", "rev-list", "--count", "HEAD"])) revcount = int(check_output(["git", "rev-list", "--count", "HEAD"]))
tag = check_output(["git", "describe", "--tags", "--abbrev=0"]).rstrip().decode("utf-8") tag = check_output(["git", "describe", "--tags", "--abbrev=0"]).rstrip().decode("utf-8")
config = sys.argv[1] config = sys.argv[1].lower()
version = "%s.%d (%s-%s-%s)" % (tag, revcount, shorthash, branch, config) version = "%s.%d (%s-%s-%s)" % (tag, revcount, shorthash, branch, config)
version_number = "%s.%d" % (tag, revcount) version_number = "%s.%d" % (tag, revcount)