Some clean up and prepare for version display.

yepher · Nov 8, 2014 · 2d52c45 · 2d52c45
1 parent 841267a
commit 2d52c45
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 # Xcode
+MFLBuild.m-e
 .DS_Store
 build/
 *.pbxuser

diff --git a/CoreDataUtil.xcodeproj/project.pbxproj b/CoreDataUtil.xcodeproj/project.pbxproj
@@ -32,6 +32,7 @@
 		83656E6919379D0C003D0E74 /* TransformableDataTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 83656E6819379D0C003D0E74 /* TransformableDataTableViewCell.m */; };
 		83656E6E1937A73B003D0E74 /* ObjectInfoController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83656E6C1937A73B003D0E74 /* ObjectInfoController.m */; };
 		83656E6F1937A73B003D0E74 /* ObjectInfoController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 83656E6D1937A73B003D0E74 /* ObjectInfoController.xib */; };
+		837C067B1A0E646600F4D5D4 /* MFLBuild.m in Sources */ = {isa = PBXBuildFile; fileRef = 837C067A1A0E646600F4D5D4 /* MFLBuild.m */; };
 		838055C915A3A67200D050E7 /* ApplicationIcon-CDP.icns in Resources */ = {isa = PBXBuildFile; fileRef = 838055C715A3A67200D050E7 /* ApplicationIcon-CDP.icns */; };
 		838055CA15A3A67200D050E7 /* ApplicationIcon-MOM.icns in Resources */ = {isa = PBXBuildFile; fileRef = 838055C815A3A67200D050E7 /* ApplicationIcon-MOM.icns */; };
 		83922D381598F264004C273C /* MFLCellBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 83922D371598F264004C273C /* MFLCellBuilder.m */; };
@@ -121,6 +122,8 @@
 		83656E6B1937A73B003D0E74 /* ObjectInfoController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectInfoController.h; sourceTree = "<group>"; };
 		83656E6C1937A73B003D0E74 /* ObjectInfoController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObjectInfoController.m; sourceTree = "<group>"; };
 		83656E6D1937A73B003D0E74 /* ObjectInfoController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ObjectInfoController.xib; sourceTree = "<group>"; };
+		837C06791A0E646600F4D5D4 /* MFLBuild.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFLBuild.h; sourceTree = "<group>"; };
+		837C067A1A0E646600F4D5D4 /* MFLBuild.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MFLBuild.m; sourceTree = "<group>"; };
 		838055C715A3A67200D050E7 /* ApplicationIcon-CDP.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "ApplicationIcon-CDP.icns"; sourceTree = "<group>"; };
 		838055C815A3A67200D050E7 /* ApplicationIcon-MOM.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "ApplicationIcon-MOM.icns"; sourceTree = "<group>"; };
 		83922D361598F264004C273C /* MFLCellBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFLCellBuilder.h; sourceTree = "<group>"; };
@@ -344,6 +347,8 @@
 		C1CEFE5B1463779D00466EB3 /* CoreDataUtil */ = {
 			isa = PBXGroup;
 			children = (
+				837C06791A0E646600F4D5D4 /* MFLBuild.h */,
+				837C067A1A0E646600F4D5D4 /* MFLBuild.m */,
 				C1AAB8781491629B002C1973 /* CoreData */,
 				83656E6319378FB7003D0E74 /* paintCode */,
 				C1CEFE5C1463779D00466EB3 /* Supporting Files */,
@@ -423,9 +428,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = C1CEFEA81463779D00466EB3 /* Build configuration list for PBXNativeTarget "CoreDataUtil" */;
 			buildPhases = (
+				837C067C1A0E657900F4D5D4 /* Set Build Version */,
 				C1CEFE4D1463779C00466EB3 /* Sources */,
 				C1CEFE4E1463779C00466EB3 /* Frameworks */,
 				C1CEFE4F1463779C00466EB3 /* Resources */,
+				837C067D1A0E659500F4D5D4 /* Reset Build Version */,
 			);
 			buildRules = (
 			);
@@ -484,7 +491,7 @@
 				ORGANIZATIONNAME = "mFluent LLC";
 				TargetAttributes = {
 					C1CEFE501463779C00466EB3 = {
-						DevelopmentTeam = K386ENA6UZ;
+						DevelopmentTeam = WDCGJTU726;
 						SystemCapabilities = {
 							com.apple.InAppPurchase = {
 								enabled = 0;
@@ -554,6 +561,34 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		837C067C1A0E657900F4D5D4 /* Set Build Version */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Set Build Version";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			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";
+		};
+		837C067D1A0E659500F4D5D4 /* Reset Build Version */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Reset Build Version";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "git checkout \"$SRCROOT/CoreDataUtil/MFLBuild.m\"";
+		};
 		C1CEFE731463779D00466EB3 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -578,6 +613,7 @@
 				83656E6919379D0C003D0E74 /* TransformableDataTableViewCell.m in Sources */,
 				83656E6619378FB7003D0E74 /* CoreDataUtilityStyle.m in Sources */,
 				C1CEFE691463779D00466EB3 /* MFLAppDelegate.m in Sources */,
+				837C067B1A0E646600F4D5D4 /* MFLBuild.m in Sources */,
 				C1CEFE6F1463779D00466EB3 /* CoreDataUtil.xcdatamodeld in Sources */,
 				5B2E2AA61565A8AC00F6F6EA /* OpenFileSheetController.m in Sources */,
 				5B2AEF1B1576B67600DFD0D6 /* GetInfoSheetController.m in Sources */,

diff --git a/CoreDataUtil/ObjectInfoController.xib b/CoreDataUtil/ObjectInfoController.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13D65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment defaultVersion="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6250"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="ObjectInfoController">
@@ -12,19 +12,18 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="[Object description]" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" visibleAtLaunch="NO" frameAutosaveName="objectInfoSheet" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="487" height="318"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
             <view key="contentView" id="se5-gp-TjO">
                 <rect key="frame" x="0.0" y="0.0" width="487" height="318"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YRV-af-0PJ">
                         <rect key="frame" x="-1" y="46" width="489" height="273"/>
-                        <autoresizingMask key="autoresizingMask"/>
                         <clipView key="contentView" id="7ma-4c-bzs">
                             <rect key="frame" x="1" y="1" width="487" height="271"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -61,7 +60,6 @@
                     </scrollView>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TB8-ni-Abc">
                         <rect key="frame" x="391" y="3" width="82" height="32"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="21" id="3tv-X5-B1x"/>
                             <constraint firstAttribute="width" constant="70" id="Hhf-va-SqT"/>

diff --git a/CoreDataUtil/OpenFileSheetController.xib b/CoreDataUtil/OpenFileSheetController.xib
@@ -322,7 +322,7 @@ Gw
                                                 <rect key="frame" x="1" y="1" width="148" height="398"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <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">
+                                                    <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">
                                                         <autoresizingMask key="autoresizingMask"/>
                                                         <size key="intercellSpacing" width="3" height="2"/>
                                                         <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>

diff --git a/CoreDataUtil/en.lproj/Credits.rtf b/CoreDataUtil/en.lproj/Credits.rtf
@@ -1,20 +1,9 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf470
+{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf140
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
 \vieww9600\viewh8400\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
 \f0\b\fs24 \cf0 \
-Learn More\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
-
-\b0 \cf0 	{\field{\*\fldinst{HYPERLINK "http://mfluent.com/services"}}{\fldrslt http://mfluent.com/services}}
-\b \
-
-\b0 	{\field{\*\fldinst{HYPERLINK "http://fluentfactory.com/"}}{\fldrslt http://fluentfactory.com/}}
-\b \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
-
-\b0 \cf0 \
-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 [email protected]. We especially want to talk to you if you develop for iOS, Android and/or OSX.\
+\
 }