diff options
11 files changed, 8 insertions, 148 deletions
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index 613fce0f1..fcc1df125 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -1915,7 +1915,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = HB; - LastUpgradeCheck = 1140; + LastUpgradeCheck = 1150; ORGANIZATIONNAME = HandBrake; TargetAttributes = { 273F203814ADBC200021BE6D = { diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme index a04ed8306..5533366c8 100644 --- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme +++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "1140" + LastUpgradeVersion = "1150" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme index 0bca35a6d..9cd138a9d 100644 --- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme +++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "1140" + LastUpgradeVersion = "1150" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Distribution.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Distribution.xcscheme deleted file mode 100644 index 4252f30de..000000000 --- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Distribution.xcscheme +++ /dev/null @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Scheme - LastUpgradeVersion = "1140" - version = "1.3"> - <BuildAction - parallelizeBuildables = "YES" - buildImplicitDependencies = "YES"> - <BuildActionEntries> - <BuildActionEntry - buildForTesting = "YES" - buildForRunning = "YES" - buildForProfiling = "YES" - buildForArchiving = "YES" - buildForAnalyzing = "YES"> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "273F203814ADBC200021BE6D" - BuildableName = "HandBrake.app" - BlueprintName = "HandBrake" - ReferencedContainer = "container:HandBrake.xcodeproj"> - </BuildableReference> - </BuildActionEntry> - </BuildActionEntries> - </BuildAction> - <TestAction - buildConfiguration = "release" - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES"> - <MacroExpansion> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "273F203814ADBC200021BE6D" - BuildableName = "HandBrake.app" - BlueprintName = "HandBrake" - ReferencedContainer = "container:HandBrake.xcodeproj"> - </BuildableReference> - </MacroExpansion> - <Testables> - </Testables> - </TestAction> - <LaunchAction - buildConfiguration = "release" - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - launchStyle = "0" - useCustomWorkingDirectory = "NO" - ignoresPersistentStateOnLaunch = "NO" - debugDocumentVersioning = "YES" - debugServiceExtension = "internal" - allowLocationSimulation = "YES"> - <BuildableProductRunnable - runnableDebuggingMode = "0"> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "273F203814ADBC200021BE6D" - BuildableName = "HandBrake.app" - BlueprintName = "HandBrake" - ReferencedContainer = "container:HandBrake.xcodeproj"> - </BuildableReference> - </BuildableProductRunnable> - </LaunchAction> - <ProfileAction - buildConfiguration = "release" - shouldUseLaunchSchemeArgsEnv = "YES" - savedToolIdentifier = "" - useCustomWorkingDirectory = "NO" - debugDocumentVersioning = "YES"> - <BuildableProductRunnable - runnableDebuggingMode = "0"> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "273F203814ADBC200021BE6D" - BuildableName = "HandBrake.app" - BlueprintName = "HandBrake" - ReferencedContainer = "container:HandBrake.xcodeproj"> - </BuildableReference> - </BuildableProductRunnable> - </ProfileAction> - <AnalyzeAction - buildConfiguration = "release"> - </AnalyzeAction> - <ArchiveAction - buildConfiguration = "release" - customArchiveName = "HandBrake" - revealArchiveInOrganizer = "YES"> - </ArchiveAction> -</Scheme> diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme index 067752a36..487c05dfc 100644 --- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme +++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "1140" + LastUpgradeVersion = "1150" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme index de6aa690d..f65e5221c 100644 --- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme +++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "1140" + LastUpgradeVersion = "1150" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/macosx/archive.plist b/macosx/archive.plist deleted file mode 100644 index e5d1ec414..000000000 --- a/macosx/archive.plist +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>method</key> - <string>developer-id</string> - <key>teamID</key> - <string></string> -</dict> -</plist> diff --git a/macosx/module.defs b/macosx/module.defs index 9d654ede9..a561e613d 100644 --- a/macosx/module.defs +++ b/macosx/module.defs @@ -4,7 +4,6 @@ $(eval $(call import.GCC,MACOSX)) MACOSX.src/ = $(SRC/)macosx/ MACOSX.build/ = $(BUILD/)macosx/ MACOSX.xroot/ = $(BUILD/)xroot/ -MACOSX.xarchive/ = $(BUILD/)xroot/HandBrake/ MACOSX.m4.in = $(wildcard $(MACOSX.src/)*.m4) MACOSX.m4.out = $(MACOSX.m4.in:$(MACOSX.src/)%.m4=$(MACOSX.build/)%) @@ -76,37 +75,6 @@ MACOSX.XCODE = $(strip \ \ $(2) ) -MACOSX.XCODE_ARCHIVE = $(strip \ - $(XCODEBUILD.exe) \ - $(MACOSX.project) \ - $(foreach t,$(1),-scheme $t) \ - $(MACOSX.configuration) \ - $(MACOSX.xcconfig) \ - \ - SYMROOT='$(XCODE.symroot)' \ - CONFIGURATION_BUILD_DIR='$(XCODE.symroot)' \ - CONFIGURATION_TEMP_DIR='$(XCODE.symroot)' \ - \ - -derivedDataPath '$(MACOSX.xarchive/)' \ - -archivePath '$(MACOSX.xarchive/)' \ - \ - EXTERNAL_BUILD='$(abspath $(BUILD))' \ - EXTERNAL_CONF_ARGS='$(CONF.args)' \ - EXTERNAL_DRIVER='$(XCODE.driver)' \ - EXTERNAL_GOALS='$(3)' \ - EXTERNAL_JOBS='$(MACOSX.JOBS)' \ - EXTERNAL_O='$(MACOSX.map.O.$(MACOSX.GCC.O))' \ - EXTERNAL_VARS='$(-*-command-variables-*-)' \ - \ - $(MACOSX.extra_cflags) \ - \ - $(2) ) ; $(strip \ - $(XCODEBUILD.exe) \ - -exportArchive \ - -exportOptionsPlist '$(MACOSX.src/)archive.plist' \ - -exportPath '$(MACOSX.xarchive/)' \ - -archivePath '$(MACOSX.xarchive/)' ) - ifeq (1,$(SECURITY.sandbox)) MACOSX.SIGN = $(strip $(MACOSX.src/)hbsign -sr '$(ID)' $(MACOSX.xroot/)HandBrake.app $(MACOSX.xroot/)HandBrakeCLI) else diff --git a/macosx/module.rules b/macosx/module.rules index 7159cb367..5fb60d9bb 100644 --- a/macosx/module.rules +++ b/macosx/module.rules @@ -1,7 +1,6 @@ $(eval $(call import.MODULE.rules,MACOSX)) build: macosx.build -archive: macosx.archive install: macosx.install uninstall: macosx.uninstall clean: macosx.clean @@ -29,15 +28,11 @@ test.xclean: test.clean macosx.build: $(MACOSX.m4.out) macosx.build: $(MACOSX.osl.filelist) -macosx.archive: $(MACOSX.m4.out) -macosx.archive: $(MACOSX.osl.filelist) - macosx.install: test.install macosx.uninstall: test.uninstall macosx.clean: $(RM.exe) -rf $(MACOSX.xroot/)HandBrake/ - $(RM.exe) -rf $(MACOSX.xroot/)HandBrake.xcarchive $(RM.exe) -rf $(MACOSX.xroot/)HandBrake.app $(RM.exe) -f $(MACOSX.xroot/)HandBrakeCLI $(RM.exe) -f $(MACOSX.xroot/)hbsign.log diff --git a/macosx/module.xcodebuild b/macosx/module.xcodebuild index cb66479d7..366057cd2 100644 --- a/macosx/module.xcodebuild +++ b/macosx/module.xcodebuild @@ -1,6 +1,6 @@ ## This file is processed only when shunting build through xcodebuild -.PHONY: macosx.build macosx.sign macosx.notarize macosx.archive macosx.clean macosx.install macosx.install-strip macosx.uninstall +.PHONY: macosx.build macosx.sign macosx.notarize macosx.clean macosx.install macosx.install-strip macosx.uninstall macosx.build: $(call MACOSX.XCODE,HandBrakeCLI HandBrake,build) @@ -11,9 +11,6 @@ macosx.sign: macosx.notarize: $(call MACOSX.NOTARIZE,HandBrakeCLI HandBrake,notarize) -macosx.archive: - $(call MACOSX.XCODE_ARCHIVE,HandBrake-Distribution,archive) - macosx.clean: $(call MACOSX.XCODE,HandBrakeCLI HandBrake,clean) @@ -36,7 +33,6 @@ macosx.uninstall: build: macosx.build sign: macosx.sign notarize: macosx.notarize -archive: macosx.archive clean: macosx.clean install: macosx.install install-strip: macosx.install-strip @@ -45,7 +41,7 @@ xclean: clean ############################################################################### -MACOSX.goals = $(filter-out build sign notarize archive clean install,$(MAKECMDGOALS)) +MACOSX.goals = $(filter-out build sign notarize clean install,$(MAKECMDGOALS)) $(MACOSX.goals): __goals__ @true diff --git a/make/include/main.rules b/make/include/main.rules index 14df5b034..fac9bf539 100644 --- a/make/include/main.rules +++ b/make/include/main.rules @@ -15,11 +15,10 @@ endif ############################################################################### -.PHONY: build clean archive install uninstall xclean doc report +.PHONY: build clean install uninstall xclean doc report build: clean: -archive: install: install-strip: uninstall: |