Mercurial > mxe-octave
diff binary-dist-rules.mk @ 4658:213da5688be0
update binary dist rules
* binary-dist-rules.mk: Use -w64, -w32, or -w64-64 suffix for Windows
binary distributions. New target for creating .7z files.
* tools/makeinst-script.sh.in: New arg for name of installer file.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 12 Apr 2018 12:09:22 -0400 |
| parents | 5b5c47cd2111 |
| children | 63a6009ad3df |
line wrap: on
line diff
--- a/binary-dist-rules.mk Thu Apr 12 12:08:06 2018 -0400 +++ b/binary-dist-rules.mk Thu Apr 12 12:09:22 2018 -0400 @@ -1,8 +1,20 @@ + +ifeq ($(MXE_WINDOWS_BUILD),yes) + ifeq ($(ENABLE_WINDOWS_64),yes) + ifeq ($(ENABLE_64),yes) + OCTAVE_PLATFORM_SUFFIX := -w64-64 + else + OCTAVE_PLATFORM_SUFFIX := -w64 + endif + else + OCTAVE_PLATFORM_SUFFIX := -w32 + endif +endif ifeq ($(OCTAVE_TARGET),stable-octave) - OCTAVE_DIST_NAME := octave-$($(OCTAVE_TARGET)_VERSION) + OCTAVE_DIST_NAME := octave-$($(OCTAVE_TARGET)_VERSION)$(OCTAVE_PLATFORM_SUFFIX) else - OCTAVE_DIST_NAME := octave-$(DATE) + OCTAVE_DIST_NAME := octave-$(DATE)$(OCTAVE_PLATFORM_SUFFIX) endif OCTAVE_DIST_DIR := $(TOP_BUILD_DIR)/dist/$(OCTAVE_DIST_NAME) @@ -182,7 +194,7 @@ rm -f $(OCTAVE_NSI_FILE); \ fi echo "generating installer script..." - $(TOP_BUILD_DIR)/tools/makeinst-script.sh $(OCTAVE_DIST_DIR) $(OCTAVE_NSI_FILE) + $(TOP_BUILD_DIR)/tools/makeinst-script.sh $(OCTAVE_DIST_DIR) $(OCTAVE_DIST_NAME)-installer.exe $(OCTAVE_NSI_FILE) echo "generating installer..." $(TARGET)-makensis $(OCTAVE_NSI_FILE) > $(TOP_BUILD_DIR)/dist/nsis.log endef @@ -193,6 +205,15 @@ .PHONY: nsis-installer nsis-installer: $(OCTAVE_DIST_NAME)-installer.exe +define make-7z-dist + echo "generating 7z file..." + cd $(TOP_BUILD_DIR)/dist && p7zip -k $(OCTAVE_DIST_NAME) +endef + +.PHONY: 7z-dist +7z-dist: binary-dist-files + @$(make-7z-dist) + define make-zip-dist echo "generating zip file..." cd $(TOP_BUILD_DIR)/dist \