Skip to content
This repository was archived by the owner on May 20, 2021. It is now read-only.

Commit 4262bb4

Browse files
martijnwalravenmartijnwalraven
committed
Use Git commit count on master as build number
1 parent b113349 commit 4262bb4

File tree

5 files changed

+38
-19
lines changed

5 files changed

+38
-19
lines changed

‎Meteor.xcodeproj/project.pbxproj

+26-14
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
7CBF1A581B18FF3C00967AEE /* InflectorKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CBF1A551B18FF3C00967AEE /* InflectorKit.framework */; };
2525
7CBF1A591B18FF3C00967AEE /* PocketSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CBF1A561B18FF3C00967AEE /* PocketSocket.framework */; };
2626
7CBF1A5A1B18FF3C00967AEE /* SimpleKeychain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CBF1A571B18FF3C00967AEE /* SimpleKeychain.framework */; };
27-
7CBF1A5C1B18FFAA00967AEE /* InflectorKit.framework in Copy Dependencies */ = {isa = PBXBuildFile; fileRef = 7CBF1A551B18FF3C00967AEE /* InflectorKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
28-
7CBF1A5D1B18FFAA00967AEE /* PocketSocket.framework in Copy Dependencies */ = {isa = PBXBuildFile; fileRef = 7CBF1A561B18FF3C00967AEE /* PocketSocket.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
29-
7CBF1A5E1B18FFAA00967AEE /* SimpleKeychain.framework in Copy Dependencies */ = {isa = PBXBuildFile; fileRef = 7CBF1A571B18FF3C00967AEE /* SimpleKeychain.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
27+
7CBF1A5C1B18FFAA00967AEE /* InflectorKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7CBF1A551B18FF3C00967AEE /* InflectorKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
28+
7CBF1A5D1B18FFAA00967AEE /* PocketSocket.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7CBF1A561B18FF3C00967AEE /* PocketSocket.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
29+
7CBF1A5E1B18FFAA00967AEE /* SimpleKeychain.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7CBF1A571B18FF3C00967AEE /* SimpleKeychain.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3030
9F030F591AE3E98F00BCC4C8 /* METAleaRandomValueGeneratorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F030F3B1AE3E98F00BCC4C8 /* METAleaRandomValueGeneratorTests.m */; };
3131
9F030F5A1AE3E98F00BCC4C8 /* METCollectionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F030F3C1AE3E98F00BCC4C8 /* METCollectionTests.m */; };
3232
9F030F5B1AE3E98F00BCC4C8 /* METCoreDataDDPClientTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F030F3D1AE3E98F00BCC4C8 /* METCoreDataDDPClientTests.m */; };
@@ -182,17 +182,17 @@
182182
/* End PBXContainerItemProxy section */
183183

184184
/* Begin PBXCopyFilesBuildPhase section */
185-
7CBF1A5B1B18FF9800967AEE /* Copy Dependencies */ = {
185+
7CBF1A5B1B18FF9800967AEE /* Embed Frameworks */ = {
186186
isa = PBXCopyFilesBuildPhase;
187187
buildActionMask = 2147483647;
188188
dstPath = "";
189189
dstSubfolderSpec = 10;
190190
files = (
191-
7CBF1A5C1B18FFAA00967AEE /* InflectorKit.framework in Copy Dependencies */,
192-
7CBF1A5D1B18FFAA00967AEE /* PocketSocket.framework in Copy Dependencies */,
193-
7CBF1A5E1B18FFAA00967AEE /* SimpleKeychain.framework in Copy Dependencies */,
191+
7CBF1A5C1B18FFAA00967AEE /* InflectorKit.framework in Embed Frameworks */,
192+
7CBF1A5D1B18FFAA00967AEE /* PocketSocket.framework in Embed Frameworks */,
193+
7CBF1A5E1B18FFAA00967AEE /* SimpleKeychain.framework in Embed Frameworks */,
194194
);
195-
name = "Copy Dependencies";
195+
name = "Embed Frameworks";
196196
runOnlyForDeploymentPostprocessing = 0;
197197
};
198198
9F2A96131B19AC1700DE99CC /* Copy Dependencies */ = {
@@ -807,11 +807,12 @@
807807
isa = PBXNativeTarget;
808808
buildConfigurationList = 9FAB38581AE3E76900E99519 /* Build configuration list for PBXNativeTarget "Meteor iOS" */;
809809
buildPhases = (
810+
9F2A9D761B2C9313002DD57A /* Set Version */,
810811
9FAB383D1AE3E76900E99519 /* Sources */,
811812
9FAB383E1AE3E76900E99519 /* Frameworks */,
812813
9FAB383F1AE3E76900E99519 /* Headers */,
813814
9FAB38401AE3E76900E99519 /* Resources */,
814-
7CBF1A5B1B18FF9800967AEE /* Copy Dependencies */,
815+
7CBF1A5B1B18FF9800967AEE /* Embed Frameworks */,
815816
);
816817
buildRules = (
817818
);
@@ -940,7 +941,22 @@
940941
);
941942
runOnlyForDeploymentPostprocessing = 0;
942943
shellPath = /bin/sh;
943-
shellScript = "export PATH=\"/usr/local/var/rbenv/shims:${PATH}\"\n\nOUTPUT_DIR=\"${BUILT_PRODUCTS_DIR}/Documentation\"\nBUILD_VERSION=$(/usr/libexec/PlistBuddy -c \"Print CFBuildVersion\" $buildPlist)\nPUBLIC_HEADER_FILES=$($PROJECT_DIR/Scripts/find_headers.rb --project Meteor --target \"Meteor iOS\" --public)\n\n/usr/local/bin/appledoc \\\n--clean-output \\\n--project-version BUILD_VERSION \\\n--exit-threshold 2 \\\n--create-html \\\n--no-create-docset \\\n--no-install-docset \\\n--output $OUTPUT_DIR \\\n\"${PROJECT_DIR}/Documentation/AppledocSettings.plist\" \\\n$PUBLIC_HEADER_FILES\n\nopen \"${OUTPUT_DIR}/html/index.html\"";
944+
shellScript = "export PATH=\"/usr/local/var/rbenv/shims:${PATH}\"\n\nOUTPUT_DIR=\"${BUILT_PRODUCTS_DIR}/Documentation\"\nVERSION=$(<VERSION)\nPUBLIC_HEADER_FILES=$($PROJECT_DIR/Scripts/find_headers.rb --project Meteor --target \"Meteor iOS\" --public)\n\n/usr/local/bin/appledoc \\\n--clean-output \\\n--project-version VERSION \\\n--exit-threshold 2 \\\n--create-html \\\n--no-create-docset \\\n--no-install-docset \\\n--output $OUTPUT_DIR \\\n\"${PROJECT_DIR}/Documentation/AppledocSettings.plist\" \\\n$PUBLIC_HEADER_FILES\n\nopen \"${OUTPUT_DIR}/html/index.html\"";
945+
};
946+
9F2A9D761B2C9313002DD57A /* Set Version */ = {
947+
isa = PBXShellScriptBuildPhase;
948+
buildActionMask = 2147483647;
949+
files = (
950+
);
951+
inputPaths = (
952+
);
953+
name = "Set Version";
954+
outputPaths = (
955+
);
956+
runOnlyForDeploymentPostprocessing = 0;
957+
shellPath = /bin/sh;
958+
shellScript = ./Scripts/set_version.sh;
959+
showEnvVarsInLog = 0;
944960
};
945961
/* End PBXShellScriptBuildPhase section */
946962

@@ -1090,7 +1106,6 @@
10901106
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
10911107
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
10921108
COPY_PHASE_STRIP = NO;
1093-
CURRENT_PROJECT_VERSION = 1;
10941109
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
10951110
ENABLE_STRICT_OBJC_MSGSEND = YES;
10961111
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1137,7 +1152,6 @@
11371152
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
11381153
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
11391154
COPY_PHASE_STRIP = NO;
1140-
CURRENT_PROJECT_VERSION = 1;
11411155
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
11421156
ENABLE_NS_ASSERTIONS = NO;
11431157
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1166,7 +1180,6 @@
11661180
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
11671181
DEFINES_MODULE = YES;
11681182
DYLIB_COMPATIBILITY_VERSION = 1;
1169-
DYLIB_CURRENT_VERSION = 1;
11701183
DYLIB_INSTALL_NAME_BASE = "@rpath";
11711184
FRAMEWORK_SEARCH_PATHS = (
11721185
"$(inherited)",
@@ -1188,7 +1201,6 @@
11881201
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
11891202
DEFINES_MODULE = YES;
11901203
DYLIB_COMPATIBILITY_VERSION = 1;
1191-
DYLIB_CURRENT_VERSION = 1;
11921204
DYLIB_INSTALL_NAME_BASE = "@rpath";
11931205
FRAMEWORK_SEARCH_PATHS = (
11941206
"$(inherited)",

‎Meteor/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>0.1.3</string>
22+
<string>124</string>
2323
<key>NSPrincipalClass</key>
2424
<string></string>
2525
</dict>

‎Scripts/set_version.sh

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/sh
2+
3+
VERSION=$(<VERSION)
4+
/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $VERSION" "${PROJECT_DIR}/${INFOPLIST_FILE}"
5+
6+
BUILD_VERSION=$(git rev-list master --count)
7+
/usr/libexec/PlistBuddy -c "Set :CFBundleVersion $BUILD_VERSION" "${PROJECT_DIR}/${INFOPLIST_FILE}"

‎Tests/Server Integration Tests/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.1.2</string>
18+
<string>1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>1</string>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
2323
</dict>
2424
</plist>

‎Tests/Unit Tests/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.1.2</string>
18+
<string>1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>1</string>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
2323
</dict>
2424
</plist>

0 commit comments

Comments
 (0)