Merge branch 'allow_deeper_output' into all_merged

nimgen.nim

@@ -4,6 +4,7 @@ var
   gDoneRecursive: seq[string] = @[]
   gDoneInline: seq[string] = @[]
 
+  gProjectDir = getCurrentDir()
   gConfig: Config
   gFilter = ""
   gQuotes = true
@@ -59,7 +60,7 @@ proc extractZip(zipfile: string) =
     cmd = "powershell -nologo -noprofile -command \"& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('$#', '.'); }\""
 
   setCurrentDir(gOutput)
-  defer: setCurrentDir("..")
+  defer: setCurrentDir(gProjectDir)
 
   echo "Extracting " & zipfile
   discard execProc(cmd % zipfile)
@@ -84,7 +85,7 @@ proc gitReset() =
   echo "Resetting Git repo"
 
   setCurrentDir(gOutput)
-  defer: setCurrentDir("..")
+  defer: setCurrentDir(gProjectDir)
 
   discard execProc("git reset --hard HEAD")
 
@@ -95,7 +96,7 @@ proc gitRemotePull(url: string, pull=true) =
     return
 
   setCurrentDir(gOutput)
-  defer: setCurrentDir("..")
+  defer: setCurrentDir(gProjectDir)
 
   echo "Setting up Git repo"
   discard execProc("git init .")
@@ -112,7 +113,7 @@ proc gitSparseCheckout(plist: string) =
     return
 
   setCurrentDir(gOutput)
-  defer: setCurrentDir("..")
+  defer: setCurrentDir(gProjectDir)
 
   discard execProc("git config core.sparsecheckout true")
   writeFile(sparsefile, plist)