Skip to content

Commit

Permalink
Merge pull request #16 from jasonjmcghee/official-build
Browse files Browse the repository at this point in the history 
Signing managed by apple and seems to be working
  • Loading branch information
@jasonjmcghee
jasonjmcghee authored Dec 29, 2023
2 parents d34aa69 + 9ab03d3 commit c58504e
Show file tree
Hide file tree
Showing 6 changed files with 174 additions and 23 deletions.
16 changes: 16 additions & 0 deletions ffmpegX/ffmpegX.entitlements
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.temporary-exception.files.absolute-path.read-only</key>
<array>
<string>/usr/lib/libSystem.B.dylib</string>
<string>/usr/lib/libz.1.dylib</string>
<string>/usr/lib/libiconv.2.dylib</string>
</array>
<key>com.apple.security.inherit</key>
<true/>
</dict>
</plist>
11 changes: 11 additions & 0 deletions ffmpegX/main.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// main.swift
// ffmpegX
//
// Created by Jason McGhee on 12/29/23.
//

import Foundation

print("Hello, World!")

146 changes: 135 additions & 11 deletions rem.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
96B0DA3A2B3A08280030E8AE /* TextMerger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96B0DA392B3A08280030E8AE /* TextMerger.swift */; };
96B0DA3D2B3A87110030E8AE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 961C95DD2B2E19B40093F228 /* Assets.xcassets */; };
96DBA3182B3E7D3B0000CFBE /* SQLite.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 96E66BC32B2F5745006E1E97 /* SQLite.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
96DBA31C2B3E991B0000CFBE /* ffmpeg in Resources */ = {isa = PBXBuildFile; fileRef = 961C960D2B2E73840093F228 /* ffmpeg */; };
96DBA3362B3F29C40000CFBE /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DBA3352B3F29C40000CFBE /* main.swift */; };
96DBA33D2B3F2AC30000CFBE /* ffmpeg in Embed Helper Tools */ = {isa = PBXBuildFile; fileRef = 961C960D2B2E73840093F228 /* ffmpeg */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
96F062182B35111D00695621 /* Search.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F062172B35111D00695621 /* Search.swift */; };
/* End PBXBuildFile section */

Expand All @@ -44,6 +45,13 @@
remoteGlobalIDString = 961C95D52B2E19B30093F228;
remoteInfo = rem;
};
96DBA33B2B3F2A970000CFBE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 961C95CE2B2E19B30093F228 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 96DBA3322B3F29C30000CFBE;
remoteInfo = ffmpegX;
};
96E66BBE2B2F5745006E1E97 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 96E66BB42B2F5745006E1E97 /* SQLite.xcodeproj */;
Expand Down Expand Up @@ -145,13 +153,15 @@
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
961C96092B2E71AB0093F228 /* CopyFiles */ = {
961C96092B2E71AB0093F228 /* Embed Helper Tools */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 6;
files = (
96DBA33D2B3F2AC30000CFBE /* ffmpeg in Embed Helper Tools */,
);
name = "Embed Helper Tools";
runOnlyForDeploymentPostprocessing = 0;
};
969F3F062B3B70570085787B /* Embed Frameworks */ = {
Expand All @@ -165,6 +175,16 @@
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
96DBA3312B3F29C30000CFBE /* Copy Files */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = /usr/share/man/man1/;
dstSubfolderSpec = 0;
files = (
);
name = "Copy Files";
runOnlyForDeploymentPostprocessing = 1;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
Expand All @@ -189,6 +209,9 @@
969F3F0C2B3CCEC30085787B /* Ask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Ask.swift; sourceTree = "<group>"; };
96B0DA372B3A02530030E8AE /* ClipboardManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClipboardManager.swift; sourceTree = "<group>"; };
96B0DA392B3A08280030E8AE /* TextMerger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextMerger.swift; sourceTree = "<group>"; };
96DBA3332B3F29C40000CFBE /* ffmpegX */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ffmpegX; sourceTree = BUILT_PRODUCTS_DIR; };
96DBA3352B3F29C40000CFBE /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
96DBA33E2B3F2AFF0000CFBE /* ffmpegX.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ffmpegX.entitlements; sourceTree = "<group>"; };
96E66BB42B2F5745006E1E97 /* SQLite.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SQLite.xcodeproj; path = ./SQLite.swift/SQLite.xcodeproj; sourceTree = "<group>"; };
96E66BCC2B2F574D006E1E97 /* SQLite.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SQLite.xcodeproj; path = ./SQLite.swift/SQLite.xcodeproj; sourceTree = "<group>"; };
96F062172B35111D00695621 /* Search.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -218,6 +241,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
96DBA3302B3F29C30000CFBE /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
Expand All @@ -229,6 +259,7 @@
961C95D82B2E19B30093F228 /* rem */,
961C95EA2B2E19B40093F228 /* remTests */,
961C95F42B2E19B40093F228 /* remUITests */,
96DBA3342B3F29C40000CFBE /* ffmpegX */,
961C95D72B2E19B30093F228 /* Products */,
96E66BE42B2F5781006E1E97 /* Frameworks */,
);
Expand All @@ -240,6 +271,7 @@
961C95D62B2E19B30093F228 /* rem.app */,
961C95E72B2E19B40093F228 /* remTests.xctest */,
961C95F12B2E19B40093F228 /* remUITests.xctest */,
96DBA3332B3F29C40000CFBE /* ffmpegX */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -300,6 +332,15 @@
path = Resources;
sourceTree = "<group>";
};
96DBA3342B3F29C40000CFBE /* ffmpegX */ = {
isa = PBXGroup;
children = (
96DBA33E2B3F2AFF0000CFBE /* ffmpegX.entitlements */,
96DBA3352B3F29C40000CFBE /* main.swift */,
);
path = ffmpegX;
sourceTree = "<group>";
};
96E66BB52B2F5745006E1E97 /* Products */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -342,7 +383,7 @@
isa = PBXNativeTarget;
buildConfigurationList = 961C95FB2B2E19B40093F228 /* Build configuration list for PBXNativeTarget "rem" */;
buildPhases = (
961C96092B2E71AB0093F228 /* CopyFiles */,
961C96092B2E71AB0093F228 /* Embed Helper Tools */,
961C95D22B2E19B30093F228 /* Sources */,
961C95D32B2E19B30093F228 /* Frameworks */,
961C95D42B2E19B30093F228 /* Resources */,
Expand All @@ -351,6 +392,7 @@
buildRules = (
);
dependencies = (
96DBA33C2B3F2A970000CFBE /* PBXTargetDependency */,
);
name = rem;
packageProductDependencies = (
Expand Down Expand Up @@ -396,14 +438,31 @@
productReference = 961C95F12B2E19B40093F228 /* remUITests.xctest */;
productType = "com.apple.product-type.bundle.ui-testing";
};
96DBA3322B3F29C30000CFBE /* ffmpegX */ = {
isa = PBXNativeTarget;
buildConfigurationList = 96DBA3372B3F29C40000CFBE /* Build configuration list for PBXNativeTarget "ffmpegX" */;
buildPhases = (
96DBA32F2B3F29C30000CFBE /* Sources */,
96DBA3302B3F29C30000CFBE /* Frameworks */,
96DBA3312B3F29C30000CFBE /* Copy Files */,
);
buildRules = (
);
dependencies = (
);
name = ffmpegX;
productName = ffmpegX;
productReference = 96DBA3332B3F29C40000CFBE /* ffmpegX */;
productType = "com.apple.product-type.tool";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
961C95CE2B2E19B30093F228 /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = 1;
LastSwiftUpdateCheck = 1410;
LastSwiftUpdateCheck = 1510;
LastUpgradeCheck = 1410;
TargetAttributes = {
961C95D52B2E19B30093F228 = {
Expand All @@ -417,6 +476,9 @@
CreatedOnToolsVersion = 14.1;
TestTargetID = 961C95D52B2E19B30093F228;
};
96DBA3322B3F29C30000CFBE = {
CreatedOnToolsVersion = 15.1;
};
};
};
buildConfigurationList = 961C95D12B2E19B30093F228 /* Build configuration list for PBXProject "rem" */;
Expand Down Expand Up @@ -448,6 +510,7 @@
961C95D52B2E19B30093F228 /* rem */,
961C95E62B2E19B40093F228 /* remTests */,
961C95F02B2E19B40093F228 /* remUITests */,
96DBA3322B3F29C30000CFBE /* ffmpegX */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -558,7 +621,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
96DBA31C2B3E991B0000CFBE /* ffmpeg in Resources */,
961C95E12B2E19B40093F228 /* Preview Assets.xcassets in Resources */,
96B0DA3D2B3A87110030E8AE /* Assets.xcassets in Resources */,
);
Expand Down Expand Up @@ -616,6 +678,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
96DBA32F2B3F29C30000CFBE /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
96DBA3362B3F29C40000CFBE /* main.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
Expand All @@ -629,6 +699,11 @@
target = 961C95D52B2E19B30093F228 /* rem */;
targetProxy = 961C95F22B2E19B40093F228 /* PBXContainerItemProxy */;
};
96DBA33C2B3F2A970000CFBE /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 96DBA3322B3F29C30000CFBE /* ffmpegX */;
targetProxy = 96DBA33B2B3F2A970000CFBE /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
Expand Down Expand Up @@ -765,12 +840,11 @@
CODE_SIGN_ENTITLEMENTS = rem/rem.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"rem/Preview Content\"";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=macosx*]" = XK2A33Z623;
DEVELOPMENT_TEAM = XK2A33Z623;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
Expand Down Expand Up @@ -802,12 +876,11 @@
CODE_SIGN_ENTITLEMENTS = rem/rem.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"rem/Preview Content\"";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=macosx*]" = XK2A33Z623;
DEVELOPMENT_TEAM = XK2A33Z623;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
Expand Down Expand Up @@ -903,6 +976,48 @@
};
name = Release;
};
96DBA3382B3F29C40000CFBE /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CODE_SIGN_ENTITLEMENTS = ffmpegX/ffmpegX.entitlements;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = XK2A33Z623;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACOSX_DEPLOYMENT_TARGET = 14.2;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = today.jason.rem.ffmpegX;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
SWIFT_VERSION = 5.0;
};
name = Debug;
};
96DBA3392B3F29C40000CFBE /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CODE_SIGN_ENTITLEMENTS = ffmpegX/ffmpegX.entitlements;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = XK2A33Z623;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACOSX_DEPLOYMENT_TARGET = 14.2;
PRODUCT_BUNDLE_IDENTIFIER = today.jason.rem.ffmpegX;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
Expand Down Expand Up @@ -942,6 +1057,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
96DBA3372B3F29C40000CFBE /* Build configuration list for PBXNativeTarget "ffmpegX" */ = {
isa = XCConfigurationList;
buildConfigurations = (
96DBA3382B3F29C40000CFBE /* Debug */,
96DBA3392B3F29C40000CFBE /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
Expand Down
13 changes: 9 additions & 4 deletions rem.xcodeproj/xcuserdata/jason.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,31 @@
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>2</integer>
<integer>6</integer>
</dict>
<key>SQLite (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>3</integer>
<integer>7</integer>
</dict>
<key>SQLite (Playground).xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>1</integer>
<integer>5</integer>
</dict>
<key>ffmpegX.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>8</integer>
</dict>
<key>rem.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
<integer>4</integer>
</dict>
</dict>
</dict>
Expand Down
4 changes: 1 addition & 3 deletions rem/rem.entitlements
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
<plist version="1.0">
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.files.user-selected.read-only</key>
<true/>
<key>com.apple.security.inherit</key>
<key>com.apple.security.files.user-selected.read-only</key>
<true/>
</dict>
</plist>
Loading

0 comments on commit c58504e

Please sign in to comment.