Fixed packaging issues.

bradhowes · Apr 1, 2024 · de619db · de619db
1 parent 59e7987
commit de619db
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 33 deletions.
diff --git a/...tInfoLib/SoundFontInfoLibTests/Info.plist → SoundFontInfoLib/Info.plist b/...tInfoLib/SoundFontInfoLibTests/Info.plist → SoundFontInfoLib/Info.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
 </plist>
diff --git a/SoundFontInfoLib/SoundFontInfoLib.xcodeproj/project.pbxproj b/SoundFontInfoLib/SoundFontInfoLib.xcodeproj/project.pbxproj
@@ -7,11 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		BD2398A32BBB65D5009265E4 /* SF2Files.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD9C8A272A8AC2DC0055A95C /* SF2Files.framework */; };
 		BD6791622973622C0055BB38 /* FourCharCode.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD6791612973622C0055BB38 /* FourCharCode.swift */; };
 		BD74D17123CDB1D200204ED4 /* SoundFontInfoLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD74D16723CDB1D200204ED4 /* SoundFontInfoLib.framework */; };
 		BD9C8A262A8A68C20055A95C /* SF2Lib in Frameworks */ = {isa = PBXBuildFile; productRef = BD9C8A252A8A68C20055A95C /* SF2Lib */; };
-		BD9C8A282A8AC2DC0055A95C /* SF2Files.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD9C8A272A8AC2DC0055A95C /* SF2Files.framework */; };
-		BD9C8A292A8AC2DC0055A95C /* SF2Files.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BD9C8A272A8AC2DC0055A95C /* SF2Files.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		BDB1BF9E265DB1F0002AD159 /* SoundFontInfoLib.h in Headers */ = {isa = PBXBuildFile; fileRef = BDB1BF40265DB1F0002AD159 /* SoundFontInfoLib.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BDB1BFF0265DB1F1002AD159 /* SoundFontInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = BDB1BF9C265DB1F0002AD159 /* SoundFontInfo.mm */; };
 		BDB1BFF1265DB788002AD159 /* SoundFontInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BDB1BF95265DB1F0002AD159 /* SoundFontInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -33,20 +32,6 @@
 		};
 /* End PBXContainerItemProxy section */
 
-/* Begin PBXCopyFilesBuildPhase section */
-		BD9C8A2A2A8AC2DC0055A95C /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				BD9C8A292A8AC2DC0055A95C /* SF2Files.framework in Embed Frameworks */,
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
 /* Begin PBXFileReference section */
 		BD250BA82615A45E00D1C1E0 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
 		BD6791612973622C0055BB38 /* FourCharCode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FourCharCode.swift; sourceTree = "<group>"; };
@@ -72,7 +57,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BD9C8A282A8AC2DC0055A95C /* SF2Files.framework in Frameworks */,
+				BD2398A32BBB65D5009265E4 /* SF2Files.framework in Frameworks */,
 				BD9C8A262A8A68C20055A95C /* SF2Lib in Frameworks */,
 				BDFA98F3280C73280069A46F /* AudioToolbox.framework in Frameworks */,
 				BDD2D6AB261C8854000557A3 /* Accelerate.framework in Frameworks */,
@@ -95,6 +80,7 @@
 		BD74D15D23CDB1D200204ED4 = {
 			isa = PBXGroup;
 			children = (
+				BDB1BE74265DAEC7002AD159 /* Info.plist */,
 				BD250BA82615A45E00D1C1E0 /* README.md */,
 				BD8CE57127C53F67009A2FB5 /* Development.xcconfig */,
 				BD8CE57027C53F67009A2FB5 /* Release.xcconfig */,
@@ -120,7 +106,6 @@
 		BDB1BE56265DAEC6002AD159 /* SoundFontInfoLibTests */ = {
 			isa = PBXGroup;
 			children = (
-				BDB1BE74265DAEC7002AD159 /* Info.plist */,
 				BDE99B6927BF959800C9F1BC /* NewTestTemplate.mm */,
 				BDB1BE57265DAEC6002AD159 /* SoundFontInfoLibTests.swift */,
 			);
@@ -162,7 +147,6 @@
 				BD74D16323CDB1D200204ED4 /* Sources */,
 				BD74D16423CDB1D200204ED4 /* Frameworks */,
 				BD74D16523CDB1D200204ED4 /* Resources */,
-				BD9C8A2A2A8AC2DC0055A95C /* Embed Frameworks */,
 			);
 			buildRules = (
 			);

diff --git a/SoundFontInfoLib/SoundFontInfoLib/Info.plist b/SoundFontInfoLib/SoundFontInfoLib/Info.plist
@@ -14,6 +14,8 @@
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>SF2EngineAUVoiceCount</key>

diff --git a/SoundFontsApp/SoundFontsApp.xcodeproj/project.pbxproj b/SoundFontsApp/SoundFontsApp.xcodeproj/project.pbxproj
@@ -8,18 +8,18 @@
 
 /* Begin PBXBuildFile section */
 		BD05838023E4C52800E094E0 /* SoundFonts.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = BD05836223E4C52800E094E0 /* SoundFonts.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		BD0FAC2E251F694B00EEF187 /* SF2Files.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD0FAC2D251F694B00EEF187 /* SF2Files.framework */; };
-		BD0FAC2F251F694B00EEF187 /* SF2Files.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BD0FAC2D251F694B00EEF187 /* SF2Files.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		BD137514240A9CDB007584BB /* SoundFontsAUViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD137513240A9CDA007584BB /* SoundFontsAUViewController.swift */; };
 		BD1A2A91266A00F2009E2338 /* ScreenShots.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD1A2A8D266A0050009E2338 /* ScreenShots.swift */; };
 		BD21CB3A266A6ECE00D4193C /* SnapshotHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD21CB38266A6EC400D4193C /* SnapshotHelper.swift */; };
+		BD2398A62BBB6653009265E4 /* SF2Files.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD0FAC2D251F694B00EEF187 /* SF2Files.framework */; };
+		BD2398A72BBB6653009265E4 /* SF2Files.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BD0FAC2D251F694B00EEF187 /* SF2Files.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		BD2398A82BBB6658009265E4 /* SoundFontInfoLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD50C7B223D4793F0019EF15 /* SoundFontInfoLib.framework */; };
+		BD2398A92BBB6658009265E4 /* SoundFontInfoLib.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BD50C7B223D4793F0019EF15 /* SoundFontInfoLib.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		BD498F9C23F0101300755AB9 /* SoundFontsFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD50C7AF23D479390019EF15 /* SoundFontsFramework.framework */; };
 		BD498F9F23F0101700755AB9 /* SoundFontInfoLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD50C7B223D4793F0019EF15 /* SoundFontInfoLib.framework */; };
 		BD498FA423F07AFC00755AB9 /* VolumeMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD498FA323F07AFC00755AB9 /* VolumeMonitor.swift */; };
 		BD50C7B023D479390019EF15 /* SoundFontsFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD50C7AF23D479390019EF15 /* SoundFontsFramework.framework */; };
 		BD50C7B123D479390019EF15 /* SoundFontsFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BD50C7AF23D479390019EF15 /* SoundFontsFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		BD50C7B323D4793F0019EF15 /* SoundFontInfoLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD50C7B223D4793F0019EF15 /* SoundFontInfoLib.framework */; };
-		BD50C7B423D4793F0019EF15 /* SoundFontInfoLib.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BD50C7B223D4793F0019EF15 /* SoundFontInfoLib.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		BD50D34825D7747E00375455 /* SoundFontInfoLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD50D34725D7747E00375455 /* SoundFontInfoLib.framework */; };
 		BD50D34A25D7749100375455 /* SoundFontInfoLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD50D34925D7749100375455 /* SoundFontInfoLib.framework */; };
 		BD58B0902567F29900181F2B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BDA0FC3123C73578005BEFD5 /* Assets.xcassets */; };
@@ -91,9 +91,9 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				BD0FAC2F251F694B00EEF187 /* SF2Files.framework in Embed Frameworks */,
+				BD2398A92BBB6658009265E4 /* SoundFontInfoLib.framework in Embed Frameworks */,
+				BD2398A72BBB6653009265E4 /* SF2Files.framework in Embed Frameworks */,
 				BD50C7B123D479390019EF15 /* SoundFontsFramework.framework in Embed Frameworks */,
-				BD50C7B423D4793F0019EF15 /* SoundFontInfoLib.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -205,8 +205,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BD0FAC2E251F694B00EEF187 /* SF2Files.framework in Frameworks */,
-				BD50C7B323D4793F0019EF15 /* SoundFontInfoLib.framework in Frameworks */,
+				BD2398A62BBB6653009265E4 /* SF2Files.framework in Frameworks */,
+				BD2398A82BBB6658009265E4 /* SoundFontInfoLib.framework in Frameworks */,
 				BD50C7B023D479390019EF15 /* SoundFontsFramework.framework in Frameworks */,
 				BD874C94221A228E00BBD00B /* AudioToolbox.framework in Frameworks */,
 			);

diff --git a/SoundFontsFramework/SoundFontsFramework.xcodeproj/project.pbxproj b/SoundFontsFramework/SoundFontsFramework.xcodeproj/project.pbxproj
@@ -68,7 +68,6 @@
 		BD074C9023CDAF51001987E9 /* SegueHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD074C3B23CDAF51001987E9 /* SegueHandler.swift */; };
 		BD0E20192555701B00D36607 /* TouchKeyMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD0E20182555701B00D36607 /* TouchKeyMap.swift */; };
 		BD0F940B25728E610065C147 /* MIDIEventRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD0F940A25728E610065C147 /* MIDIEventRouter.swift */; };
-		BD0FAC2A251F692000EEF187 /* SF2Files.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD0FAC29251F692000EEF187 /* SF2Files.framework */; };
 		BD0FAC802523CAEC00EEF187 /* UIContextualAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD0FAC7F2523CAEC00EEF187 /* UIContextualAction.swift */; };
 		BD1232D9252B029F00F80056 /* SoundFontInfoLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD1232D8252B029F00F80056 /* SoundFontInfoLib.framework */; };
 		BD125B38241006200003DE99 /* AskForReview.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD125B37241006200003DE99 /* AskForReview.swift */; };
@@ -103,6 +102,8 @@
 		BD1F11BC23FE690300AE9F3D /* UIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD1F11BB23FE690300AE9F3D /* UIViewController.swift */; };
 		BD239486255213CB004E5E0D /* KeyParamSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD239485255213CB004E5E0D /* KeyParamSequence.swift */; };
 		BD23948A25540855004E5E0D /* KeyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD23948925540855004E5E0D /* KeyTests.swift */; };
+		BD23989D2BBB6379009265E4 /* SoundFontInfoLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD74D18A23CDB4C000204ED4 /* SoundFontInfoLib.framework */; };
+		BD2398A02BBB6399009265E4 /* SF2Files.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD0FAC29251F692000EEF187 /* SF2Files.framework */; };
 		BD2436B02579356200162A49 /* ArrowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD2436AF2579356200162A49 /* ArrowView.swift */; };
 		BD2454D8278474E3004B445A /* SoundFontAndPresetTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD2454D7278474E3004B445A /* SoundFontAndPresetTests.swift */; };
 		BD27E987251605CD00591FD0 /* ActivePresetKind.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD27E986251605CD00591FD0 /* ActivePresetKind.swift */; };
@@ -155,7 +156,6 @@
 		BD6EEA49251E4F3C00253D96 /* DecodableDefault.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD6EEA48251E4F3C00253D96 /* DecodableDefault.swift */; };
 		BD79915425795D2000943515 /* iPhone 12.png in Resources */ = {isa = PBXBuildFile; fileRef = BD79915325795D2000943515 /* iPhone 12.png */; };
 		BD7B7C492660D4AF00F0D18D /* TagTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7B7C482660D4AF00F0D18D /* TagTests.swift */; };
-		BD8114A624F13A830033737F /* SoundFontInfoLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD74D18A23CDB4C000204ED4 /* SoundFontInfoLib.framework */; };
 		BD87DC5C29DB526E008F6470 /* MIDIConnectionsTableHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD87DC5B29DB526E008F6470 /* MIDIConnectionsTableHeaderView.swift */; };
 		BD87DC5E29DB5528008F6470 /* MIDIConnectionsTableCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BD87DC5D29DB5528008F6470 /* MIDIConnectionsTableCell.xib */; };
 		BD87DC6029DB55ED008F6470 /* MIDIConnectionsTableHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BD87DC5F29DB55ED008F6470 /* MIDIConnectionsTableHeaderView.xib */; };
@@ -553,12 +553,12 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BD0FAC2A251F692000EEF187 /* SF2Files.framework in Frameworks */,
 				BD05DFF22BB9BECE008FFA34 /* ProgressHUD in Frameworks */,
 				BDA52C1A277CB72F0010BBF1 /* DictionaryCoder in Frameworks */,
+				BD2398A02BBB6399009265E4 /* SF2Files.framework in Frameworks */,
 				BD3CADD329D8644D008C957D /* MorkAndMIDI in Frameworks */,
+				BD23989D2BBB6379009265E4 /* SoundFontInfoLib.framework in Frameworks */,
 				BDF1C0E02787675600E451C3 /* Tagged in Frameworks */,
-				BD8114A624F13A830033737F /* SoundFontInfoLib.framework in Frameworks */,
 				BDFD3E4729E420CF0010E3CB /* Checkbox in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;