# HG changeset patch # User Markus Mützel # Date 1611595665 -3600 # Mon Jan 25 18:27:45 2021 +0100 # Node ID ffc66470a4b582c1b81738d978e7c6a324d62ea8 # Parent 0e8dd3368dd8e2d7b7802ca21c723eabfb02a8c0 Don't use short paths for default-octave target (bug #59923). * installer-files/octave-vbs-no-shortpath.patch: Add patch that removes conversion of path to short file names from octave.vbs. * binary-dist-rules.mk: Apply new patch for default-octave target. * dist-files.mk: Add new file to build system. diff -r 0e8dd3368dd8 -r ffc66470a4b5 binary-dist-rules.mk --- a/binary-dist-rules.mk Sun Jan 24 14:17:54 2021 +0100 +++ b/binary-dist-rules.mk Mon Jan 25 18:27:45 2021 +0100 @@ -115,6 +115,11 @@ cp $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/libblas.dll $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/librefblas.dll echo " octave.vbs..." cp $(TOP_DIR)/installer-files/octave.vbs $(OCTAVE_DIST_DIR)/ + # This patch can be dropped as soon as those lines are removed from + # octave.vbs for all targets (including stable and release). + if [ "$(OCTAVE_TARGET)" = "default-octave" ]; then \ + (cd '$(OCTAVE_DIST_DIR)' && $(PATCH) -p1 -u) < $(TOP_DIR)/installer-files/octave-vbs-no-shortpath.patch; \ + fi cp $(TOP_DIR)/installer-files/octave-firsttime.vbs $(OCTAVE_DIST_DIR)/ cp $(TOP_DIR)/installer-files/fc_update.bat $(OCTAVE_DIST_DIR)/ cp $(TOP_DIR)/installer-files/post-install.bat $(OCTAVE_DIST_DIR)/ diff -r 0e8dd3368dd8 -r ffc66470a4b5 dist-files.mk --- a/dist-files.mk Sun Jan 24 14:17:54 2021 +0100 +++ b/dist-files.mk Mon Jan 25 18:27:45 2021 +0100 @@ -1081,6 +1081,7 @@ octave-firsttime.vbs \ octave-hdr.bmp \ octave-logo.ico \ + octave-vbs-no-shortpath.patch \ post-install.bat \ README.html INSTALL_FILES := $(addprefix installer-files/, $(INSTALL_FILES_1)) diff -r 0e8dd3368dd8 -r ffc66470a4b5 installer-files/octave-vbs-no-shortpath.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/installer-files/octave-vbs-no-shortpath.patch Mon Jan 25 18:27:45 2021 +0100 @@ -0,0 +1,16 @@ +diff --git "a/octave.vbs" "b/octave.vbs" +index 3e89c83..a80894b 100644 +--- "a/octave.vbs" ++++ "b/octave.vbs" +@@ -21,11 +21,6 @@ If objFSO.FileExists(OctavePath & "\mingw64\bin\octave-cli.exe") Then + OctavePath = OctavePath & "\mingw32" + End If + +-' get path as a 8.3 path +-Set fo = fso.GetFolder(OctavePath) +-OctavePath = fo.ShortPath +-Set fo = Nothing +- + ' set up path to ensure octave bin comes first + Set wshSystemEnv = wshShell.Environment( "PROCESS" ) + if OctavePath <> MSysPath Then