Skip to content

Commit

Permalink
Remove Carthage references
Browse files Browse the repository at this point in the history
  • Loading branch information
@dnicolson
dnicolson committed Aug 11, 2021
1 parent d75011a commit 881a6a0
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 213 deletions.
6 changes: 0 additions & 6 deletions Cores/Mednafen/PVMednafen.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11722,7 +11722,6 @@
ENABLE_NS_ASSERTIONS = NO;
FRAMEWORK_SEARCH_PATHS = (
"\"$(SRCROOT)/mednafen/src\"",
"\"$(SRCROOT)/../../Carthage/Build/iOS\"",
);
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
Expand Down Expand Up @@ -11786,7 +11785,6 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/mednafen/src\"",
"\"$(SRCROOT)/../../Carthage/Build/tvOS\"",
);
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
Expand Down Expand Up @@ -16039,7 +16037,6 @@
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = (
"\"$(SRCROOT)/mednafen/src\"",
"\"$(SRCROOT)/../../Carthage/Build/iOS\"",
);
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
Expand Down Expand Up @@ -16105,7 +16102,6 @@
ENABLE_NS_ASSERTIONS = NO;
FRAMEWORK_SEARCH_PATHS = (
"\"$(SRCROOT)/mednafen/src\"",
"\"$(SRCROOT)/../../Carthage/Build/iOS\"",
);
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
Expand Down Expand Up @@ -16170,7 +16166,6 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/mednafen/src\"",
"\"$(SRCROOT)/../../Carthage/Build/tvOS\"",
);
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
Expand Down Expand Up @@ -16234,7 +16229,6 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/mednafen/src\"",
"\"$(SRCROOT)/../../Carthage/Build/tvOS\"",
);
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
Expand Down
5 changes: 0 additions & 5 deletions PVLibrary/PVLibrary.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,6 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
09B0C6A0267EF540008180A1 /* RxRelay.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxRelay.xcframework; path = ../Carthage/Build/RxRelay.xcframework; sourceTree = "<group>"; };
112E7E2E247EF3840050431C /* PVGameLibrary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PVGameLibrary.swift; sourceTree = "<group>"; };
1180B31D2492A9B400636C8A /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/CoreServices.framework; sourceTree = DEVELOPER_DIR; };
1180B31F2492A9C200636C8A /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS13.4.sdk/System/Library/Frameworks/CoreServices.framework; sourceTree = DEVELOPER_DIR; };
Expand All @@ -462,7 +461,6 @@
B3274E7D2106BD7500857F52 /* NSFileManager+Hashing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSFileManager+Hashing.h"; sourceTree = "<group>"; };
B3274E832106BF2F00857F52 /* PVImageFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PVImageFile.swift; sourceTree = "<group>"; };
B3274E852106BFD000857F52 /* ImportCandidateFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImportCandidateFile.swift; sourceTree = "<group>"; };
B336B90726B39AC200960A81 /* RxRealm.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxRealm.xcframework; path = ../Carthage/Build/RxRealm.xcframework; sourceTree = "<group>"; };
B354E785219A76C80041F971 /* Game.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Game.swift; sourceTree = "<group>"; };
B354E786219A76C80041F971 /* BIOS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BIOS.swift; sourceTree = "<group>"; };
B354E787219A76C80041F971 /* PlistDataModels.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlistDataModels.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2352,7 +2350,6 @@
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/../Carthage/Build/iOS\"",
);
INFOPLIST_FILE = PVLibraryTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
Expand Down Expand Up @@ -2657,7 +2654,6 @@
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/../Carthage/Build/iOS\"",
);
INFOPLIST_FILE = PVLibraryTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
Expand All @@ -2684,7 +2680,6 @@
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/../Carthage/Build/iOS\"",
);
INFOPLIST_FILE = PVLibraryTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
Expand Down
25 changes: 4 additions & 21 deletions PVSupport/PVSupport.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,24 +143,9 @@
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
B3532B4421A7C01D006CDA0F /* Carthage Copy */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
);
name = "Carthage Copy";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
0592894D1DC194FD0012644D /* RealTimeThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RealTimeThread.h; sourceTree = "<group>"; };
0592894E1DC194FD0012644D /* RealTimeThread.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RealTimeThread.m; sourceTree = "<group>"; };
0979653B267ECF9100FB2F20 /* CocoaLumberjack.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = CocoaLumberjack.xcframework; path = ../Carthage/Build/CocoaLumberjack.xcframework; sourceTree = "<group>"; };
0979653F267ECF9600FB2F20 /* CocoaLumberjackSwift.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = CocoaLumberjackSwift.xcframework; path = ../Carthage/Build/CocoaLumberjackSwift.xcframework; sourceTree = "<group>"; };
1A4E718C1A6C699F005CA80F /* DebugUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DebugUtils.h; sourceTree = "<group>"; };
1ACEA64B17F7467D0031B1C9 /* PVSupport-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "PVSupport-Prefix.pch"; sourceTree = "<group>"; };
1ACEA69117F748F80031B1C9 /* OEGameAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OEGameAudio.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -306,9 +291,7 @@
isa = PBXGroup;
children = (
B3AF6FE0219161C4000FA7F9 /* tvOS */,
0979653B267ECF9100FB2F20 /* CocoaLumberjack.xcframework */,
B3AF6FDB21916177000FA7F9 /* iOS */,
0979653F267ECF9600FB2F20 /* CocoaLumberjackSwift.xcframework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -550,7 +533,6 @@
buildPhases = (
B3532B2E21A7B736006CDA0F /* Sources */,
B3532B2F21A7B736006CDA0F /* Frameworks */,
B3532B4421A7C01D006CDA0F /* Carthage Copy */,
B3532B3021A7B736006CDA0F /* Resources */,
);
buildRules = (
Expand Down Expand Up @@ -1048,7 +1030,7 @@
CODE_SIGN_STYLE = Automatic;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 9DSA2J9CHZ;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/iOS";
FRAMEWORK_SEARCH_PATHS = "";
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = PVSupportTests/Info.plist;
Expand Down Expand Up @@ -1083,7 +1065,7 @@
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9DSA2J9CHZ;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/iOS";
FRAMEWORK_SEARCH_PATHS = "";
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = PVSupportTests/Info.plist;
Expand Down Expand Up @@ -1116,7 +1098,7 @@
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9DSA2J9CHZ;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/iOS";
FRAMEWORK_SEARCH_PATHS = "";
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = PVSupportTests/Info.plist;
Expand Down Expand Up @@ -1232,6 +1214,7 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREFIX_HEADER = "PVSupport/PVSupport-Prefix.pch";
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
Expand Down
22 changes: 0 additions & 22 deletions Provenance.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1854,7 +1854,6 @@
1AD9AA311ACC988F00EC87A0 /* Sources */,
1AD9AA321ACC988F00EC87A0 /* Frameworks */,
1AD9AA331ACC988F00EC87A0 /* Resources */,
6OBYKZXD36MCSZYQLYVIY1AY /* Carthage */,
);
buildRules = (
);
Expand Down Expand Up @@ -2112,27 +2111,6 @@
shellPath = /bin/bash;
shellScript = ". \"${PROJECT_DIR}/Scripts/set_bundle_build_number.sh\" ProvenanceTV\n";
};
6OBYKZXD36MCSZYQLYVIY1AY /* Carthage */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"$(SRCROOT)/Carthage/xcfilelists/Provenance Tests-inputPaths.xcfilelist",
);
inputPaths = (
);
name = Carthage;
outputFileListPaths = (
"$(SRCROOT)/Carthage/xcfilelists/Provenance Tests-outputPaths.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
showEnvVarsInLog = 0;
};
B300F064212512310010299E /* Create Version.h */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down
55 changes: 1 addition & 54 deletions Scripts/setup_env.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,33 +91,6 @@ get_xcode_version() {
"$1" -version 2>/dev/null | sed -ne 's/^Xcode \([^\b ]*\).*/\1/p'
}

rome_installed() {
[-x "$(command -v rome)"]
}

rome_install() {
if rome_installed; then
echo "Rome already installed"
brew outdated rome || brew upgrade rome
return 0
fi

if ! brew_installed; then
echo "warn: Cannot install Rome withouth Homebrew"
return 0
fi

echo "Rome for Carthage not installed."
echo "Installing..."
if [ brew install blender/homebrew-tap/rome ]; then
echo "Rome for Carthage installed."
return 0
else
echo "Rome for Carthage install failed."
return 1
fi
}

brew_installed() {
[ -x "$(command -v brew)" ]
return
Expand Down Expand Up @@ -248,7 +221,7 @@ brew_install() {
read -r -d '' local MSG << EOM
Warning Homebrew is not installed!
Homebrew is a command line based software package manager and as is required to install and run 'Carthage' and 'Fastlane'.
Homebrew is a command line based software package manager and as is required to install and run 'Fastlane'.
These tools are required to build Provenance from source.
Expand All @@ -273,8 +246,6 @@ brew_update() {
if brew_installed; then
brew update
brew outdated swiftlint || brew upgrade swiftlint
brew outdated carthage || brew upgrade carthage
#rome_install
else
echo "Homebrew not installed. Skipping update."
fi
Expand Down Expand Up @@ -364,30 +335,6 @@ ruby_requires_root() {
fi
}

carthage_installed() {
[ -x "$(command -v carthage)" ]
return
}

carthage_install() {
if carthage_installed; then
return 0
else
echo "Carthage not installed. Continuing to install it."
fi

if ! brew_installed; then
brew_install
fi

if brew_installed; then
echo "Installing carthage via homebrew"
brew install carthage
else
error_exit "Carthage is required to build this application. It can be automatically installed during the build proccess but that requires having Homebrew for OS X installed first."
fi
}

github_connection_test() {
nc -zw1 github.com 443 > /dev/null
return
Expand Down
11 changes: 1 addition & 10 deletions Scripts/uninstall_dev_tools.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@ DIR="${BASH_SOURCE%/*}"
if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
. "$DIR/setup_env.sh"

function carthage_uninstall() {
if carthage_installed; then
echo "Found Carthage install. Removing..."
brew uninstall --force carthage
echo "Carthage uninstalled"
fi
}

function fastlane_uninstall() {
if fastlane_installed; then
echo "Found fastlane install. Removing..."
Expand All @@ -28,15 +20,14 @@ function brew_uninstall() {
fi
}

echo "This will completely remove carthage, fastlane and homebrew."
echo "This will completely remove fastlane and homebrew."
echo "This is really only for dev testing of installation scripts on a clean system."
echo -n "Are you sure? [y/N]: "
read -n 1 -t 20 RES

if [[ $RES == "y" || $RES == "Y" ]]; then
echo "Uninstalling..."
fastlane_uninstall
carthage_uninstall
brew_uninstall
echo "Done"
else
Expand Down
Loading

0 comments on commit 881a6a0

Please sign in to comment.