@@ -851,13 +851,29 @@ BINARYNAME=$(TARNAME)-$(PLATFORM)-$(ARCH) |
851 | 851 | endif |
852 | 852 | BINARYTAR=$(BINARYNAME).tar |
853 | 853 | # OSX doesn't have xz installed by default, http://macpkg.sourceforge.net/ |
854 | | -XZ=$(shell which xz > /dev/null 2>&1; echo $$?) |
| 854 | +HAS_XZ ?= $(shell which xz > /dev/null 2>&1; [[ $$? = 0 ]] && echo 1 || echo 0) |
| 855 | +# Supply SKIP_XZ=1 to explicitly skip .tar.xz creation |
| 856 | +SKIP_XZ ?= 0 |
| 857 | +XZ = $(shell [[ $(HAS_XZ) = 1 && $(SKIP_XZ) = 0 ]] && echo 1 || echo 0) |
855 | 858 | XZ_COMPRESSION ?= 9e |
856 | 859 | PKG=$(TARNAME).pkg |
857 | 860 | MACOSOUTDIR=out/macos |
858 | 861 |
|
| 862 | +ifeq ($(SKIP_XZ), 1) |
| 863 | +check-xz: |
| 864 | + @echo "SKIP_XZ=1 supplied, skipping .tar.xz creation" |
| 865 | +else |
| 866 | +ifeq ($(HAS_XZ), 1) |
| 867 | +check-xz: |
| 868 | +else |
| 869 | +check-xz: |
| 870 | + @echo "No xz command, cannot continue" |
| 871 | + @exit 1 |
| 872 | +endif |
| 873 | +endif |
| 874 | + |
859 | 875 | .PHONY: release-only |
860 | | -release-only: |
| 876 | +release-only: check-xz |
861 | 877 | @if [ "$(DISTTYPE)" = "release" ] && `grep -q REPLACEME doc/api/*.md`; then \ |
862 | 878 | echo 'Please update REPLACEME in Added: tags in doc/api/*.md (See doc/releases.md)' ; \ |
863 | 879 | exit 1 ; \ |
@@ -983,7 +999,7 @@ $(TARBALL): release-only $(NODE_EXE) doc |
983 | 999 | tar -cf $(TARNAME).tar $(TARNAME) |
984 | 1000 | $(RM) -r $(TARNAME) |
985 | 1001 | gzip -c -f -9 $(TARNAME).tar > $(TARNAME).tar.gz |
986 | | -ifeq ($(XZ), 0) |
| 1002 | +ifeq ($(XZ), 1) |
987 | 1003 | xz -c -f -$(XZ_COMPRESSION) $(TARNAME).tar > $(TARNAME).tar.xz |
988 | 1004 | endif |
989 | 1005 | $(RM) $(TARNAME).tar |
@@ -997,7 +1013,7 @@ tar-upload: tar |
997 | 1013 | chmod 664 $(TARNAME).tar.gz |
998 | 1014 | scp -p $(TARNAME).tar.gz $(STAGINGSERVER):nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/$(TARNAME).tar.gz |
999 | 1015 | ssh $(STAGINGSERVER) "touch nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/$(TARNAME).tar.gz.done" |
1000 | | -ifeq ($(XZ), 0) |
| 1016 | +ifeq ($(XZ), 1) |
1001 | 1017 | chmod 664 $(TARNAME).tar.xz |
1002 | 1018 | scp -p $(TARNAME).tar.xz $(STAGINGSERVER):nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/$(TARNAME).tar.xz |
1003 | 1019 | ssh $(STAGINGSERVER) "touch nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/$(TARNAME).tar.xz.done" |
@@ -1023,7 +1039,7 @@ $(TARBALL)-headers: release-only |
1023 | 1039 | tar -cf $(TARNAME)-headers.tar $(TARNAME) |
1024 | 1040 | $(RM) -r $(TARNAME) |
1025 | 1041 | gzip -c -f -9 $(TARNAME)-headers.tar > $(TARNAME)-headers.tar.gz |
1026 | | -ifeq ($(XZ), 0) |
| 1042 | +ifeq ($(XZ), 1) |
1027 | 1043 | xz -c -f -$(XZ_COMPRESSION) $(TARNAME)-headers.tar > $(TARNAME)-headers.tar.xz |
1028 | 1044 | endif |
1029 | 1045 | $(RM) $(TARNAME)-headers.tar |
@@ -1035,7 +1051,7 @@ tar-headers-upload: tar-headers |
1035 | 1051 | chmod 664 $(TARNAME)-headers.tar.gz |
1036 | 1052 | scp -p $(TARNAME)-headers.tar.gz $(STAGINGSERVER):nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/$(TARNAME)-headers.tar.gz |
1037 | 1053 | ssh $(STAGINGSERVER) "touch nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/$(TARNAME)-headers.tar.gz.done" |
1038 | | -ifeq ($(XZ), 0) |
| 1054 | +ifeq ($(XZ), 1) |
1039 | 1055 | chmod 664 $(TARNAME)-headers.tar.xz |
1040 | 1056 | scp -p $(TARNAME)-headers.tar.xz $(STAGINGSERVER):nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/$(TARNAME)-headers.tar.xz |
1041 | 1057 | ssh $(STAGINGSERVER) "touch nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/$(TARNAME)-headers.tar.xz.done" |
@@ -1060,7 +1076,7 @@ endif |
1060 | 1076 | tar -cf $(BINARYNAME).tar $(BINARYNAME) |
1061 | 1077 | $(RM) -r $(BINARYNAME) |
1062 | 1078 | gzip -c -f -9 $(BINARYNAME).tar > $(BINARYNAME).tar.gz |
1063 | | -ifeq ($(XZ), 0) |
| 1079 | +ifeq ($(XZ), 1) |
1064 | 1080 | xz -c -f -$(XZ_COMPRESSION) $(BINARYNAME).tar > $(BINARYNAME).tar.xz |
1065 | 1081 | endif |
1066 | 1082 | $(RM) $(BINARYNAME).tar |
@@ -1075,7 +1091,7 @@ binary-upload: binary |
1075 | 1091 | chmod 664 $(TARNAME)-$(OSTYPE)-$(ARCH).tar.gz |
1076 | 1092 | scp -p $(TARNAME)-$(OSTYPE)-$(ARCH).tar.gz $(STAGINGSERVER):nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/$(TARNAME)-$(OSTYPE)-$(ARCH).tar.gz |
1077 | 1093 | ssh $(STAGINGSERVER) "touch nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/$(TARNAME)-$(OSTYPE)-$(ARCH).tar.gz.done" |
1078 | | -ifeq ($(XZ), 0) |
| 1094 | +ifeq ($(XZ), 1) |
1079 | 1095 | chmod 664 $(TARNAME)-$(OSTYPE)-$(ARCH).tar.xz |
1080 | 1096 | scp -p $(TARNAME)-$(OSTYPE)-$(ARCH).tar.xz $(STAGINGSERVER):nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/$(TARNAME)-$(OSTYPE)-$(ARCH).tar.xz |
1081 | 1097 | ssh $(STAGINGSERVER) "touch nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/$(TARNAME)-$(OSTYPE)-$(ARCH).tar.xz.done" |
|