Mercurial > mxe-octave

comparison installer-files/octave-no-short-path.patch @ 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
children
comparison
equal deleted inserted replaced
5649:27b4f385c45d 5650:6805ab42c8aa
1 # HG changeset patch
2 # User Markus Mützel <markus.muetzel@gmx.de>
3 # Date 1612087592 -3600
4 # Sun Jan 31 11:06:32 2021 +0100
5 # Node ID f08191da8e416c32d950679a78fe194e2753372e
6 # Parent fea266f67443b890a67f80336aee03c40d3a1faa
7 Don't use short paths (bug #59923).
8
9 diff -r fea266f67443 -r f08191da8e41 octave-firsttime.vbs
10 --- a/octave-firsttime.vbs Sun Jan 31 10:59:32 2021 +0100
11 +++ b/octave-firsttime.vbs Sun Jan 31 11:06:32 2021 +0100
12 @@ -21,11 +21,6 @@
13 OctavePath = OctavePath & "\mingw32"
14 End If
15
16 -' get path as a 8.3 path
17 -Set fo = fso.GetFolder(OctavePath)
18 -OctavePath = fo.ShortPath
19 -Set fo = Nothing
20 -
21 ' set up path to ensure octave bin comes first
22 Set wshSystemEnv = wshShell.Environment( "PROCESS" )
23 if OctavePath <> MSysPath Then
24 @@ -42,9 +37,6 @@
25
26 If wshShell.ExpandEnvironmentStrings("%HOME%") = "%HOME%" Then
27 Home = wshSystemEnv("USERPROFILE")
28 - Set fo = fso.GetFolder(Home)
29 - wshSystemEnv("HOME") = fo.ShortPath
30 - Set fo = Nothing
31 End If
32
33 ' set Qt plugin directory and path
34 diff -r fea266f67443 -r f08191da8e41 octave.vbs
35 --- a/octave.vbs Sun Jan 31 10:59:32 2021 +0100
36 +++ b/octave.vbs Sun Jan 31 11:06:32 2021 +0100
37 @@ -21,11 +21,6 @@
38 OctavePath = OctavePath & "\mingw32"
39 End If
40
41 -' get path as a 8.3 path
42 -Set fo = fso.GetFolder(OctavePath)
43 -OctavePath = fo.ShortPath
44 -Set fo = Nothing
45 -
46 ' set up path to ensure octave bin comes first
47 Set wshSystemEnv = wshShell.Environment( "PROCESS" )
48 if OctavePath <> MSysPath Then
49 @@ -43,9 +38,6 @@
50
51 If wshShell.ExpandEnvironmentStrings("%HOME%") = "%HOME%" Then
52 Home = wshSystemEnv("USERPROFILE")
53 - Set fo = fso.GetFolder(Home)
54 - wshSystemEnv("HOME") = fo.ShortPath
55 - Set fo = Nothing
56 End If
57
58 ' set Qt plugin directory and path
59 diff -r fea266f67443 -r 64ff1a717a28 post-install.bat
60 --- a/post-install.bat Sun Jan 31 10:59:32 2021 +0100
61 +++ b/post-install.bat Sun Jan 31 11:16:33 2021 +0100
62 @@ -1,8 +1,6 @@
63 @echo off
64 Rem Run on initial install /update
65 set ROOT_DIR=%~dp0
66 -Rem Convert to 8.3 format so we don't have to worry about spaces.
67 -for %%I in ("%ROOT_DIR%") do set ROOT_DIR=%%~sI
68
69 set MSYSDIR=%ROOT_DIR%
70 set MSYSTEM=MSYS