Mercurial > mxe-octave

comparison binary-dist-rules.mk @ 5650:6805ab42c8aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't convert to short paths for default-octave target (bug #59923). * installer-files/octave-no-shortpath.patch, installer-files/octave-bat-no-shortpath.patch, installer-files/cmdshell-no-shortpath.patch: Add patches that remove conversion of path to short file names from scripts. * binary-dist-rules.mk: Apply new patches for default-octave target. * dist-files.mk: Add new files to build system.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 31 Jan 2021 18:38:38 +0100
parents b54b1a7533ac
children b532d40c63d8
comparison
equal deleted inserted replaced
5649:27b4f385c45d 5650:6805ab42c8aa
116 echo " octave.vbs..." 116 echo " octave.vbs..."
117 cp $(TOP_DIR)/installer-files/octave.vbs $(OCTAVE_DIST_DIR)/ 117 cp $(TOP_DIR)/installer-files/octave.vbs $(OCTAVE_DIST_DIR)/
118 cp $(TOP_DIR)/installer-files/octave-firsttime.vbs $(OCTAVE_DIST_DIR)/ 118 cp $(TOP_DIR)/installer-files/octave-firsttime.vbs $(OCTAVE_DIST_DIR)/
119 cp $(TOP_DIR)/installer-files/fc_update.bat $(OCTAVE_DIST_DIR)/ 119 cp $(TOP_DIR)/installer-files/fc_update.bat $(OCTAVE_DIST_DIR)/
120 cp $(TOP_DIR)/installer-files/post-install.bat $(OCTAVE_DIST_DIR)/ 120 cp $(TOP_DIR)/installer-files/post-install.bat $(OCTAVE_DIST_DIR)/
121 # This patch can be dropped as soon as those lines are removed from
122 # the startup scripts for all targets (including stable and release).
123 if [ "$(OCTAVE_TARGET)" = "default-octave" ]; then \
124 (cd '$(OCTAVE_DIST_DIR)' && $(PATCH) -p1 -u) < $(TOP_DIR)/installer-files/octave-no-short-path.patch; \
125 fi
121 cp $(TOP_BUILD_DIR)/HG-ID $(OCTAVE_DIST_DIR)/ 126 cp $(TOP_BUILD_DIR)/HG-ID $(OCTAVE_DIST_DIR)/
122 echo " updating octave .exe to script files..." 127 echo " updating octave .exe to script files..."
123 rm -f $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave.exe 128 rm -f $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave.exe
124 rm -f $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave-$($(OCTAVE_TARGET)_VERSION).exe 129 rm -f $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave-$($(OCTAVE_TARGET)_VERSION).exe
125 cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave.bat 130 cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave.bat
131 # This patch can be dropped as soon as those lines are removed from
132 # "octave.bat" for all targets (including stable and release).
133 if [ "$(OCTAVE_TARGET)" = "default-octave" ]; then \
134 (cd '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin' && $(PATCH) -p1 -u) < $(TOP_DIR)/installer-files/octave-bat-no-short-path.patch; \
135 fi
126 cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave-$($(OCTAVE_TARGET)_VERSION).bat 136 cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave-$($(OCTAVE_TARGET)_VERSION).bat
127 echo " updating libtool references..." 137 echo " updating libtool references..."
128 find '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/' -type f -name "*.la" \ 138 find '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/' -type f -name "*.la" \
129 -exec $(SED) -i 's|$(HOST_PREFIX)|/usr|g;s|$(BUILD_TOOLS_PREFIX)|/usr|g' {} \; ; 139 -exec $(SED) -i 's|$(HOST_PREFIX)|/usr|g;s|$(BUILD_TOOLS_PREFIX)|/usr|g' {} \; ;
130 echo " updating pkg-config .pc references..." 140 echo " updating pkg-config .pc references..."
131 find '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/lib/pkgconfig' -type f -name "*.pc" \ 141 find '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/lib/pkgconfig' -type f -name "*.pc" \
132 -exec $(SED) -i 's|$(HOST_PREFIX)|/usr|g;s|$(BUILD_TOOLS_PREFIX)|/usr|g' {} \; ; 142 -exec $(SED) -i 's|$(HOST_PREFIX)|/usr|g;s|$(BUILD_TOOLS_PREFIX)|/usr|g' {} \; ;
133 if [ "$(ENABLE_DEVEL_TOOLS)" = "yes" ]; then \ 143 if [ "$(ENABLE_DEVEL_TOOLS)" = "yes" ]; then \
134 cp $(TOP_DIR)/installer-files/cmdshell.bat $(OCTAVE_DIST_DIR)/; \ 144 cp $(TOP_DIR)/installer-files/cmdshell.bat $(OCTAVE_DIST_DIR)/; \
145 if [ "$(OCTAVE_TARGET)" = "default-octave" ]; then \
146 (cd '$(OCTAVE_DIST_DIR)' && $(PATCH) -p1 -u) < $(TOP_DIR)/installer-files/cmdshell-no-short-path.patch; \
147 fi; \
135 fi 148 fi
136 echo " updating script tool references..." 149 echo " updating script tool references..."
137 #find '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin' -type f ! -name "*.*" \ 150 #find '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin' -type f ! -name "*.*" \
138 # -exec $(SED) -i 's|$(HOST_PREFIX)|/$(OCTAVE_ADD_PATH)|g;s|$(BUILD_TOOLS_PREFIX)|/$(OCTAVE_ADD_PATH)|g' {} \; ; 151 # -exec $(SED) -i 's|$(HOST_PREFIX)|/$(OCTAVE_ADD_PATH)|g;s|$(BUILD_TOOLS_PREFIX)|/$(OCTAVE_ADD_PATH)|g' {} \; ;
139 find '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin' -type f ! -name "*.*" \ 152 find '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin' -type f ! -name "*.*" \