Mercurial > mxe-octave

comparison binary-dist-rules.mk @ 5957:9cd5425b033b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
octave-launch-firsttime: New launcher executable for starting Octave first time. * installer-files/octave-launch.c: Conditionally change to USERPROFILE before running Octave. * binary-dist-rules.mk(octave-launch-firsttime, installer-files/octave-launch-firsttime.exe): Add build rules for new launcher executable. (copy-windows-dist-files): Copy octave-launch-firsttime.exe to $(OCTAVE_DIST_DIR).
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 20 Nov 2021 15:34:20 +0100
parents b8e9589b7794
children bf9be5e7ab00
comparison
equal deleted inserted replaced
5956:b8e9589b7794 5957:9cd5425b033b
24 OCTAVE_ADD_PATH := / 24 OCTAVE_ADD_PATH := /
25 ifeq ($(MXE_WINDOWS_BUILD),yes) 25 ifeq ($(MXE_WINDOWS_BUILD),yes)
26 TAR_H_OPTION := -h 26 TAR_H_OPTION := -h
27 WINDOWS_BINARY_DIST_DEPS := \ 27 WINDOWS_BINARY_DIST_DEPS := \
28 octave-launch \ 28 octave-launch \
29 octave-launch-firsttime \
29 win7appid \ 30 win7appid \
30 blas_switch 31 blas_switch
31 32
32 ifeq ($(USE_MSYS2),yes) 33 ifeq ($(USE_MSYS2),yes)
33 WINDOWS_BINARY_DIST_DEPS += \ 34 WINDOWS_BINARY_DIST_DEPS += \
97 octave-launch: installer-files/octave-launch.exe 98 octave-launch: installer-files/octave-launch.exe
98 99
99 ## FIXME: We aren't using VPATH? 100 ## FIXME: We aren't using VPATH?
100 installer-files/octave-launch.exe: $(TOP_DIR)/installer-files/octave-launch.c | installer-files/.dirstamp 101 installer-files/octave-launch.exe: $(TOP_DIR)/installer-files/octave-launch.c | installer-files/.dirstamp
101 $(MXE_CC) $< -o $@ -Wl,--subsystem,windows -lshlwapi -municode -DUNICODE -D_UNICODE 102 $(MXE_CC) $< -o $@ -Wl,--subsystem,windows -lshlwapi -municode -DUNICODE -D_UNICODE
103
104 .PHONY: octave-launch-firsttime
105 octave-launch-firsttime: installer-files/octave-launch-firsttime.exe
106
107 ## FIXME: We aren't using VPATH?
108 installer-files/octave-launch-firsttime.exe: $(TOP_DIR)/installer-files/octave-launch.c | installer-files/.dirstamp
109 $(MXE_CC) $< -o $@ -Wl,--subsystem,windows -lshlwapi -municode -DUNICODE -D_UNICODE -DFIRST_TIME
102 endif 110 endif
103 111
104 ifeq ($(MXE_WINDOWS_BUILD),yes) 112 ifeq ($(MXE_WINDOWS_BUILD),yes)
105 ifeq ($(MXE_NATIVE_BUILD),no) 113 ifeq ($(MXE_NATIVE_BUILD),no)
106 define copy-windows-dist-files 114 define copy-windows-dist-files
127 cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/ 135 cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/
128 echo " refblas..." 136 echo " refblas..."
129 cp $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/libblas.dll $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/librefblas.dll 137 cp $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/libblas.dll $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/librefblas.dll
130 echo " installing octave-launch.exe..." 138 echo " installing octave-launch.exe..."
131 cp $(TOP_BUILD_DIR)/installer-files/octave-launch.exe $(OCTAVE_DIST_DIR)/ 139 cp $(TOP_BUILD_DIR)/installer-files/octave-launch.exe $(OCTAVE_DIST_DIR)/
140 cp $(TOP_BUILD_DIR)/installer-files/octave-launch-firsttime.exe $(OCTAVE_DIST_DIR)/
132 echo " octave.vbs..." 141 echo " octave.vbs..."
133 cp $(TOP_DIR)/installer-files/octave.vbs $(OCTAVE_DIST_DIR)/ 142 cp $(TOP_DIR)/installer-files/octave.vbs $(OCTAVE_DIST_DIR)/
134 cp $(TOP_DIR)/installer-files/octave-firsttime.vbs $(OCTAVE_DIST_DIR)/ 143 cp $(TOP_DIR)/installer-files/octave-firsttime.vbs $(OCTAVE_DIST_DIR)/
135 cp $(TOP_DIR)/installer-files/fc_update.bat $(OCTAVE_DIST_DIR)/ 144 cp $(TOP_DIR)/installer-files/fc_update.bat $(OCTAVE_DIST_DIR)/
136 cp $(TOP_DIR)/installer-files/post-install.bat $(OCTAVE_DIST_DIR)/ 145 cp $(TOP_DIR)/installer-files/post-install.bat $(OCTAVE_DIST_DIR)/
177 cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/ 186 cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/
178 echo " refblas..." 187 echo " refblas..."
179 cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll 188 cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll
180 echo " installing octave-launch.exe..." 189 echo " installing octave-launch.exe..."
181 cp $(TOP_BUILD_DIR)/installer-files/octave-launch.exe $(OCTAVE_DIST_DIR)/ 190 cp $(TOP_BUILD_DIR)/installer-files/octave-launch.exe $(OCTAVE_DIST_DIR)/
191 cp $(TOP_BUILD_DIR)/installer-files/octave-launch-firsttime.exe $(OCTAVE_DIST_DIR)/
182 echo " octave.vbs..." 192 echo " octave.vbs..."
183 cp $(TOP_DIR)/installer-files/octave.vbs $(OCTAVE_DIST_DIR)/ 193 cp $(TOP_DIR)/installer-files/octave.vbs $(OCTAVE_DIST_DIR)/
184 cp $(TOP_DIR)/installer-files/octave-firsttime.vbs $(OCTAVE_DIST_DIR)/ 194 cp $(TOP_DIR)/installer-files/octave-firsttime.vbs $(OCTAVE_DIST_DIR)/
185 cp $(TOP_DIR)/installer-files/fc_update.bat $(OCTAVE_DIST_DIR)/ 195 cp $(TOP_DIR)/installer-files/fc_update.bat $(OCTAVE_DIST_DIR)/
186 cp $(TOP_DIR)/installer-files/post-install.bat $(OCTAVE_DIST_DIR)/ 196 cp $(TOP_DIR)/installer-files/post-install.bat $(OCTAVE_DIST_DIR)/