Mercurial > mxe-octave
annotate installer-files/octave-bat-no-short-path.patch @ 6161:8fcac4d6d983 release
of-queueing: Fix syntax error with Octave 7 (bug #62314).
* src/of-queueing-1-octave7.patch: Add new file.
* dist-files.mk: Include new patch.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Thu, 14 Apr 2022 19:27:13 +0200 |
parents | 6805ab42c8aa |
children |
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.bat |
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.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
|
11 +++ b/octave.bat 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 @@ -8,9 +8,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 Rem Note: the result ends with a backslash. |
6805ab42c8aa
Don't convert to short paths for default-octave target (bug #59923).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
14 set OCT_HOME=%~dp0\.\..\ |
6805ab42c8aa
Don't convert to short paths for default-octave target (bug #59923).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
15 set ROOT_PATH=%~dp0\.\..\..\ |
6805ab42c8aa
Don't convert to short paths for default-octave target (bug #59923).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
16 -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
|
17 -for %%I in ("%OCT_HOME%") do set OCT_HOME=%%~sI |
6805ab42c8aa
Don't convert to short paths for default-octave target (bug #59923).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
18 -for %%I in ("%ROOT_PATH%") do set ROOT_PATH=%%~sI |
6805ab42c8aa
Don't convert to short paths for default-octave target (bug #59923).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
19 |
6805ab42c8aa
Don't convert to short paths for default-octave target (bug #59923).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
20 set MSYSTEM=MSYS |
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 MSYSPATH=%OCT_HOME% |
6805ab42c8aa
Don't convert to short paths for default-octave target (bug #59923).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
22 @@ -44,8 +41,6 @@ |
6805ab42c8aa
Don't convert to short paths for default-octave target (bug #59923).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
23 Rem set home if not already set |
6805ab42c8aa
Don't convert to short paths for default-octave target (bug #59923).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
24 if "%HOME%"=="" set HOME=%USERPROFILE% |
6805ab42c8aa
Don't convert to short paths for default-octave target (bug #59923).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
25 if "%HOME%"=="" set HOME=%HOMEDRIVE%%HOMEPATH% |
6805ab42c8aa
Don't convert to short paths for default-octave target (bug #59923).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
26 -Rem set HOME to 8.3 format |
6805ab42c8aa
Don't convert to short paths for default-octave target (bug #59923).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
27 -for %%I in ("%HOME%") do set HOME=%%~sI |
6805ab42c8aa
Don't convert to short paths for default-octave target (bug #59923).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
28 |
6805ab42c8aa
Don't convert to short paths for default-octave target (bug #59923).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
29 Rem Check for args to determine if GUI (--gui, --force-gui) |
6805ab42c8aa
Don't convert to short paths for default-octave target (bug #59923).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
30 Rem or CLI (--no-gui) should be started. |