Mercurial > mxe-octave
comparison makeinst-script.sh @ 3686:1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
* src/octave-1-gnulib-isatty.patch: added file.
* src/stable-octave-1-gnulib-isatty.patch: added file
* dist-files.mk: added octave-1-gnulib-isatty.patch, stable-octave-1-gnulib-isatty.patch
* makeinst-script.sh: removed --line-editing option from shortcuts if Win8.
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Fri, 15 Aug 2014 22:27:34 -0400 |
parents | a247dc2d32c0 |
children | 70480095b6ed |
comparison
equal
deleted
inserted
replaced
3685:2fe9db1b3f77 | 3686:1e623b4ce67b |
---|---|
255 Section "Shortcuts" | 255 Section "Shortcuts" |
256 | 256 |
257 CreateDirectory "\$SMPROGRAMS\\Octave-$VERSION" | 257 CreateDirectory "\$SMPROGRAMS\\Octave-$VERSION" |
258 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0 | 258 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0 |
259 SetOutPath "%USERPROFILE%" | 259 SetOutPath "%USERPROFILE%" |
260 \${If} \$IsWin8 == 1 | 260 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "" "\$INSTDIR\\$ICON" 0 |
261 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "-i --line-editing" "\$INSTDIR\\$ICON" 0 | 261 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0 |
262 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "-i --line-editing" "\$INSTDIR\\$ICON" 0 | |
263 \${Else} | |
264 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "" "\$INSTDIR\\$ICON" 0 | |
265 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0 | |
266 \${EndIf} | |
267 SetOutPath "\$INSTDIR" | 262 SetOutPath "\$INSTDIR" |
268 EOF | 263 EOF |
269 # if we have documentation files, create shortcuts | 264 # if we have documentation files, create shortcuts |
270 if [ -d $OCTAVE_SOURCE/share/doc/octave ]; then | 265 if [ -d $OCTAVE_SOURCE/share/doc/octave ]; then |
271 cat >> $OUTFILE << EOF | 266 cat >> $OUTFILE << EOF |
279 | 274 |
280 cat >> $OUTFILE << EOF | 275 cat >> $OUTFILE << EOF |
281 | 276 |
282 \${If} \$InstallShortcuts == \${BST_CHECKED} | 277 \${If} \$InstallShortcuts == \${BST_CHECKED} |
283 SetOutPath "%USERPROFILE%" | 278 SetOutPath "%USERPROFILE%" |
284 \${If} \$IsWin8 == 1 | 279 CreateShortCut "\$desktop\\Octave-$VERSION (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "" "\$INSTDIR\\$ICON" 0 |
285 CreateShortCut "\$desktop\\Octave-$VERSION (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "-i --line-editing" "\$INSTDIR\\$ICON" 0 | 280 CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0 |
286 CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "-i --line-editing" "\$INSTDIR\\$ICON" 0 | |
287 \${Else} | |
288 CreateShortCut "\$desktop\\Octave-$VERSION (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "" "\$INSTDIR\\$ICON" 0 | |
289 CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0 | |
290 \${EndIf} | |
291 \${Endif} | 281 \${Endif} |
292 | 282 |
293 ; BLAS set up | 283 ; BLAS set up |
294 \${If} \$InstallBlasLib == 1 | 284 \${If} \$InstallBlasLib == 1 |
295 ; Reference BLAS | 285 ; Reference BLAS |