Mercurial > mxe-octave
changeset 4367:2f1309f19b49
installer: version the appid value set in shortcuts
* tools/makeinst-script.sh.in: add octave version to setappid calls
* src/stable-octave-2-appid-version.patch: new patch
* dist-files.mk: add stable-octave-2-appid-version.patch
author | John D |
---|---|
date | Tue, 21 Mar 2017 08:43:56 -0400 |
parents | b17462935669 |
children | 7685e5d7168d |
files | dist-files.mk src/stable-octave-2-appid-version.patch tools/makeinst-script.sh.in |
diffstat | 3 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Fri Mar 17 14:59:11 2017 -0400 +++ b/dist-files.mk Tue Mar 21 08:43:56 2017 -0400 @@ -639,6 +639,7 @@ src-msys-zlib.mk \ stable-octave-1-docinstall.patch \ stable-octave-1-fixes.patch \ + stable-octave-2-appid-version.patch \ stable-octave.mk \ suitesparse-1.patch \ suitesparse.mk \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/stable-octave-2-appid-version.patch Tue Mar 21 08:43:56 2017 -0400 @@ -0,0 +1,12 @@ +diff -r a3447dba35c3 libinterp/corefcn/sysdep.cc +--- a/libinterp/corefcn/sysdep.cc Fri Mar 17 13:46:16 2017 -0400 ++++ b/libinterp/corefcn/sysdep.cc Fri Mar 17 14:57:02 2017 -0400 +@@ -196,7 +196,7 @@ + "SetCurrentProcessExplicitAppUserModelID")); + + if (pfnSetCurrentProcessExplicitAppUserModelID) +- pfnSetCurrentProcessExplicitAppUserModelID (L"gnu.octave"); ++ pfnSetCurrentProcessExplicitAppUserModelID (L"gnu.octave." VERSION); + + FreeLibrary (hShell); + }
--- a/tools/makeinst-script.sh.in Fri Mar 17 14:59:11 2017 -0400 +++ b/tools/makeinst-script.sh.in Tue Mar 21 08:43:56 2017 -0400 @@ -288,7 +288,7 @@ SetOutPath "\$INSTDIR" ; fix the shortcuts for appid - ExecWait '"\$INSTDIR\\bin\\win7appid.exe" "\$SMPROGRAMS\\Octave-$VERSION\\Octave (GUI).lnk" "gnu.octave"' + ExecWait '"\$INSTDIR\\bin\\win7appid.exe" "\$SMPROGRAMS\\Octave-$VERSION\\Octave (GUI).lnk" "gnu.octave.$VERSION"' EOF # shortcut for cmd win if [ -f $OCTAVE_SOURCE/cmdshell.bat ]; then @@ -312,7 +312,7 @@ CreateShortCut "\$desktop\\Octave-$VERSION (CLI).lnk" "\$INSTDIR\\octave.vbs" "--no-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED CreateShortCut "\$desktop\\Octave-$VERSION (GUI).lnk" "\$INSTDIR\\octave.vbs" "--force-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED - ExecWait '"\$INSTDIR\\bin\\win7appid.exe" "\$desktop\\Octave-$VERSION (GUI).lnk" "gnu.octave"' + ExecWait '"\$INSTDIR\\bin\\win7appid.exe" "\$desktop\\Octave-$VERSION (GUI).lnk" "gnu.octave.$VERSION"' \${Endif} ; BLAS set up