Mercurial > mxe-octave

comparison binary-dist-rules.mk @ 4767:a800e350d88b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use .bat file for octave.exe/octave-version.exe (Bug #53938) * binary-dist-rules.mk: in windows, remove octave.exe and octave-version.exe and replace with octave.bat, copied to bin dir * installer-files/octave.bat: update path finding with .bat file in /bin instead of /, stub beginning of file to recall with cmd.exe if run from bash * tools/makeinst-script.sh.in: remove octave.bat from toplevel of installer, look for octave-cli.exe not octave.exe in prev installed check
author John Donoghue
date Mon, 09 Jul 2018 14:38:21 -0400
parents 62d71f1bb5f5
children 65dfbc5a5dbc
comparison
equal deleted inserted replaced
4766:7f203bae655e 4767:a800e350d88b
87 && tar -c $(TAR_H_OPTION) -f - notepad++ | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - ) 87 && tar -c $(TAR_H_OPTION) -f - notepad++ | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
88 echo " README.html..." 88 echo " README.html..."
89 cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/ 89 cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/
90 echo " refblas..." 90 echo " refblas..."
91 cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll 91 cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll
92 echo " octave.bat..." 92 echo " octave.vbs..."
93 cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)/
94 cp $(TOP_DIR)/installer-files/octave.vbs $(OCTAVE_DIST_DIR)/ 93 cp $(TOP_DIR)/installer-files/octave.vbs $(OCTAVE_DIST_DIR)/
95 cp $(TOP_DIR)/installer-files/octave-firsttime.vbs $(OCTAVE_DIST_DIR)/ 94 cp $(TOP_DIR)/installer-files/octave-firsttime.vbs $(OCTAVE_DIST_DIR)/
95 cp $(TOP_DIR)/installer-files/fc_update.bat $(OCTAVE_DIST_DIR)/
96 cp $(TOP_BUILD_DIR)/HG-ID $(OCTAVE_DIST_DIR)/ 96 cp $(TOP_BUILD_DIR)/HG-ID $(OCTAVE_DIST_DIR)/
97 echo " updating octave .exe to script files..."
98 rm -f $(OCTAVE_DIST_DIR)/bin/octave.exe
99 rm -f $(OCTAVE_DIST_DIR)/bin/octave-$($(OCTAVE_TARGET)_VERSION).exe
100 cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)/bin/octave.bat
101 cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)/bin/octave-$($(OCTAVE_TARGET)_VERSION).bat
97 echo " updating libtool references..." 102 echo " updating libtool references..."
98 find '$(OCTAVE_DIST_DIR)/' -type f -name "*.la" \ 103 find '$(OCTAVE_DIST_DIR)/' -type f -name "*.la" \
99 -exec $(SED) -i 's|$(HOST_PREFIX)|/usr|g;s|$(BUILD_TOOLS_PREFIX)|/usr|g' {} \; ; 104 -exec $(SED) -i 's|$(HOST_PREFIX)|/usr|g;s|$(BUILD_TOOLS_PREFIX)|/usr|g' {} \; ;
100 echo " updating pkg-config .pc references..." 105 echo " updating pkg-config .pc references..."
101 find '$(OCTAVE_DIST_DIR)/lib/pkgconfig' -type f -name "*.pc" \ 106 find '$(OCTAVE_DIST_DIR)/lib/pkgconfig' -type f -name "*.pc" \
104 cp $(TOP_DIR)/installer-files/cmdshell.bat $(OCTAVE_DIST_DIR)/; \ 109 cp $(TOP_DIR)/installer-files/cmdshell.bat $(OCTAVE_DIST_DIR)/; \
105 fi 110 fi
106 echo " updating script config tool references..." 111 echo " updating script config tool references..."
107 find '$(OCTAVE_DIST_DIR)/bin' -type f -name "*-config" \ 112 find '$(OCTAVE_DIST_DIR)/bin' -type f -name "*-config" \
108 -exec $(SED) -i 's|$(HOST_PREFIX)|/usr|g;s|$(BUILD_TOOLS_PREFIX)|/usr|g' {} \; ; 113 -exec $(SED) -i 's|$(HOST_PREFIX)|/usr|g;s|$(BUILD_TOOLS_PREFIX)|/usr|g' {} \; ;
109 cp $(TOP_DIR)/installer-files/fc_update.bat $(OCTAVE_DIST_DIR)/
110 endef 114 endef
111 else 115 else
112 define copy-windows-dist-files 116 define copy-windows-dist-files
113 echo " DLL files..." 117 echo " DLL files..."
114 cp /mingw/bin/*.dll $(OCTAVE_DIST_DIR)/bin 118 cp /mingw/bin/*.dll $(OCTAVE_DIST_DIR)/bin
115 echo " README.html..." 119 echo " README.html..."
116 cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/ 120 cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/
117 echo " refblas..." 121 echo " refblas..."
118 cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll 122 cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll
119 echo " octave.bat..." 123 echo " octave.vbs..."
120 cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)/ 124 cp $(TOP_DIR)/installer-files/octave.vbs $(OCTAVE_DIST_DIR)/
125 cp $(TOP_DIR)/installer-files/octave-firsttime.vbs $(OCTAVE_DIST_DIR)/
121 cp $(TOP_DIR)/installer-files/fc_update.bat $(OCTAVE_DIST_DIR)/ 126 cp $(TOP_DIR)/installer-files/fc_update.bat $(OCTAVE_DIST_DIR)/
127 echo " updating octave .exe to script files..."
128 rm -f $(OCTAVE_DIST_DIR)/bin/octave.exe
129 rm -f $(OCTAVE_DIST_DIR)/bin/octave-$($(OCTAVE_TARGET)_VERSION).exe
130 cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)/bin/octave.bat
131 cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)/bin/octave-$($(OCTAVE_TARGET)_VERSION).bat
122 endef 132 endef
123 endif 133 endif
124 endif 134 endif
125 135
126 define make-dist-files-writable 136 define make-dist-files-writable