Mercurial > mxe-octave

comparison Makefile.in @ 5206:ac4cae18895f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow update of msys2 files from single download of packages file * Makefile.in: download and use sys2 packages filr when running update-msys2
author John Donoghue
date Thu, 14 Nov 2019 08:06:45 -0500
parents 9fc252d2d72b
children 3a397b27f907
comparison
equal deleted inserted replaced
5205:733967b322af 5206:ac4cae18895f
462 MSYS2_BASE_URL := https://sourceforge.net/projects/msys2/files/REPOS/MSYS2 462 MSYS2_BASE_URL := https://sourceforge.net/projects/msys2/files/REPOS/MSYS2
463 MSYS2_URL := $(MSYS2_BASE_URL)/$(MSYS2_ARCH) 463 MSYS2_URL := $(MSYS2_BASE_URL)/$(MSYS2_ARCH)
464 MSYS2_SRC_URL := $(MSYS2_BASE_URL)/Sources 464 MSYS2_SRC_URL := $(MSYS2_BASE_URL)/Sources
465 MSYS2_DIR := $(TOP_BUILD_DIR)/msys2 465 MSYS2_DIR := $(TOP_BUILD_DIR)/msys2
466 466
467 MSYS2_UPDATE_TMP_FILE := $(TOP_BUILD_DIR)/msys_updates.html
467 endif 468 endif
468 else ifeq ($(MXE_SYSTEM),msvc) 469 else ifeq ($(MXE_SYSTEM),msvc)
469 MXE_WINDOWS_BUILD := yes 470 MXE_WINDOWS_BUILD := yes
470 else 471 else
471 MXE_WINDOWS_BUILD := no 472 MXE_WINDOWS_BUILD := no
938 clean: 939 clean:
939 rm -rf $(call TMP_DIR,*) $(BUILD_TOOLS_PREFIX) 940 rm -rf $(call TMP_DIR,*) $(BUILD_TOOLS_PREFIX)
940 rm -rf $(STAMP_DIR) $(MSYS_INFO_DIR) $(LOG_DIR) 941 rm -rf $(STAMP_DIR) $(MSYS_INFO_DIR) $(LOG_DIR)
941 rm -rf $(MSYS_BASE_DIR) $(MSYS_EXTENSION_DIR) $(NOTEPAD_BASE_DIR) 942 rm -rf $(MSYS_BASE_DIR) $(MSYS_EXTENSION_DIR) $(NOTEPAD_BASE_DIR)
942 rm -rf $(MSYS2_DIR) 943 rm -rf $(MSYS2_DIR)
944 rm -f $(MSYS2_UPDATE_TMP_FILE)
943 rm -rf native-tools cross-tools octave gnuplot 945 rm -rf native-tools cross-tools octave gnuplot
944 rm -f Makefile cmake-toolchain-file.stamp cmake-native-toolchain-file.stamp 946 rm -f Makefile cmake-toolchain-file.stamp cmake-native-toolchain-file.stamp
945 rm -f tools/set-mxe-env.sh 947 rm -f tools/set-mxe-env.sh
946 948
947 .PHONY: realclean 949 .PHONY: realclean
984 986
985 update-checksum-%: 987 update-checksum-%:
986 $(call DOWNLOAD_PKG_ARCHIVE,$*) 988 $(call DOWNLOAD_PKG_ARCHIVE,$*)
987 $(SED) -i 's/^\([^ ]*_CHECKSUM *:=\).*/\1 '"`$(call PKG_CHECKSUM,$*)`"'/' '$(TOP_DIR)/src/$*.mk' 989 $(SED) -i 's/^\([^ ]*_CHECKSUM *:=\).*/\1 '"`$(call PKG_CHECKSUM,$*)`"'/' '$(TOP_DIR)/src/$*.mk'
988 990
989 .PHONY: update-msys2 991 .PHONY: update-msys2 update-msys2-filelist
990 PKG_MK_CHECKSUM = \ 992 PKG_MK_CHECKSUM = \
991 $(GREP) _CHECKSUM '$(TOP_DIR)/src/$(1).mk' 2>/dev/null | $(SED) -n 's,^.*\([0-9a-f]\{40\}\)$$,\1,p' 993 $(GREP) _CHECKSUM '$(TOP_DIR)/src/$(1).mk' 2>/dev/null | $(SED) -n 's,^.*\([0-9a-f]\{40\}\)$$,\1,p'
992 define MSYS2_UPDATE 994 define MSYS2_UPDATE
993 $(if $(2), 995 $(if $(2),
994 $(if $(filter $(2),$($(1)_IGNORE)), 996 $(if $(filter $(2),$($(1)_IGNORE)),
1021 || { $(SED) -i 's/^\([^ ]*_VERSION *:=\).*/\1 $(src-$(1)_VERSION)/' '$(TOP_DIR)/src/src-$(1).mk'; \ 1023 || { $(SED) -i 's/^\([^ ]*_VERSION *:=\).*/\1 $(src-$(1)_VERSION)/' '$(TOP_DIR)/src/src-$(1).mk'; \
1022 exit 1; } 1024 exit 1; }
1023 )), 1025 )),
1024 $(error Unable to update version number of package $(1))) 1026 $(error Unable to update version number of package $(1)))
1025 endef 1027 endef
1026 update-msys2: 1028
1027 #$(MSYS2_PACKAGES) 1029 define MSYS2_PKG_UPDATE_FILE
1028 $(foreach PKG,$(MSYS2_PACKAGES),$(call MSYS2_UPDATE,$(PKG),$(shell $($(PKG)_UPDATE)))) 1030 cat $(MSYS2_UPDATE_TMP_FILE) | \
1029 1031 $(GREP) $($(PKG)_NAME) |
1032 $(SED) -n 's,.*title="$($(PKG)_NAME)-\(r\?[0-9][^-]*-[0-9]*\)-[^\.]*\.pkg\.tar\.xz".*,\1,p' | \
1033 head -1
1034 endef
1035
1036 update-msys2-filelist:
1037 $(shell $(WGET) -q -O$(MSYS2_UPDATE_TMP_FILE) '$(MSYS2_URL)/')
1038
1039 update-msys2: update-msys2-filelist
1040 $(foreach PKG,$(MSYS2_PACKAGES),$(call MSYS2_UPDATE,$(PKG),$(shell $(MSYS2_PKG_UPDATE_FILE))))
1030 1041
1031 cleanup-style: 1042 cleanup-style:
1032 @$(foreach FILE,$(wildcard $(addprefix $(TOP_DIR)/,Makefile index.html CNAME src/*.mk src/*test.* tools/*)),\ 1043 @$(foreach FILE,$(wildcard $(addprefix $(TOP_DIR)/,Makefile index.html CNAME src/*.mk src/*test.* tools/*)),\
1033 $(SED) ' \ 1044 $(SED) ' \
1034 s/\r//g; \ 1045 s/\r//g; \