Mercurial > mxe-octave
annotate binary-dist-rules.mk @ 4788:65dfbc5a5dbc
binary-dist-rules.mk (OCTAVE_DIST_NAME): Use octave-$($(OCTAVE_TARGET)_VERSION)$(OCTAVE_PLATFORM_SUFFIX) for octave-release version.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 09 Aug 2018 16:15:12 -0400 |
parents | a800e350d88b |
children | 202fa20cf559 |
rev | line source |
---|---|
4658 | 1 |
2 ifeq ($(MXE_WINDOWS_BUILD),yes) | |
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 | 5 OCTAVE_PLATFORM_SUFFIX := -w64-64 |
6 else | |
7 OCTAVE_PLATFORM_SUFFIX := -w64 | |
8 endif | |
9 else | |
10 OCTAVE_PLATFORM_SUFFIX := -w32 | |
11 endif | |
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 | 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 | 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 | 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 | 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 |
3442
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
24 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
|
25 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
|
26 WINDOWS_BINARY_DIST_DEPS := \ |
3709
c8546fe79bc9
download src files for msys packages when building Windows zip file or installer
John W. Eaton <jwe@octave.org>
parents:
3673
diff
changeset
|
27 msys-base \ |
4174
2b631cf1c210
win7appid: new package
John Donoghue <john.donoghue@ieee.org>
parents:
4124
diff
changeset
|
28 msys-base-sources \ |
2b631cf1c210
win7appid: new package
John Donoghue <john.donoghue@ieee.org>
parents:
4124
diff
changeset
|
29 win7appid |
3673
972f2d9c76ca
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874)
John Donoghue
parents:
3588
diff
changeset
|
30 |
972f2d9c76ca
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874)
John Donoghue
parents:
3588
diff
changeset
|
31 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
|
32 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
|
33 native-binutils \ |
972f2d9c76ca
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874)
John Donoghue
parents:
3588
diff
changeset
|
34 native-gcc \ |
972f2d9c76ca
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874)
John Donoghue
parents:
3588
diff
changeset
|
35 npp |
972f2d9c76ca
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874)
John Donoghue
parents:
3588
diff
changeset
|
36 endif |
972f2d9c76ca
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874)
John Donoghue
parents:
3588
diff
changeset
|
37 |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
38 endif |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
39 |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
40 BINARY_DIST_DEPS := \ |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
41 $(OCTAVE_TARGET) \ |
3471
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3468
diff
changeset
|
42 blas-packages \ |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
43 octave-forge-packages \ |
3958
ac3abcea55e8
Add --enable-devel-tools option to configure
John Donoghue <john.donoghue@ieee.org>
parents:
3862
diff
changeset
|
44 devel-packages \ |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
45 units \ |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
46 transfig \ |
3435
9fcc72373e24
build stable-octave package by default
John W. Eaton <jwe@octave.org>
parents:
3433
diff
changeset
|
47 $(WINDOWS_BINARY_DIST_DEPS) |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
48 |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
49 define delete-dist-directory |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
50 echo "deleting previous dist directory..." |
4066 | 51 rm -rf $(TOP_BUILD_DIR)/dist |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
52 endef |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
53 |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
54 define make-dist-directory |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
55 echo "creating dist directory..." |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
56 mkdir -p $(OCTAVE_DIST_DIR) |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
57 endef |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
58 |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
59 define copy-dist-files |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
60 echo "copying files..." |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
61 echo " octave and dependencies..." |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
62 cd $(HOST_PREFIX) \ |
3522
9bc3862c2091
update binary-dist rules for new way of building gcc
John W. Eaton <jwe@octave.org>
parents:
3517
diff
changeset
|
63 && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - ) |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
64 echo " octaverc file..." |
3522
9bc3862c2091
update binary-dist rules for new way of building gcc
John W. Eaton <jwe@octave.org>
parents:
3517
diff
changeset
|
65 cp $(TOP_DIR)/octaverc $(OCTAVE_DIST_DIR)/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
|
66 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
|
67 echo " build_packages.m..."; \ |
e5e0b3f7244b
Dont copy src directory if binary packages enabled
John Donoghue <john.donoghue@ieee.org>
parents:
4066
diff
changeset
|
68 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
|
69 fi |
3442
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
70 endef |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
71 |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
72 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
|
73 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
|
74 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
|
75 echo " DLL files..." |
972f2d9c76ca
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874)
John Donoghue
parents:
3588
diff
changeset
|
76 cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/*.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
|
77 cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/*.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
|
78 cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/$(build-gcc_VERSION)/*.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
|
79 echo " msys base files..." |
4066 | 80 cd $(TOP_BUILD_DIR)/msys-base \ |
3673
972f2d9c76ca
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874)
John Donoghue
parents:
3588
diff
changeset
|
81 && tar -c $(TAR_H_OPTION) -f - . | ( 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
|
82 echo " msys extension files..." |
4066 | 83 cd $(TOP_BUILD_DIR)/msys-extension \ |
3673
972f2d9c76ca
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874)
John Donoghue
parents:
3588
diff
changeset
|
84 && tar -c $(TAR_H_OPTION) -f - . | ( 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
|
85 echo " notepad++..." |
4066 | 86 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
|
87 && 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
|
88 echo " README.html..." |
972f2d9c76ca
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874)
John Donoghue
parents:
3588
diff
changeset
|
89 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
|
90 echo " refblas..." |
972f2d9c76ca
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874)
John Donoghue
parents:
3588
diff
changeset
|
91 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
|
92 echo " octave.vbs..." |
3817
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
3721
diff
changeset
|
93 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
|
94 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
|
95 cp $(TOP_DIR)/installer-files/fc_update.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
|
96 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
|
97 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
|
98 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
|
99 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
|
100 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
|
101 cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)/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
|
102 echo " updating libtool references..." |
3963
9d402d735dd1
nsis-installer: add bash window menu if devel tools enabled
John Donoghue
parents:
3961
diff
changeset
|
103 find '$(OCTAVE_DIST_DIR)/' -type f -name "*.la" \ |
9d402d735dd1
nsis-installer: add bash window menu if devel tools enabled
John Donoghue
parents:
3961
diff
changeset
|
104 -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
|
105 echo " updating pkg-config .pc references..." |
3963
9d402d735dd1
nsis-installer: add bash window menu if devel tools enabled
John Donoghue
parents:
3961
diff
changeset
|
106 find '$(OCTAVE_DIST_DIR)/lib/pkgconfig' -type f -name "*.pc" \ |
9d402d735dd1
nsis-installer: add bash window menu if devel tools enabled
John Donoghue
parents:
3961
diff
changeset
|
107 -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
|
108 if [ "$(ENABLE_DEVEL_TOOLS)" = "yes" ]; then \ |
9d402d735dd1
nsis-installer: add bash window menu if devel tools enabled
John Donoghue
parents:
3961
diff
changeset
|
109 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
|
110 fi |
4686
63a6009ad3df
fix host -config script path when building dist file
John Donoghue
parents:
4658
diff
changeset
|
111 echo " updating script config tool references..." |
63a6009ad3df
fix host -config script path when building dist file
John Donoghue
parents:
4658
diff
changeset
|
112 find '$(OCTAVE_DIST_DIR)/bin' -type f -name "*-config" \ |
63a6009ad3df
fix host -config script path when building dist file
John Donoghue
parents:
4658
diff
changeset
|
113 -exec $(SED) -i 's|$(HOST_PREFIX)|/usr|g;s|$(BUILD_TOOLS_PREFIX)|/usr|g' {} \; ; |
3673
972f2d9c76ca
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874)
John Donoghue
parents:
3588
diff
changeset
|
114 endef |
972f2d9c76ca
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874)
John Donoghue
parents:
3588
diff
changeset
|
115 else |
972f2d9c76ca
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874)
John Donoghue
parents:
3588
diff
changeset
|
116 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
|
117 echo " DLL files..." |
972f2d9c76ca
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874)
John Donoghue
parents:
3588
diff
changeset
|
118 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
|
119 echo " README.html..." |
972f2d9c76ca
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874)
John Donoghue
parents:
3588
diff
changeset
|
120 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
|
121 echo " refblas..." |
972f2d9c76ca
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874)
John Donoghue
parents:
3588
diff
changeset
|
122 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
|
123 echo " octave.vbs..." |
a800e350d88b
use .bat file for octave.exe/octave-version.exe (Bug #53938)
John Donoghue
parents:
4698
diff
changeset
|
124 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
|
125 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
|
126 cp $(TOP_DIR)/installer-files/fc_update.bat $(OCTAVE_DIST_DIR)/ |
4767
a800e350d88b
use .bat file for octave.exe/octave-version.exe (Bug #53938)
John Donoghue
parents:
4698
diff
changeset
|
127 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
|
128 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
|
129 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
|
130 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
|
131 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
|
132 endef |
972f2d9c76ca
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874)
John Donoghue
parents:
3588
diff
changeset
|
133 endif |
3442
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
134 endif |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
135 |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
136 define make-dist-files-writable |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
137 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
|
138 chmod -R u+w $(OCTAVE_DIST_DIR) |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
139 endef |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
140 |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
141 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
|
142 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
|
143 define strip-dist-files |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
144 echo "stripping files..." |
4698 | 145 for f in `find $(OCTAVE_DIST_DIR) -name '*.dll' -o -name '*.exe' -o -name '*.oct' | $(GREP) -v "notepad++" `; do \ |
3442
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
146 $(MXE_STRIP) $$f; \ |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
147 done |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
148 endef |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
149 else |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
150 define strip-dist-files |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
151 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
|
152 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
|
153 case "`file $$f`" in \ |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
154 *script*) \ |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
155 ;; \ |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
156 *executable* | *archive* | *"shared object"*) \ |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
157 $(MXE_STRIP) $$f; \ |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
158 ;; \ |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
159 esac; \ |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
160 done |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
161 endef |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
162 endif |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
163 else |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
164 define strip-dist-files |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
165 echo "not stripping files..." |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
166 endef |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
167 endif |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
168 |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
169 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
|
170 |
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
171 ifeq ($(MXE_SYSTEM), gnu-linux) |
3530
1e09264307e8
binary-dist-rules.mk: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
3529
diff
changeset
|
172 define install-octave-wrapper-scripts |
1e09264307e8
binary-dist-rules.mk: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
3529
diff
changeset
|
173 echo "installing octave wrapper scripts..." |
1e09264307e8
binary-dist-rules.mk: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
3529
diff
changeset
|
174 for f in $(OCTAVE_WRAPPER_SCRIPTS); do \ |
1e09264307e8
binary-dist-rules.mk: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
3529
diff
changeset
|
175 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
|
176 $(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
|
177 $(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
|
178 -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
|
179 -e "s|@GCC_ARCH@|$(TARGET)|" \ |
3530
1e09264307e8
binary-dist-rules.mk: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
3529
diff
changeset
|
180 -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
|
181 -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
|
182 -e "s|@PROGRAM_NAME@|$$f|" > $$f-t \ |
1e09264307e8
binary-dist-rules.mk: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
3529
diff
changeset
|
183 && $(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
|
184 rm -f $(OCTAVE_DIST_DIR)/bin/$$f; \ |
1e09264307e8
binary-dist-rules.mk: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
3529
diff
changeset
|
185 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
|
186 done |
1e09264307e8
binary-dist-rules.mk: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
3529
diff
changeset
|
187 endef |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
188 else |
3530
1e09264307e8
binary-dist-rules.mk: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
3529
diff
changeset
|
189 define install-octave-wrapper-scripts |
1e09264307e8
binary-dist-rules.mk: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
3529
diff
changeset
|
190 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
|
191 endef |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
192 endif |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
193 |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
194 .PHONY: binary-dist-files |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
195 binary-dist-files: $(BINARY_DIST_DEPS) |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
196 @$(delete-dist-directory) |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
197 @$(make-dist-directory) |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
198 @$(copy-dist-files) |
3442
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
199 @$(copy-windows-dist-files) |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
200 @$(make-dist-files-writable) |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
201 @$(strip-dist-files) |
3442
ebe73c541a16
allow binary dist to work for gnu-linux target
John W. Eaton <jwe@octave.org>
parents:
3435
diff
changeset
|
202 @$(install-octave-wrapper-scripts) |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
203 |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
204 define make-installer-file |
3571
44eb8941c35f
fix make nsis-installer
John Donoghue <john.donoghue@ieee.org>
parents:
3569
diff
changeset
|
205 if [ -f $(OCTAVE_NSI_FILE) ]; then \ |
44eb8941c35f
fix make nsis-installer
John Donoghue <john.donoghue@ieee.org>
parents:
3569
diff
changeset
|
206 echo "deleting previous installer script..."; \ |
44eb8941c35f
fix make nsis-installer
John Donoghue <john.donoghue@ieee.org>
parents:
3569
diff
changeset
|
207 rm -f $(OCTAVE_NSI_FILE); \ |
3569
c53ea91b338b
don't delete generated installer script
John W. Eaton <jwe@octave.org>
parents:
3544
diff
changeset
|
208 fi |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
209 echo "generating installer script..." |
4658 | 210 $(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
|
211 echo "generating installer..." |
4066 | 212 $(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
|
213 endef |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
214 |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
215 $(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
|
216 @$(make-installer-file) |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
217 |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
218 .PHONY: nsis-installer |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
219 nsis-installer: $(OCTAVE_DIST_NAME)-installer.exe |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
220 |
4658 | 221 define make-7z-dist |
222 echo "generating 7z file..." | |
223 cd $(TOP_BUILD_DIR)/dist && p7zip -k $(OCTAVE_DIST_NAME) | |
224 endef | |
225 | |
226 .PHONY: 7z-dist | |
227 7z-dist: binary-dist-files | |
228 @$(make-7z-dist) | |
229 | |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
230 define make-zip-dist |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
231 echo "generating zip file..." |
4066 | 232 cd $(TOP_BUILD_DIR)/dist \ |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
233 && 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
|
234 endef |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
235 |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
236 .PHONY: zip-dist |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
237 zip-dist: binary-dist-files |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
238 @$(make-zip-dist) |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
239 |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
240 define make-tar-dist |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
241 echo "generating tar file..." |
4066 | 242 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
|
243 && 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
|
244 endef |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
245 |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
246 .PHONY: tar-dist |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
247 tar-dist: binary-dist-files |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
248 @$(make-tar-dist) |