1.2.0: Reorganise source tree so nimble is happier

niv · Nov 13, 2018 · c9bf143 · c9bf143
1 parent c575f5f
commit c9bf143
Show file tree

Hide file tree

Showing 43 changed files with 9 additions and 6 deletions.
diff --git a/src/config.nims → config.nims b/src/config.nims → config.nims
diff --git a/neverwinter.nimble b/neverwinter.nimble
@@ -1,19 +1,22 @@
 import sequtils, ospaths, strutils
 
-version       = "1.1.1"
+version       = "1.2.0"
 author        = "Bernhard Stöckner <[email protected]>"
 description   = "Neverwinter Nights 1 data accessor library and utilities"
 license       = "MIT"
 
 requires "nim >= 0.18.0"
 
-srcDir = "src"
 installDirs = @["neverwinter"]
 
-binDir = "bin"
-bin = listFiles("src").
+binDir = "bin/"
+bin = listFiles(".").
   mapIt(it.splitFile.name).
   filterIt(it.startsWith("nwn_")).
   # There appears to be a compiler bug on 0.19.0 that segfaults it when
   # compiling nwn_net. So we skip it for 0.19.0.
   filterIt(NimVersion != "0.19.0" or it != "nwn_net")
+
+task clean, "Remove compiled binaries and temporary data":
+  for b in bin: rmFile(binDir / b)
+  rmdir(nimcacheDir())
diff --git a/src/neverwinter/erf.nim → neverwinter/erf.nim b/src/neverwinter/erf.nim → neverwinter/erf.nim
diff --git a/src/neverwinter/gff.nim → neverwinter/gff.nim b/src/neverwinter/gff.nim → neverwinter/gff.nim
diff --git a/src/neverwinter/gffjson.nim → neverwinter/gffjson.nim b/src/neverwinter/gffjson.nim → neverwinter/gffjson.nim
diff --git a/src/neverwinter/key.nim → neverwinter/key.nim b/src/neverwinter/key.nim → neverwinter/key.nim
diff --git a/src/neverwinter/languages.nim → neverwinter/languages.nim b/src/neverwinter/languages.nim → neverwinter/languages.nim
diff --git a/src/neverwinter/lru.nim → neverwinter/lru.nim b/src/neverwinter/lru.nim → neverwinter/lru.nim
diff --git a/src/neverwinter/resdir.nim → neverwinter/resdir.nim b/src/neverwinter/resdir.nim → neverwinter/resdir.nim
diff --git a/src/neverwinter/resfile.nim → neverwinter/resfile.nim b/src/neverwinter/resfile.nim → neverwinter/resfile.nim
diff --git a/src/neverwinter/resman.nim → neverwinter/resman.nim b/src/neverwinter/resman.nim → neverwinter/resman.nim
diff --git a/src/neverwinter/resmemfile.nim → neverwinter/resmemfile.nim b/src/neverwinter/resmemfile.nim → neverwinter/resmemfile.nim
diff --git a/src/neverwinter/resref.nim → neverwinter/resref.nim b/src/neverwinter/resref.nim → neverwinter/resref.nim
diff --git a/src/neverwinter/restype.nim → neverwinter/restype.nim b/src/neverwinter/restype.nim → neverwinter/restype.nim
diff --git a/src/neverwinter/tlk.nim → neverwinter/tlk.nim b/src/neverwinter/tlk.nim → neverwinter/tlk.nim
diff --git a/src/neverwinter/twoda.nim → neverwinter/twoda.nim b/src/neverwinter/twoda.nim → neverwinter/twoda.nim
diff --git a/src/neverwinter/util.nim → neverwinter/util.nim b/src/neverwinter/util.nim → neverwinter/util.nim
diff --git a/src/nwn_erf.nim → nwn_erf.nim b/src/nwn_erf.nim → nwn_erf.nim
diff --git a/src/nwn_erf_tlkify.nim → nwn_erf_tlkify.nim b/src/nwn_erf_tlkify.nim → nwn_erf_tlkify.nim
diff --git a/src/nwn_gff.nim → nwn_gff.nim b/src/nwn_gff.nim → nwn_gff.nim
diff --git a/src/nwn_key_pack.nim → nwn_key_pack.nim b/src/nwn_key_pack.nim → nwn_key_pack.nim
diff --git a/src/nwn_key_shadows.nim → nwn_key_shadows.nim b/src/nwn_key_shadows.nim → nwn_key_shadows.nim
diff --git a/src/nwn_key_transparent.nim → nwn_key_transparent.nim b/src/nwn_key_transparent.nim → nwn_key_transparent.nim
diff --git a/src/nwn_key_unpack.nim → nwn_key_unpack.nim b/src/nwn_key_unpack.nim → nwn_key_unpack.nim
diff --git a/src/nwn_net.nim → nwn_net.nim b/src/nwn_net.nim → nwn_net.nim
diff --git a/src/nwn_resman_cat.nim → nwn_resman_cat.nim b/src/nwn_resman_cat.nim → nwn_resman_cat.nim
diff --git a/src/nwn_resman_diff.nim → nwn_resman_diff.nim b/src/nwn_resman_diff.nim → nwn_resman_diff.nim
diff --git a/src/nwn_resman_extract.nim → nwn_resman_extract.nim b/src/nwn_resman_extract.nim → nwn_resman_extract.nim
diff --git a/src/nwn_resman_grep.nim → nwn_resman_grep.nim b/src/nwn_resman_grep.nim → nwn_resman_grep.nim
diff --git a/src/nwn_resman_pkg.nim → nwn_resman_pkg.nim b/src/nwn_resman_pkg.nim → nwn_resman_pkg.nim
diff --git a/src/nwn_resman_stats.nim → nwn_resman_stats.nim b/src/nwn_resman_stats.nim → nwn_resman_stats.nim
diff --git a/src/nwn_tlk.nim → nwn_tlk.nim b/src/nwn_tlk.nim → nwn_tlk.nim
diff --git a/src/nwn_twoda.nim → nwn_twoda.nim b/src/nwn_twoda.nim → nwn_twoda.nim
diff --git a/src/private/arpie.nim → private/arpie.nim b/src/private/arpie.nim → private/arpie.nim
diff --git a/src/private/asyncnetudp.nim → private/asyncnetudp.nim b/src/private/asyncnetudp.nim → private/asyncnetudp.nim
diff --git a/src/private/debugprinter.nim → private/debugprinter.nim b/src/private/debugprinter.nim → private/debugprinter.nim
diff --git a/src/private/docopt.nim → private/docopt.nim b/src/private/docopt.nim → private/docopt.nim
diff --git a/src/private/jser.nim → private/jser.nim b/src/private/jser.nim → private/jser.nim
diff --git a/src/private/netutil.nim → private/netutil.nim b/src/private/netutil.nim → private/netutil.nim
diff --git a/src/private/packets.nim → private/packets.nim b/src/private/packets.nim → private/packets.nim
diff --git a/src/private/progressbar.nim → private/progressbar.nim b/src/private/progressbar.nim → private/progressbar.nim
diff --git a/src/private/shared.nim → private/shared.nim b/src/private/shared.nim → private/shared.nim
diff --git a/src/private/version.nim → private/version.nim b/src/private/version.nim → private/version.nim
@@ -6,8 +6,8 @@ const GitBranch*: string = staticExec("git symbolic-ref -q --short HEAD").strip
 const GitRev*: string = staticExec("git rev-parse HEAD").strip
 # const BuildTime = format(getLocalTime(getTime()), "d MMMM yyyy HH:mm")
 
-const Template: string = readFile(currentSourcePath().splitFile().dir / ".." / ".." / "VERSION").strip
-const Licence: string = readFile(currentSourcePath().splitFile().dir / ".." / ".." / "LICENCE").strip
+const Template: string = readFile(currentSourcePath().splitFile().dir / ".." / "VERSION").strip
+const Licence: string = readFile(currentSourcePath().splitFile().dir / ".." / "LICENCE").strip
 
 proc printVersion*() =
   let version = GitBranch & " (" & GitRev[0..5] & ")"