diff options
| author | Araq <rumpf_a@web.de> | 2015-04-30 02:01:38 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2015-04-30 02:01:38 +0200 |
| commit | a4f8a89c85391051eabe46530e953e4696aad3d6 (patch) | |
| tree | c4fbbd44d3758dbc6cfa770e1186946020c76ccb /tools | |
| parent | d40098ad8259880d59dfc5dab895912f434d6cbd (diff) | |
| download | Nim-a4f8a89c85391051eabe46530e953e4696aad3d6.tar.gz | |
preparations for version 0.11.0
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/niminst/niminst.nim | 5 | ||||
| -rw-r--r-- | tools/niminst/nsis.tmpl | 18 |
2 files changed, 12 insertions, 11 deletions
diff --git a/tools/niminst/niminst.nim b/tools/niminst/niminst.nim index ee81b6425..f0ae45484 100644 --- a/tools/niminst/niminst.nim +++ b/tools/niminst/niminst.nim @@ -593,8 +593,9 @@ proc targzDist(c: var ConfigData) = let oldDir = getCurrentDir() setCurrentDir(tmpDir) try: - if execShellCmd("7z a -ttar $1.tar $1" % proj) != 0 or - execShellCmd("7z a -tgzip $1.tar.gz $1.tar" % proj) != 0: + #if execShellCmd("7z a -ttar $1.tar $1" % proj) != 0 or + # execShellCmd("7z a -tgzip $1.tar.gz $1.tar" % proj) != 0 or + if execShellCmd("7z a -tzip $1.zip $1" % proj) != 0: echo("External program failed") finally: setCurrentDir(oldDir) diff --git a/tools/niminst/nsis.tmpl b/tools/niminst/nsis.tmpl index c21bfb9d5..843a8cf44 100644 --- a/tools/niminst/nsis.tmpl +++ b/tools/niminst/nsis.tmpl @@ -1,5 +1,5 @@ #! stdtmpl(subsChar='?') | standard -#proc generateNsisSetup(c: ConfigData): string = +#proc generateNsisSetup(c: ConfigData): string = # result = "; NSIS script generated by niminst\n" & # "; To regenerate run ``niminst nsis`` or ``koch nsis``\n" @@ -35,8 +35,8 @@ ; Default installation folder ; This is changed later (in .onInit) to the root directory, if possible. - InstallDir "$LOCALAPPDATA\?{c.name}" - + InstallDir "$LOCALAPPDATA\?{c.name}-?{c.version}" + ; Get installation folder from registry if available InstallDirRegKey HKCU "Software\c.name\c.version" "" @@ -86,14 +86,14 @@ !insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_FINISH - + ; Setup the uninstaller pages !insertmacro MUI_UNPAGE_CONFIRM !insertmacro MUI_UNPAGE_INSTFILES - + ;-------------------------------- ;Languages - + !insertmacro MUI_LANGUAGE "English" ;-------------------------------- @@ -104,7 +104,7 @@ ; Nim binary. Section "Core Files" CoreSection ; This is a mandotory section - SectionIn RO + SectionIn RO ; Output files to the base installation directory SetOutPath "$INSTDIR" @@ -164,7 +164,7 @@ ; The downloadable sections. These sections are automatically generated by ; niminst and the template filters. - #var i = 0 + #var i = 0 #for download in c.downloads: # inc i # let d = download.split('|') @@ -207,7 +207,7 @@ CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\?{e}.lnk" "$INSTDIR\?dir\?{startMenuEntry.toWin}" !insertmacro MUI_STARTMENU_WRITE_END # end if - + ignore: SectionEnd #end |