Speed up compiling

Instead of putting auto-genereted .h into briding header for swift code, make a swift filel with the same info. This prevents XCode from needing to compile all swift code on each build for the app target since the bridinging header changes effect all swift compilatoin.
Provenance-Emu · May 19, 2018 · 4d1712d · 4d1712d
1 parent 0015e55
commit 4d1712d
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ build
 xcuserdata
 *.mode1v3
 /Provenance/Version.h
+/Provenance/Version.swift
diff --git a/Provenance-Bridging-Header.h b/Provenance-Bridging-Header.h
@@ -9,7 +9,7 @@
 #import "OESQLiteDatabase.h"
 #import "LzmaSDKObjCReader.h"
 #import "SSZipArchive.h"
-#import "Provenance/Version.h"
+//#import "Provenance/Version.h"
 #import <Realm/Realm.h>
 // Hack cause they can't make modules for some reason
 #import <ProSystem/ProSystemGameCore.h>

diff --git a/Provenance.xcodeproj/project.pbxproj b/Provenance.xcodeproj/project.pbxproj
@@ -660,6 +660,10 @@
 		B3CF44CB203B6589005BEB14 /* PViCadeControllerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4F9369C1B50BF3B009403C5 /* PViCadeControllerViewController.swift */; };
 		B3D2E39B1D6E8BCD0058544D /* PVSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B32F46331D6A8BD70085BA9F /* PVSupport.framework */; };
 		B3D2E39C1D6E8BCD0058544D /* PVSupport.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B32F46331D6A8BD70085BA9F /* PVSupport.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		B3D534E220AFF21900A83D4E /* Version.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3D534E120AFF21800A83D4E /* Version.swift */; };
+		B3D534E320AFF21900A83D4E /* Version.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3D534E120AFF21800A83D4E /* Version.swift */; };
+		B3D534E420AFF21900A83D4E /* Version.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3D534E120AFF21800A83D4E /* Version.swift */; };
+		B3D534E520AFF21900A83D4E /* Version.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3D534E120AFF21800A83D4E /* Version.swift */; };
 		B3D8DC6B206EA6D3008FAC42 /* Realm.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3D8DC66206EA6BD008FAC42 /* Realm.framework */; };
 		B3D8DC6D206EA6E9008FAC42 /* Realm.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3D8DC62206EA6BC008FAC42 /* Realm.framework */; };
 		B3D8DC6F206EA6F5008FAC42 /* Realm.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3D8DC62206EA6BC008FAC42 /* Realm.framework */; };
@@ -1501,6 +1505,7 @@
 		B3CB85C11E9BFB16009155A6 /* PVPokeMini.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PVPokeMini.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B3CB85C61E9BFBA1009155A6 /* PVPokeMiniControllerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PVPokeMiniControllerViewController.swift; sourceTree = "<group>"; };
 		B3D2E3901D6E8B3C0058544D /* PV32XControllerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PV32XControllerViewController.swift; sourceTree = "<group>"; };
+		B3D534E120AFF21800A83D4E /* Version.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Version.swift; sourceTree = "<group>"; };
 		B3D8DC5A206EA681008FAC42 /* PVFCEU.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = PVFCEU.framework; sourceTree = "<group>"; };
 		B3D8DC5E206EA682008FAC42 /* PVMupen64PlusVideoGlideN64.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = PVMupen64PlusVideoGlideN64.framework; sourceTree = "<group>"; };
 		B3D8DC5F206EA682008FAC42 /* PVMednafen.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PVMednafen.framework; path = "../../../Library/Developer/Xcode/DerivedData/Provenance-dxxctpxdxguofwbxweirtnyaiucn/Build/Products/Release-iphoneos/PVMednafen.framework"; sourceTree = "<group>"; };
@@ -1849,6 +1854,7 @@
 				1A3D40A517B2DCE4004DFFFC /* Provenance-Prefix.pch */,
 				1A0938B917CD45D400029021 /* README.mdown */,
 				1F8D52471D91993000C29F90 /* licenses.html */,
+				B3D534E120AFF21800A83D4E /* Version.swift */,
 				B35B31CA206CA04A00AEAF88 /* Version.h */,
 			);
 			name = "Supporting Files";
@@ -3448,6 +3454,7 @@
 				B35E6C2F207ED7050040709A /* AppearanceStyle.swift in Sources */,
 				B35E6C27207ED7050040709A /* AppearanceStyleable.swift in Sources */,
 				B349AE971E9ABCF900ACD416 /* 7zExtract.cpp in Sources */,
+				B3D534E220AFF21900A83D4E /* Version.swift in Sources */,
 				B349AECF1E9ABCF900ACD416 /* InBuffer.cpp in Sources */,
 				B3D8DD3C206EAA9E008FAC42 /* List.swift in Sources */,
 				B349AE531E9ABCF900ACD416 /* AesOpt.c in Sources */,
@@ -3671,6 +3678,7 @@
 				B3E3B5DA202ED84100A11871 /* PVGameLibraryViewController.swift in Sources */,
 				B349AF481E9ABCF900ACD416 /* PropVariant.cpp in Sources */,
 				B349AE601E9ABCF900ACD416 /* BraIA64.c in Sources */,
+				B3D534E320AFF21900A83D4E /* Version.swift in Sources */,
 				B349AEEC1E9ABCF900ACD416 /* VirtThread.cpp in Sources */,
 				1AD481EE1BA3548800FDA50A /* MBProgressHUD.m in Sources */,
 				B349AE661E9ABCF900ACD416 /* LzFind.c in Sources */,
@@ -3960,6 +3968,7 @@
 				B3D8DD17206EAA9E008FAC42 /* SortDescriptor.swift in Sources */,
 				B3D8DCFF206EAA9E008FAC42 /* Schema.swift in Sources */,
 				B3BE968B2055F41A00281880 /* PVBIOS.swift in Sources */,
+				B3D534E520AFF21900A83D4E /* Version.swift in Sources */,
 				B3D8DD0B206EAA9E008FAC42 /* Realm.swift in Sources */,
 				B3D8DD07206EAA9E008FAC42 /* ObjectiveCSupport.swift in Sources */,
 				B3780B402057F1F70018211E /* PVCore.swift in Sources */,
@@ -3980,6 +3989,7 @@
 				B3D8DD12206EAA9E008FAC42 /* RealmCollection.swift in Sources */,
 				B3D8DD2E206EAA9E008FAC42 /* Aliases.swift in Sources */,
 				B3D8DD02206EAA9E008FAC42 /* Util.swift in Sources */,
+				B3D534E420AFF21900A83D4E /* Version.swift in Sources */,
 				B3D8DD22206EAA9E008FAC42 /* Optional.swift in Sources */,
 				B3D8DD1E206EAA9E008FAC42 /* ObjectSchema.swift in Sources */,
 				B35BB7FD202F3F2200FCB513 /* PVGame.swift in Sources */,

diff --git a/Provenance/Resources/createVersionHeader.sh b/Provenance/Resources/createVersionHeader.sh
@@ -45,6 +45,10 @@ if [ "command -v $PLISTBUDDY" ] ; then
         ## Read the app version (x.y.z) from the PList
         appversion=$($PLISTBUDDY -c "Print :CFBundleShortVersionString" "${INFOPATH}")
         echo "appversion=${appversion}"
+
+#        if [ "$x" = "Debug" ]; then
+#          appversion=$($PLISTBUDDY -c "Print :CFBundleShortVersionString" "${INFOPATH}")
+#        fi
     else
         error_exit "${INFOPATH} not found"
     fi
@@ -117,5 +121,44 @@ static const char* compiledate          = __DATE__;
 
 EOF
 
+echo "Creating Version.swift in" ${PROJECT_DIR}
+
+cat <<EOF > "${PROJECT_DIR}/Provenance/Version.swift"
+
+// Do not edit!  This file was autogenerated
+//      by $0
+//      on $NOW
+//      user $VERSION_INFO_BUILDER
+//      for build target ${TARGET_NAME}
+//
+// gitrevision and gitdate are as reported by git at that point in time,
+// compiledate and compiletime are being filled gcc at compilation
+
+public let kAppVersion : String = "${appversion}"
+public let kGITRevisionNumber : String = "${GIT_COMMIT_COUNT}"
+public let kGITTag : String = "${GIT_TAG}"
+public let kGITDate : String = "${GIT_DATE}"
+public let kGITBranch : String = "${GIT_BRANCH}"
+public let kAppBuildConfiguration : String  = "${CONFIGURATION}"
+
+
+public let gitrevision          = "${GIT_COMMIT_COUNT}"
+public let gittag               = "${GIT_TAG}"
+public let gitdate              = "${GIT_DATE}"
+public let gitbranch            = "${GIT_BRANCH}"
+public let appversion           = "${appversion}"
+public let buildconfiguration   = "${CONFIGURATION}"
+// public let compiletime          = __TIME__
+// public let compiledate          = __DATE__
+
+// Diagnostic info
+/*
+    Info.plist path:${INFOPATH}
+    PWD : ${PWD}
+    XCode version ${XCODE_PRODUCT_BUILD_VERSION}
+    PATH : ${PATH}
+*/
+
+EOF
 ##
 #echo "$REV2" > ${PROJECT_DIR}/SvnRevision.txt
diff --git a/Provenance/User Interface/Themes/SwiftyAppearance/AppearanceStyleExtensions.swift b/Provenance/User Interface/Themes/SwiftyAppearance/AppearanceStyleExtensions.swift
@@ -8,7 +8,7 @@
 
 import UIKit
 
-@IBDesignable
+//@IBDesignable
 public extension UIView {
 
     @IBInspectable public var appearanceStyleName: String {
@@ -31,7 +31,7 @@ public extension UIView {
     }
 }
 
-@IBDesignable
+//@IBDesignable
 public extension UIViewController {
 
     @IBInspectable public var appearanceStyleName: String {

diff --git a/ProvenanceTV-Bridging-Header.h b/ProvenanceTV-Bridging-Header.h
@@ -10,7 +10,7 @@
 #import "kICadeControllerSetting.h"
 #import "LzmaSDKObjCReader.h"
 #import "SSZipArchive.h"
-#import "Provenance/Version.h"
+//#import "Provenance/Version.h"
 
 // -----------------------------------------------------------------------------
 // Begin Swiftify generated imports