Skip to content

Commit

Permalink
[Makefile] Add safety to possibly user-set temporary folder, which ge…
Browse files Browse the repository at this point in the history
…ts removed recursively.

With prefix, less likely to have a variable by this name leftover, still-set from some previous script from whatever source.
  • Loading branch information
jdhealy committed Aug 9, 2017
1 parent 85f9cc1 commit 6adf6fc
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
TEMPORARY_FOLDER?=/tmp/Carthage.dst
CARTHAGE_TEMPORARY_FOLDER?=/tmp/Carthage.dst
PREFIX?=/usr/local

XCODEFLAGS=-workspace 'Carthage.xcworkspace' -scheme 'carthage' DSTROOT=$(TEMPORARY_FOLDER)
XCODEFLAGS=-workspace 'Carthage.xcworkspace' -scheme 'carthage' DSTROOT=$(CARTHAGE_TEMPORARY_FOLDER)

INTERNAL_PACKAGE=CarthageApp.pkg
OUTPUT_PACKAGE=Carthage.pkg
OUTPUT_FRAMEWORK=CarthageKit.framework
OUTPUT_FRAMEWORK_ZIP=CarthageKit.framework.zip

BUILT_BUNDLE=$(TEMPORARY_FOLDER)/Applications/carthage.app
BUILT_BUNDLE=$(CARTHAGE_TEMPORARY_FOLDER)/Applications/carthage.app
CARTHAGEKIT_BUNDLE=$(BUILT_BUNDLE)/Contents/Frameworks/$(OUTPUT_FRAMEWORK)
CARTHAGE_EXECUTABLE=$(BUILT_BUNDLE)/Contents/MacOS/carthage

Expand Down Expand Up @@ -47,7 +47,7 @@ clean:
$(RM) "$(INTERNAL_PACKAGE)"
$(RM) "$(OUTPUT_PACKAGE)"
$(RM) "$(OUTPUT_FRAMEWORK_ZIP)"
$(RM_SAFELY) "$(TEMPORARY_FOLDER)"
$(RM_SAFELY) "$(CARTHAGE_TEMPORARY_FOLDER)"
xcodebuild $(XCODEFLAGS) clean

install: package
Expand All @@ -60,15 +60,15 @@ uninstall:
installables: clean bootstrap
xcodebuild $(XCODEFLAGS) install

$(MKDIR) "$(TEMPORARY_FOLDER)$(FRAMEWORKS_FOLDER)" "$(TEMPORARY_FOLDER)$(BINARIES_FOLDER)"
$(MV) "$(CARTHAGEKIT_BUNDLE)" "$(TEMPORARY_FOLDER)$(FRAMEWORKS_FOLDER)/$(OUTPUT_FRAMEWORK)"
$(MV) "$(CARTHAGE_EXECUTABLE)" "$(TEMPORARY_FOLDER)$(BINARIES_FOLDER)/carthage"
$(MKDIR) "$(CARTHAGE_TEMPORARY_FOLDER)$(FRAMEWORKS_FOLDER)" "$(CARTHAGE_TEMPORARY_FOLDER)$(BINARIES_FOLDER)"
$(MV) "$(CARTHAGEKIT_BUNDLE)" "$(CARTHAGE_TEMPORARY_FOLDER)$(FRAMEWORKS_FOLDER)/$(OUTPUT_FRAMEWORK)"
$(MV) "$(CARTHAGE_EXECUTABLE)" "$(CARTHAGE_TEMPORARY_FOLDER)$(BINARIES_FOLDER)/carthage"
$(RM_SAFELY) "$(BUILT_BUNDLE)"

prefix_install: installables
$(MKDIR) "$(PREFIX)/Frameworks" "$(PREFIX)/bin"
$(RSYNC) "$(TEMPORARY_FOLDER)$(FRAMEWORKS_FOLDER)/$(OUTPUT_FRAMEWORK)" "$(PREFIX)/Frameworks/"
$(CP) -f "$(TEMPORARY_FOLDER)$(BINARIES_FOLDER)/carthage" "$(PREFIX)/bin/"
$(RSYNC) "$(CARTHAGE_TEMPORARY_FOLDER)$(FRAMEWORKS_FOLDER)/$(OUTPUT_FRAMEWORK)" "$(PREFIX)/Frameworks/"
$(CP) -f "$(CARTHAGE_TEMPORARY_FOLDER)$(BINARIES_FOLDER)/carthage" "$(PREFIX)/bin/"
install_name_tool -delete_rpath "@executable_path/../Frameworks" "$(PREFIX)/bin/carthage" # Avoid duplication of "@executable_path/../Frameworks"
install_name_tool -rpath "/Library/Frameworks" "@executable_path/../Frameworks" "$(PREFIX)/bin/carthage"
install_name_tool -rpath "/Library/Frameworks/CarthageKit.framework/Versions/Current/Frameworks" "@executable_path/../Frameworks/CarthageKit.framework/Versions/Current/Frameworks" "$(PREFIX)/bin/carthage"
Expand All @@ -78,7 +78,7 @@ package: installables
--component-plist "$(COMPONENTS_PLIST)" \
--identifier "org.carthage.carthage" \
--install-location "/" \
--root "$(TEMPORARY_FOLDER)" \
--root "$(CARTHAGE_TEMPORARY_FOLDER)" \
--version "$(VERSION_STRING)" \
"$(INTERNAL_PACKAGE)"

Expand All @@ -87,7 +87,7 @@ package: installables
--package-path "$(INTERNAL_PACKAGE)" \
"$(OUTPUT_PACKAGE)"

(cd "$(TEMPORARY_FOLDER)$(FRAMEWORKS_FOLDER)" && zip -q -r --symlinks - "$(OUTPUT_FRAMEWORK)") > "$(OUTPUT_FRAMEWORK_ZIP)"
(cd "$(CARTHAGE_TEMPORARY_FOLDER)$(FRAMEWORKS_FOLDER)" && zip -q -r --symlinks - "$(OUTPUT_FRAMEWORK)") > "$(OUTPUT_FRAMEWORK_ZIP)"

swiftpm:
swift build -c release -Xswiftc -static-stdlib
Expand Down

0 comments on commit 6adf6fc

Please sign in to comment.