diff options
| author | Araq <rumpf_a@web.de> | 2014-11-03 11:42:36 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2014-11-03 11:42:36 +0100 |
| commit | adad2d5f4aa9940278e4baab25d757246c74d4a2 (patch) | |
| tree | 5f677641dafd9d79daff3bd9d2ac3b63de5fa7bf /tools/niminst | |
| parent | 59c0a2db8427852d919f8a65cd0158d52ade2ab7 (diff) | |
| parent | 6935171b85a1b08b1cdfba2a56d5291219d89b5f (diff) | |
| download | Nim-adad2d5f4aa9940278e4baab25d757246c74d4a2.tar.gz | |
Merge branch 'devel' into bigbreak
Conflicts: lib/impure/db_postgres.nim lib/pure/json.nim lib/pure/math.nim lib/system/atomics.nim
Diffstat (limited to 'tools/niminst')
| -rw-r--r-- | tools/niminst/nsis.tmpl | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/tools/niminst/nsis.tmpl b/tools/niminst/nsis.tmpl index 974def634..40e171d41 100644 --- a/tools/niminst/nsis.tmpl +++ b/tools/niminst/nsis.tmpl @@ -149,11 +149,6 @@ CreateShortCut "$DESKTOP\?{c.displayName}.lnk" "$INSTDIR\?{c.name}.exe" #end if - ; Add shortcuts for the documentation - #for f in items(c.cat[fcDocStart]): - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\?{splitFile(f).name}.lnk" "$INSTDIR\?{f.toWin}" - #end for - ; Write the shortcut to the uninstaller CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk" "$INSTDIR\uninstaller.exe" !insertmacro MUI_STARTMENU_WRITE_END @@ -162,6 +157,7 @@ ; Section for adding tools to the PATH variable Section "Setup Path Environment" PathSection ${EnvVarUpdate} $R0 "PATH" "A" "HKCU" "$INSTDIR\dist\mingw" + ${EnvVarUpdate} $R0 "PATH" "A" "HKCU" "$INSTDIR\dist\mingw\bin" ${EnvVarUpdate} $R0 "PATH" "A" "HKCU" "$INSTDIR\bin" ${EnvVarUpdate} $R0 "PATH" "A" "HKCU" "$INSTDIR\dist\babel" SectionEnd @@ -203,15 +199,15 @@ abort ${EndIf} + ; Shortcuts # if d.len >= 6: # let startMenuEntry = d[5] # let e = splitFile(startMenuEntry).name.capitalize - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\?{e}.lnk" "$INSTDIR\?dir\?{startMenuEntry.toWin}" - # end if - - ; Shortcuts !insertmacro MUI_STARTMENU_WRITE_BEGIN Application + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\?{e}.lnk" "$INSTDIR\?dir\?{startMenuEntry.toWin}" !insertmacro MUI_STARTMENU_WRITE_END + # end if + ignore: SectionEnd #end @@ -248,6 +244,7 @@ ; Remove entries from the PATH environment variable ${un.EnvVarUpdate} $R0 "PATH" "R" "HKCU" "$INSTDIR\dist\mingw" + ${un.EnvVarUpdate} $R0 "PATH" "R" "HKCU" "$INSTDIR\dist\mingw\bin" ${un.EnvVarUpdate} $R0 "PATH" "R" "HKCU" "$INSTDIR\bin" ${un.EnvVarUpdate} $R0 "PATH" "R" "HKCU" "$INSTDIR\dist\babel" SectionEnd |