Skip to content

Commit 2d52c45

Browse files
author
Chris Wilson
committed
Some clean up and prepare for version display.
1 parent 841267a commit 2d52c45

5 files changed

Lines changed: 46 additions & 22 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Xcode
2+
MFLBuild.m-e
23
.DS_Store
34
build/
45
*.pbxuser

‎CoreDataUtil.xcodeproj/project.pbxproj‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
83656E6919379D0C003D0E74 /* TransformableDataTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 83656E6819379D0C003D0E74 /* TransformableDataTableViewCell.m */; };
3333
83656E6E1937A73B003D0E74 /* ObjectInfoController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83656E6C1937A73B003D0E74 /* ObjectInfoController.m */; };
3434
83656E6F1937A73B003D0E74 /* ObjectInfoController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 83656E6D1937A73B003D0E74 /* ObjectInfoController.xib */; };
35+
837C067B1A0E646600F4D5D4 /* MFLBuild.m in Sources */ = {isa = PBXBuildFile; fileRef = 837C067A1A0E646600F4D5D4 /* MFLBuild.m */; };
3536
838055C915A3A67200D050E7 /* ApplicationIcon-CDP.icns in Resources */ = {isa = PBXBuildFile; fileRef = 838055C715A3A67200D050E7 /* ApplicationIcon-CDP.icns */; };
3637
838055CA15A3A67200D050E7 /* ApplicationIcon-MOM.icns in Resources */ = {isa = PBXBuildFile; fileRef = 838055C815A3A67200D050E7 /* ApplicationIcon-MOM.icns */; };
3738
83922D381598F264004C273C /* MFLCellBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 83922D371598F264004C273C /* MFLCellBuilder.m */; };
@@ -121,6 +122,8 @@
121122
83656E6B1937A73B003D0E74 /* ObjectInfoController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectInfoController.h; sourceTree = "<group>"; };
122123
83656E6C1937A73B003D0E74 /* ObjectInfoController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObjectInfoController.m; sourceTree = "<group>"; };
123124
83656E6D1937A73B003D0E74 /* ObjectInfoController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ObjectInfoController.xib; sourceTree = "<group>"; };
125+
837C06791A0E646600F4D5D4 /* MFLBuild.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFLBuild.h; sourceTree = "<group>"; };
126+
837C067A1A0E646600F4D5D4 /* MFLBuild.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MFLBuild.m; sourceTree = "<group>"; };
124127
838055C715A3A67200D050E7 /* ApplicationIcon-CDP.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "ApplicationIcon-CDP.icns"; sourceTree = "<group>"; };
125128
838055C815A3A67200D050E7 /* ApplicationIcon-MOM.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "ApplicationIcon-MOM.icns"; sourceTree = "<group>"; };
126129
83922D361598F264004C273C /* MFLCellBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFLCellBuilder.h; sourceTree = "<group>"; };
@@ -344,6 +347,8 @@
344347
C1CEFE5B1463779D00466EB3 /* CoreDataUtil */ = {
345348
isa = PBXGroup;
346349
children = (
350+
837C06791A0E646600F4D5D4 /* MFLBuild.h */,
351+
837C067A1A0E646600F4D5D4 /* MFLBuild.m */,
347352
C1AAB8781491629B002C1973 /* CoreData */,
348353
83656E6319378FB7003D0E74 /* paintCode */,
349354
C1CEFE5C1463779D00466EB3 /* Supporting Files */,
@@ -423,9 +428,11 @@
423428
isa = PBXNativeTarget;
424429
buildConfigurationList = C1CEFEA81463779D00466EB3 /* Build configuration list for PBXNativeTarget "CoreDataUtil" */;
425430
buildPhases = (
431+
837C067C1A0E657900F4D5D4 /* Set Build Version */,
426432
C1CEFE4D1463779C00466EB3 /* Sources */,
427433
C1CEFE4E1463779C00466EB3 /* Frameworks */,
428434
C1CEFE4F1463779C00466EB3 /* Resources */,
435+
837C067D1A0E659500F4D5D4 /* Reset Build Version */,
429436
);
430437
buildRules = (
431438
);
@@ -484,7 +491,7 @@
484491
ORGANIZATIONNAME = "mFluent LLC";
485492
TargetAttributes = {
486493
C1CEFE501463779C00466EB3 = {
487-
DevelopmentTeam = K386ENA6UZ;
494+
DevelopmentTeam = WDCGJTU726;
488495
SystemCapabilities = {
489496
com.apple.InAppPurchase = {
490497
enabled = 0;
@@ -554,6 +561,34 @@
554561
/* End PBXResourcesBuildPhase section */
555562

556563
/* Begin PBXShellScriptBuildPhase section */
564+
837C067C1A0E657900F4D5D4 /* Set Build Version */ = {
565+
isa = PBXShellScriptBuildPhase;
566+
buildActionMask = 2147483647;
567+
files = (
568+
);
569+
inputPaths = (
570+
);
571+
name = "Set Build Version";
572+
outputPaths = (
573+
);
574+
runOnlyForDeploymentPostprocessing = 0;
575+
shellPath = /bin/sh;
576+
shellScript = "#!/bin/bash\n# Copyright Chris Wilson 2014\n\n# This script automatically sets the version and short version string of\n# an Xcode project from the GIT repository containing the project.\n#\n# To use this script in Xcode 4, add the contents to a \"Run Script\" build\n# phase for your application target.\n\nset -o errexit\nset -o nounset\n\n# Get the original MFLBuild from git\n#git checkout \"$SRCROOT/MFLBuild.m\"\n\n# Populate GIT Hash\nGIT_HASH=$(git --git-dir=\"${PROJECT_DIR}/.git\" --work-tree=\"${PROJECT_DIR}\" rev-parse HEAD)\necho \"GIT_HASH: $GIT_HASH\"\nsed -i -e \"s/BUILD_GENERATED_GIT_HASH/$GIT_HASH/g\" \"$SRCROOT/CoreDataUtil/MFLBuild.m\"\n\n# Populate last commit date and branch name\n\nGIT_LAST_COMMIT=$(git log -1 --format=%cd)\necho \"GIT_LAST_COMMIT: $GIT_LAST_COMMIT\"\n\n#echo \"before branch\"\n#GIT_BANCH_NAME=$(git --git-dir=\"${PROJECT_DIR}/.git\" --work-tree=\"${PROJECT_DIR}\" symbolic-ref --short HEAD)\n#echo \"after branch\"\n#echo \"GIT_BANCH_NAME: $GIT_BANCH_NAME\"\n\nsed -i -e \"s/BUILD_LAST_COMMIT/$GIT_LAST_COMMIT/g\" \"$SRCROOT/CoreDataUtil/MFLBuild.m\"\n\n\nBUILD_DATE=`date -u`\nsed -i -e \"s/BUILD_GENERATED_DATE/$BUILD_DATE/g\" \"$SRCROOT/CoreDataUtil/MFLBuild.m\"\n\n\nBUILD_VERSION=`git rev-list HEAD --count`\nsed -i -e \"s/BUILD_GENERATED_VERSION/$BUILD_VERSION/g\" \"$SRCROOT/CoreDataUtil/MFLBuild.m\"\n\n# Write APP_VERSION in MFLBuild.m from CFBundleShortVersionString in info.plist\necho \"Read Plist: ${PROJECT_DIR}/CoreDataUtil/Info.plist\"\nAPP_VERSION=`/usr/libexec/PlistBuddy -c \"print :CFBundleShortVersionString\" \"${PROJECT_DIR}/CoreDataUtil/CoreDataPro-Info.plist\"`\necho \"APP_VERSION: $APP_VERSION\"\nsed -i -e \"s/APP_VERSION/$APP_VERSION/g\" \"$SRCROOT/CoreDataUtil/MFLBuild.m\"\n\n\n";
577+
};
578+
837C067D1A0E659500F4D5D4 /* Reset Build Version */ = {
579+
isa = PBXShellScriptBuildPhase;
580+
buildActionMask = 2147483647;
581+
files = (
582+
);
583+
inputPaths = (
584+
);
585+
name = "Reset Build Version";
586+
outputPaths = (
587+
);
588+
runOnlyForDeploymentPostprocessing = 0;
589+
shellPath = /bin/sh;
590+
shellScript = "git checkout \"$SRCROOT/CoreDataUtil/MFLBuild.m\"";
591+
};
557592
C1CEFE731463779D00466EB3 /* ShellScript */ = {
558593
isa = PBXShellScriptBuildPhase;
559594
buildActionMask = 2147483647;
@@ -578,6 +613,7 @@
578613
83656E6919379D0C003D0E74 /* TransformableDataTableViewCell.m in Sources */,
579614
83656E6619378FB7003D0E74 /* CoreDataUtilityStyle.m in Sources */,
580615
C1CEFE691463779D00466EB3 /* MFLAppDelegate.m in Sources */,
616+
837C067B1A0E646600F4D5D4 /* MFLBuild.m in Sources */,
581617
C1CEFE6F1463779D00466EB3 /* CoreDataUtil.xcdatamodeld in Sources */,
582618
5B2E2AA61565A8AC00F6F6EA /* OpenFileSheetController.m in Sources */,
583619
5B2AEF1B1576B67600DFD0D6 /* GetInfoSheetController.m in Sources */,

‎CoreDataUtil/ObjectInfoController.xib‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13D65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
4-
<deployment defaultVersion="1070" identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
4+
<deployment identifier="macosx"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6250"/>
66
</dependencies>
77
<objects>
88
<customObject id="-2" userLabel="File's Owner" customClass="ObjectInfoController">
@@ -12,19 +12,18 @@
1212
</connections>
1313
</customObject>
1414
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
15-
<customObject id="-3" userLabel="Application"/>
15+
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
1616
<window title="[Object description]" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" visibleAtLaunch="NO" frameAutosaveName="objectInfoSheet" animationBehavior="default" id="F0z-JX-Cv5">
1717
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
1818
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
1919
<rect key="contentRect" x="196" y="240" width="487" height="318"/>
20-
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
20+
<rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
2121
<view key="contentView" id="se5-gp-TjO">
2222
<rect key="frame" x="0.0" y="0.0" width="487" height="318"/>
2323
<autoresizingMask key="autoresizingMask"/>
2424
<subviews>
2525
<scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YRV-af-0PJ">
2626
<rect key="frame" x="-1" y="46" width="489" height="273"/>
27-
<autoresizingMask key="autoresizingMask"/>
2827
<clipView key="contentView" id="7ma-4c-bzs">
2928
<rect key="frame" x="1" y="1" width="487" height="271"/>
3029
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -61,7 +60,6 @@
6160
</scrollView>
6261
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TB8-ni-Abc">
6362
<rect key="frame" x="391" y="3" width="82" height="32"/>
64-
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
6563
<constraints>
6664
<constraint firstAttribute="height" constant="21" id="3tv-X5-B1x"/>
6765
<constraint firstAttribute="width" constant="70" id="Hhf-va-SqT"/>

‎CoreDataUtil/OpenFileSheetController.xib‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ Gw
322322
<rect key="frame" x="1" y="1" width="148" height="398"/>
323323
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
324324
<subviews>
325-
<outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" outlineTableColumn="M4U-v5-9Q1" id="SOS-aC-JWX">
325+
<outlineView appearanceType="vibrantLight" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" outlineTableColumn="M4U-v5-9Q1" id="SOS-aC-JWX">
326326
<autoresizingMask key="autoresizingMask"/>
327327
<size key="intercellSpacing" width="3" height="2"/>
328328
<color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>

‎CoreDataUtil/en.lproj/Credits.rtf‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
1-
{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf470
1+
{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf140
22
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
33
{\colortbl;\red255\green255\blue255;}
44
\vieww9600\viewh8400\viewkind0
55
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
66

77
\f0\b\fs24 \cf0 \
8-
Learn More\
9-
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
10-
11-
\b0 \cf0 {\field{\*\fldinst{HYPERLINK "http://mfluent.com/services"}}{\fldrslt http://mfluent.com/services}}
12-
\b \
13-
14-
\b0 {\field{\*\fldinst{HYPERLINK "http://fluentfactory.com/"}}{\fldrslt http://fluentfactory.com/}}
15-
\b \
16-
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
17-
18-
\b0 \cf0 \
19-
We would like to add you to our team. If you are an experienced developer and would like to join our team please send your resume to jobs@mfluent.com. We especially want to talk to you if you develop for iOS, Android and/or OSX.\
8+
\
209
}

0 commit comments

Comments
 (0)