mxe-octave: binary-dist-rules.mk annotate

annotate binary-dist-rules.mk @ 4945:76828d146a8d

icu4c.mk: Don't link with msvcr100 or force --std=gnu++0x. Set CPPFLAGS, not CFLAGS.

author	John W. Eaton <jwe@octave.org>
date	Tue, 29 Jan 2019 12:41:34 -0500
parents	0958cf066f1a
children	a059052f4807

rev	line source
4658 213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	1
213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	2 ifeq ($(MXE_WINDOWS_BUILD),yes)
213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	3 ifeq ($(ENABLE_WINDOWS_64),yes)
4694 98bcbdaf910b binary-dist-rules.mk: Fix dist file suffixes. John W. Eaton <jwe@octave.org> parents: 4686 diff changeset	4 ifeq ($(ENABLE_FORTRAN_INT64),yes)
4658 213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	5 OCTAVE_PLATFORM_SUFFIX := -w64-64
213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	6 else
213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	7 OCTAVE_PLATFORM_SUFFIX := -w64
213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	8 endif
213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	9 else
213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	10 OCTAVE_PLATFORM_SUFFIX := -w32
213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	11 endif
213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	12 endif
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	13
4788 65dfbc5a5dbc binary-dist-rules.mk (OCTAVE_DIST_NAME): Use octave-$($(OCTAVE_TARGET)_VERSION)$(OCTAVE_PLATFORM_SUFFIX) for octave-release version. John W. Eaton <jwe@octave.org> parents: 4767 diff changeset	14 ifeq ($(OCTAVE_TARGET),release-octave)
4658 213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	15 OCTAVE_DIST_NAME := octave-$($(OCTAVE_TARGET)_VERSION)$(OCTAVE_PLATFORM_SUFFIX)
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	16 else
4658 213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	17 OCTAVE_DIST_NAME := octave-$(DATE)$(OCTAVE_PLATFORM_SUFFIX)
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	18 endif
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	19
4066 0962acdde3be builld: allow out of source build John Donoghue parents: 4028 diff changeset	20 OCTAVE_DIST_DIR := $(TOP_BUILD_DIR)/dist/$(OCTAVE_DIST_NAME)
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	21
4066 0962acdde3be builld: allow out of source build John Donoghue parents: 4028 diff changeset	22 OCTAVE_NSI_FILE := $(TOP_BUILD_DIR)/dist/octave.nsi
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	23
4906 bcfecd611e1b * binary-dist-rules.mk: remove '/' from any addpath paths John Donoghue parents: 4807 diff changeset	24 OCTAVE_ADD_PATH := /
3442 ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	25 ifeq ($(MXE_WINDOWS_BUILD),yes)
3522 9bc3862c2091 update binary-dist rules for new way of building gcc John W. Eaton <jwe@octave.org> parents: 3517 diff changeset	26 TAR_H_OPTION := -h
3442 ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	27 WINDOWS_BINARY_DIST_DEPS := \
4174 2b631cf1c210 win7appid: new package John Donoghue <john.donoghue@ieee.org> parents: 4124 diff changeset	28 win7appid
3673 972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	29
4793 202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	30 ifeq ($(USE_MSYS2),yes)
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	31 WINDOWS_BINARY_DIST_DEPS += \
4795 f39017b331bf only download msys2 source packages if building dist target John W. Eaton <jwe@octave.org> parents: 4793 diff changeset	32 msys2 \
f39017b331bf only download msys2 source packages if building dist target John W. Eaton <jwe@octave.org> parents: 4793 diff changeset	33 msys2-sources
4793 202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	34
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	35 ifeq ($(ENABLE_WINDOWS_64),yes)
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	36 OCTAVE_ADD_PATH := /mingw64
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	37 else
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	38 OCTAVE_ADD_PATH := /mingw32
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	39 endif
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	40 else
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	41 WINDOWS_BINARY_DIST_DEPS += \
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	42 msys-base \
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	43 msys-base-sources
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	44 endif
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	45
3673 972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	46 ifeq ($(MXE_NATIVE_BUILD),no)
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	47 WINDOWS_BINARY_DIST_DEPS += \
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	48 native-binutils \
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	49 native-gcc \
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	50 npp
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	51 endif
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	52
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	53 endif
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	54
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	55 BINARY_DIST_DEPS := \
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	56 $(OCTAVE_TARGET) \
3471 6a97f4d1dedb installer: Add ref BLAS/OpenBLAS install option John Donoghue <john.donoghue@ieee.org> parents: 3468 diff changeset	57 blas-packages \
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	58 octave-forge-packages \
3958 ac3abcea55e8 Add --enable-devel-tools option to configure John Donoghue <john.donoghue@ieee.org> parents: 3862 diff changeset	59 devel-packages \
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	60 units \
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	61 transfig \
3435 9fcc72373e24 build stable-octave package by default John W. Eaton <jwe@octave.org> parents: 3433 diff changeset	62 $(WINDOWS_BINARY_DIST_DEPS)
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	63
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	64 define delete-dist-directory
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	65 echo "deleting previous dist directory..."
4066 0962acdde3be builld: allow out of source build John Donoghue parents: 4028 diff changeset	66 rm -rf $(TOP_BUILD_DIR)/dist
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	67 endef
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	68
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	69 define make-dist-directory
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	70 echo "creating dist directory..."
4793 202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	71 mkdir -p $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	72 endef
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	73
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	74 define copy-dist-files
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	75 echo "copying files..."
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	76 echo " octave and dependencies..."
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	77 cd $(HOST_PREFIX) \
4793 202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	78 && tar -c $(TAR_H_OPTION) -f - . \| ( cd $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH) ; tar xpf - )
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	79 echo " octaverc file..."
4793 202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	80 cp $(TOP_DIR)/octaverc $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/share/octave/site/m/startup/octaverc
4078 e5e0b3f7244b Dont copy src directory if binary packages enabled John Donoghue <john.donoghue@ieee.org> parents: 4066 diff changeset	81 if [ $(ENABLE_BINARY_PACKAGES) = no ]; then \
e5e0b3f7244b Dont copy src directory if binary packages enabled John Donoghue <john.donoghue@ieee.org> parents: 4066 diff changeset	82 echo " build_packages.m..."; \
e5e0b3f7244b Dont copy src directory if binary packages enabled John Donoghue <john.donoghue@ieee.org> parents: 4066 diff changeset	83 cp $(TOP_DIR)/build_packages.m $(OCTAVE_DIST_DIR)/src; \
e5e0b3f7244b Dont copy src directory if binary packages enabled John Donoghue <john.donoghue@ieee.org> parents: 4066 diff changeset	84 fi
3442 ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	85 endef
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	86
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	87 ifeq ($(MXE_WINDOWS_BUILD),yes)
3673 972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	88 ifeq ($(MXE_NATIVE_BUILD),no)
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	89 define copy-windows-dist-files
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	90 echo " DLL files..."
4793 202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	91 cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/*.dll $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	92 cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/*.dll $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	93 cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/$(build-gcc_VERSION)/*.dll $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	94 if [ "$(USE_MSYS2)" = "yes" ]; then \
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	95 echo " msys2 files..."; \
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	96 cd $(TOP_BUILD_DIR)/msys2 \
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	97 && tar -c $(TAR_H_OPTION) -f - . \| ( cd $(OCTAVE_DIST_DIR) ; tar xpf - ); \
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	98 else \
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	99 echo " msys base files..."; \
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	100 cd $(TOP_BUILD_DIR)/msys-base \
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	101 && tar -c $(TAR_H_OPTION) -f - . \| ( cd $(OCTAVE_DIST_DIR) ; tar xpf - ); \
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	102 echo " msys extension files..."; \
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	103 cd $(TOP_BUILD_DIR)/msys-extension \
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	104 && tar -c $(TAR_H_OPTION) -f - . \| ( cd $(OCTAVE_DIST_DIR) ; tar xpf - ); \
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	105 fi
3673 972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	106 echo " notepad++..."
4066 0962acdde3be builld: allow out of source build John Donoghue parents: 4028 diff changeset	107 cd $(TOP_BUILD_DIR) \
3673 972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	108 && tar -c $(TAR_H_OPTION) -f - notepad++ \| ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	109 echo " README.html..."
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	110 cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	111 echo " refblas..."
4793 202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	112 cp $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/libblas.dll $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/librefblas.dll
4767 a800e350d88b use .bat file for octave.exe/octave-version.exe (Bug #53938) John Donoghue parents: 4698 diff changeset	113 echo " octave.vbs..."
3817 6daa158a7018 nsis installer: use octave.vbs as laucher (Bug #41074) John Donoghue <john.donoghue@ieee.org> parents: 3721 diff changeset	114 cp $(TOP_DIR)/installer-files/octave.vbs $(OCTAVE_DIST_DIR)/
4028 8803dfa40236 nsis installer: set directory to userprofile on startof octave from installer (Bug #45899) John Donoghue parents: 3963 diff changeset	115 cp $(TOP_DIR)/installer-files/octave-firsttime.vbs $(OCTAVE_DIST_DIR)/
4767 a800e350d88b use .bat file for octave.exe/octave-version.exe (Bug #53938) John Donoghue parents: 4698 diff changeset	116 cp $(TOP_DIR)/installer-files/fc_update.bat $(OCTAVE_DIST_DIR)/
4793 202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	117 cp $(TOP_DIR)/installer-files/post-install.bat $(OCTAVE_DIST_DIR)/
4590 5b5c47cd2111 Add file with hg id of MXE-Octave to dist package (bug #52794). Markus Mützel <markus.muetzel@gmx.de> parents: 4506 diff changeset	118 cp $(TOP_BUILD_DIR)/HG-ID $(OCTAVE_DIST_DIR)/
4767 a800e350d88b use .bat file for octave.exe/octave-version.exe (Bug #53938) John Donoghue parents: 4698 diff changeset	119 echo " updating octave .exe to script files..."
4793 202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	120 rm -f $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave.exe
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	121 rm -f $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave-$($(OCTAVE_TARGET)_VERSION).exe
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	122 cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave.bat
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	123 cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave-$($(OCTAVE_TARGET)_VERSION).bat
3961 808ff354717a binary-dist-rules: fix paths of distributes .pc and .la files John D parents: 3958 diff changeset	124 echo " updating libtool references..."
4793 202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	125 find '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/' -type f -name "*.la" \
3963 9d402d735dd1 nsis-installer: add bash window menu if devel tools enabled John Donoghue parents: 3961 diff changeset	126 -exec $(SED) -i 's\|$(HOST_PREFIX)\|/usr\|g;s\|$(BUILD_TOOLS_PREFIX)\|/usr\|g' {} \; ;
3961 808ff354717a binary-dist-rules: fix paths of distributes .pc and .la files John D parents: 3958 diff changeset	127 echo " updating pkg-config .pc references..."
4793 202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	128 find '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/lib/pkgconfig' -type f -name "*.pc" \
3963 9d402d735dd1 nsis-installer: add bash window menu if devel tools enabled John Donoghue parents: 3961 diff changeset	129 -exec $(SED) -i 's\|$(HOST_PREFIX)\|/usr\|g;s\|$(BUILD_TOOLS_PREFIX)\|/usr\|g' {} \; ;
9d402d735dd1 nsis-installer: add bash window menu if devel tools enabled John Donoghue parents: 3961 diff changeset	130 if [ "$(ENABLE_DEVEL_TOOLS)" = "yes" ]; then \
9d402d735dd1 nsis-installer: add bash window menu if devel tools enabled John Donoghue parents: 3961 diff changeset	131 cp $(TOP_DIR)/installer-files/cmdshell.bat $(OCTAVE_DIST_DIR)/; \
9d402d735dd1 nsis-installer: add bash window menu if devel tools enabled John Donoghue parents: 3961 diff changeset	132 fi
4807 9fa4ad9a659a * binary-dist-rules.mk: in mingw, update all non ext script files for /mingXX path John Donoghue parents: 4795 diff changeset	133 echo " updating script tool references..."
9fa4ad9a659a * binary-dist-rules.mk: in mingw, update all non ext script files for /mingXX path John Donoghue parents: 4795 diff changeset	134 #find '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin' -type f ! -name "." \
9fa4ad9a659a * binary-dist-rules.mk: in mingw, update all non ext script files for /mingXX path John Donoghue parents: 4795 diff changeset	135 # -exec $(SED) -i 's\|$(HOST_PREFIX)\|/$(OCTAVE_ADD_PATH)\|g;s\|$(BUILD_TOOLS_PREFIX)\|/$(OCTAVE_ADD_PATH)\|g' {} \; ;
9fa4ad9a659a * binary-dist-rules.mk: in mingw, update all non ext script files for /mingXX path John Donoghue parents: 4795 diff changeset	136 find '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin' -type f ! -name "." \
4906 bcfecd611e1b * binary-dist-rules.mk: remove '/' from any addpath paths John Donoghue parents: 4807 diff changeset	137 -exec sh -c 'test `head -c2 {}` = "#!" && $(SED) -i "s\|$(HOST_PREFIX)\|$(OCTAVE_ADD_PATH)\|g;s\|$(BUILD_TOOLS_PREFIX)\|$(OCTAVE_ADD_PATH)\|g" {}' \; ;
4807 9fa4ad9a659a * binary-dist-rules.mk: in mingw, update all non ext script files for /mingXX path John Donoghue parents: 4795 diff changeset	138 # some additional script files to fix
9fa4ad9a659a * binary-dist-rules.mk: in mingw, update all non ext script files for /mingXX path John Donoghue parents: 4795 diff changeset	139 $(SED) -i "s\|datadir = '/usr/share'\|datadir = '$(OCTAVE_ADD_PATH)/share'\|g" '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/makeinfo'
9fa4ad9a659a * binary-dist-rules.mk: in mingw, update all non ext script files for /mingXX path John Donoghue parents: 4795 diff changeset	140
3673 972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	141 endef
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	142 else
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	143 define copy-windows-dist-files
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	144 echo " DLL files..."
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	145 cp /mingw/bin/*.dll $(OCTAVE_DIST_DIR)/bin
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	146 echo " README.html..."
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	147 cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	148 echo " refblas..."
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	149 cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll
4767 a800e350d88b use .bat file for octave.exe/octave-version.exe (Bug #53938) John Donoghue parents: 4698 diff changeset	150 echo " octave.vbs..."
a800e350d88b use .bat file for octave.exe/octave-version.exe (Bug #53938) John Donoghue parents: 4698 diff changeset	151 cp $(TOP_DIR)/installer-files/octave.vbs $(OCTAVE_DIST_DIR)/
a800e350d88b use .bat file for octave.exe/octave-version.exe (Bug #53938) John Donoghue parents: 4698 diff changeset	152 cp $(TOP_DIR)/installer-files/octave-firsttime.vbs $(OCTAVE_DIST_DIR)/
4254 7f2d5c8c4491 installer: update fc cache during install (Bug #45458) John D parents: 4174 diff changeset	153 cp $(TOP_DIR)/installer-files/fc_update.bat $(OCTAVE_DIST_DIR)/
4793 202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install John Donoghue parents: 4788 diff changeset	154 cp $(TOP_DIR)/installer-files/post-install.bat $(OCTAVE_DIST_DIR)/
4767 a800e350d88b use .bat file for octave.exe/octave-version.exe (Bug #53938) John Donoghue parents: 4698 diff changeset	155 echo " updating octave .exe to script files..."
a800e350d88b use .bat file for octave.exe/octave-version.exe (Bug #53938) John Donoghue parents: 4698 diff changeset	156 rm -f $(OCTAVE_DIST_DIR)/bin/octave.exe
a800e350d88b use .bat file for octave.exe/octave-version.exe (Bug #53938) John Donoghue parents: 4698 diff changeset	157 rm -f $(OCTAVE_DIST_DIR)/bin/octave-$($(OCTAVE_TARGET)_VERSION).exe
a800e350d88b use .bat file for octave.exe/octave-version.exe (Bug #53938) John Donoghue parents: 4698 diff changeset	158 cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)/bin/octave.bat
a800e350d88b use .bat file for octave.exe/octave-version.exe (Bug #53938) John Donoghue parents: 4698 diff changeset	159 cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)/bin/octave-$($(OCTAVE_TARGET)_VERSION).bat
3673 972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	160 endef
972f2d9c76ca tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) John Donoghue parents: 3588 diff changeset	161 endif
3442 ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	162 endif
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	163
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	164 define make-dist-files-writable
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	165 echo "making all dist files writable by user..."
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	166 chmod -R u+w $(OCTAVE_DIST_DIR)
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	167 endef
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	168
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	169 ifeq ($(STRIP_DIST_FILES),yes)
3442 ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	170 ifeq ($(MXE_WINDOWS_BUILD),yes)
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	171 define strip-dist-files
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	172 echo "stripping files..."
4698 62d71f1bb5f5 dont strip notepad++ files (Bug #53854) John Donoghue parents: 4694 diff changeset	173 for f in `find $(OCTAVE_DIST_DIR) -name '.dll' -o -name '.exe' -o -name '*.oct' \| $(GREP) -v "notepad++" `; do \
4913 0958cf066f1a Don't strip files starting with a shebang (bug #55281). Markus Mützel <markus.muetzel@gmx.de> parents: 4906 diff changeset	174 if [ "$$(head -n1 $$f \| cut -c1-2)" != "#!" ]; then \
0958cf066f1a Don't strip files starting with a shebang (bug #55281). Markus Mützel <markus.muetzel@gmx.de> parents: 4906 diff changeset	175 $(MXE_STRIP) $$f; \
0958cf066f1a Don't strip files starting with a shebang (bug #55281). Markus Mützel <markus.muetzel@gmx.de> parents: 4906 diff changeset	176 fi; \
3442 ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	177 done
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	178 endef
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	179 else
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	180 define strip-dist-files
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	181 echo "stripping files..."
3446 f827586fef9c * binary-dist-rules.mk: don't use $(shell ...) in shell for loop John W. Eaton <jwe@octave.org> parents: 3444 diff changeset	182 for f in `find $(OCTAVE_DIST_DIR) -type f -a -perm /a+x`; do \
3442 ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	183 case "`file $$f`" in \
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	184 script) \
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	185 ;; \
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	186 executable \| archive \| "shared object") \
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	187 $(MXE_STRIP) $$f; \
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	188 ;; \
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	189 esac; \
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	190 done
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	191 endef
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	192 endif
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	193 else
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	194 define strip-dist-files
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	195 echo "not stripping files..."
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	196 endef
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	197 endif
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	198
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	199 OCTAVE_WRAPPER_SCRIPTS = octave octave-cli octave-config
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	200
ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	201 ifeq ($(MXE_SYSTEM), gnu-linux)
3530 1e09264307e8 binary-dist-rules.mk: Style fixes. John W. Eaton <jwe@octave.org> parents: 3529 diff changeset	202 define install-octave-wrapper-scripts
1e09264307e8 binary-dist-rules.mk: Style fixes. John W. Eaton <jwe@octave.org> parents: 3529 diff changeset	203 echo "installing octave wrapper scripts..."
1e09264307e8 binary-dist-rules.mk: Style fixes. John W. Eaton <jwe@octave.org> parents: 3529 diff changeset	204 for f in $(OCTAVE_WRAPPER_SCRIPTS); do \
1e09264307e8 binary-dist-rules.mk: Style fixes. John W. Eaton <jwe@octave.org> parents: 3529 diff changeset	205 mv $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION) \
1e09264307e8 binary-dist-rules.mk: Style fixes. John W. Eaton <jwe@octave.org> parents: 3529 diff changeset	206 $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION).real; \
1e09264307e8 binary-dist-rules.mk: Style fixes. John W. Eaton <jwe@octave.org> parents: 3529 diff changeset	207 $(SED) < octave-wrapper.in \
4506 f3d64fe692e6 octave-wrapper.in: Include GCC library directory in LD_LIBRARY_PATH. John W. Eaton <jwe@octave.org> parents: 4254 diff changeset	208 -e "s\|@GCC_VERSION@\|$(native-gcc_VERSION)\|" \
f3d64fe692e6 octave-wrapper.in: Include GCC library directory in LD_LIBRARY_PATH. John W. Eaton <jwe@octave.org> parents: 4254 diff changeset	209 -e "s\|@GCC_ARCH@\|$(TARGET)\|" \
3530 1e09264307e8 binary-dist-rules.mk: Style fixes. John W. Eaton <jwe@octave.org> parents: 3529 diff changeset	210 -e "s\|@OCTAVE_VERSION@\|$($(OCTAVE_TARGET)_VERSION)\|" \
3862 c08abc3f5bf3 correctly extract first two digits of gnuplot version number John W. Eaton <jwe@octave.org> parents: 3817 diff changeset	211 -e "s\|@GNUPLOT_MAJOR_MINOR_VERSION@\|$(shell echo $(gnuplot_VERSION) \| $(SED) -e 's/$^[0-9][0-9]\.[0-9][0-9]$\..*/\1/')\|" \
3530 1e09264307e8 binary-dist-rules.mk: Style fixes. John W. Eaton <jwe@octave.org> parents: 3529 diff changeset	212 -e "s\|@PROGRAM_NAME@\|$$f\|" > $$f-t \
1e09264307e8 binary-dist-rules.mk: Style fixes. John W. Eaton <jwe@octave.org> parents: 3529 diff changeset	213 && $(INSTALL) -m 755 $$f-t $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION); \
1e09264307e8 binary-dist-rules.mk: Style fixes. John W. Eaton <jwe@octave.org> parents: 3529 diff changeset	214 rm -f $(OCTAVE_DIST_DIR)/bin/$$f; \
1e09264307e8 binary-dist-rules.mk: Style fixes. John W. Eaton <jwe@octave.org> parents: 3529 diff changeset	215 ln -s $$f-$($(OCTAVE_TARGET)_VERSION) $(OCTAVE_DIST_DIR)/bin/$$f; \
1e09264307e8 binary-dist-rules.mk: Style fixes. John W. Eaton <jwe@octave.org> parents: 3529 diff changeset	216 done
1e09264307e8 binary-dist-rules.mk: Style fixes. John W. Eaton <jwe@octave.org> parents: 3529 diff changeset	217 endef
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	218 else
3530 1e09264307e8 binary-dist-rules.mk: Style fixes. John W. Eaton <jwe@octave.org> parents: 3529 diff changeset	219 define install-octave-wrapper-scripts
1e09264307e8 binary-dist-rules.mk: Style fixes. John W. Eaton <jwe@octave.org> parents: 3529 diff changeset	220 echo "no octave wrapper scripts to install for this system..."
1e09264307e8 binary-dist-rules.mk: Style fixes. John W. Eaton <jwe@octave.org> parents: 3529 diff changeset	221 endef
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	222 endif
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	223
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	224 .PHONY: binary-dist-files
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	225 binary-dist-files: $(BINARY_DIST_DEPS)
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	226 @$(delete-dist-directory)
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	227 @$(make-dist-directory)
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	228 @$(copy-dist-files)
3442 ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	229 @$(copy-windows-dist-files)
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	230 @$(make-dist-files-writable)
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	231 @$(strip-dist-files)
3442 ebe73c541a16 allow binary dist to work for gnu-linux target John W. Eaton <jwe@octave.org> parents: 3435 diff changeset	232 @$(install-octave-wrapper-scripts)
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	233
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	234 define make-installer-file
3571 44eb8941c35f fix make nsis-installer John Donoghue <john.donoghue@ieee.org> parents: 3569 diff changeset	235 if [ -f $(OCTAVE_NSI_FILE) ]; then \
44eb8941c35f fix make nsis-installer John Donoghue <john.donoghue@ieee.org> parents: 3569 diff changeset	236 echo "deleting previous installer script..."; \
44eb8941c35f fix make nsis-installer John Donoghue <john.donoghue@ieee.org> parents: 3569 diff changeset	237 rm -f $(OCTAVE_NSI_FILE); \
3569 c53ea91b338b don't delete generated installer script John W. Eaton <jwe@octave.org> parents: 3544 diff changeset	238 fi
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	239 echo "generating installer script..."
4658 213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	240 $(TOP_BUILD_DIR)/tools/makeinst-script.sh $(OCTAVE_DIST_DIR) $(OCTAVE_DIST_NAME)-installer.exe $(OCTAVE_NSI_FILE)
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	241 echo "generating installer..."
4066 0962acdde3be builld: allow out of source build John Donoghue parents: 4028 diff changeset	242 $(TARGET)-makensis $(OCTAVE_NSI_FILE) > $(TOP_BUILD_DIR)/dist/nsis.log
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	243 endef
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	244
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	245 $(OCTAVE_DIST_NAME)-installer.exe: nsis binary-dist-files
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	246 @$(make-installer-file)
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	247
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	248 .PHONY: nsis-installer
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	249 nsis-installer: $(OCTAVE_DIST_NAME)-installer.exe
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	250
4658 213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	251 define make-7z-dist
213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	252 echo "generating 7z file..."
213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	253 cd $(TOP_BUILD_DIR)/dist && p7zip -k $(OCTAVE_DIST_NAME)
213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	254 endef
213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	255
213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	256 .PHONY: 7z-dist
213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	257 7z-dist: binary-dist-files
213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	258 @$(make-7z-dist)
213da5688be0 update binary dist rules John W. Eaton <jwe@octave.org> parents: 4590 diff changeset	259
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	260 define make-zip-dist
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	261 echo "generating zip file..."
4066 0962acdde3be builld: allow out of source build John Donoghue parents: 4028 diff changeset	262 cd $(TOP_BUILD_DIR)/dist \
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	263 && zip -q -9 -r $(OCTAVE_DIST_NAME).zip $(OCTAVE_DIST_NAME)
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	264 endef
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	265
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	266 .PHONY: zip-dist
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	267 zip-dist: binary-dist-files
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	268 @$(make-zip-dist)
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	269
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	270 define make-tar-dist
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	271 echo "generating tar file..."
4066 0962acdde3be builld: allow out of source build John Donoghue parents: 4028 diff changeset	272 cd $(TOP_BUILD_DIR)/dist \
3432 5fc3d674ca3a Correctly name output of dist-tar with .tgz, not .zip, extension. Rik <rik@octave.org> parents: 3431 diff changeset	273 && tar -c -z -f $(OCTAVE_DIST_NAME).tgz $(OCTAVE_DIST_NAME)
3431 a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	274 endef
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	275
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	276 .PHONY: tar-dist
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	277 tar-dist: binary-dist-files
a7c772aa106f Move mk-dist script functionality into Makefile. John W. Eaton <jwe@octave.org> parents: diff changeset	278 @$(make-tar-dist)

Mercurial > mxe-octave

annotate binary-dist-rules.mk @ 4945:76828d146a8d