Mercurial > mxe-octave

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