Update to 0.14.0

squattingmonk · Dec 21, 2020 · 5358aa4 · 5358aa4
1 parent 9d31fe0
commit 5358aa4
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,33 +1,45 @@
 # nasher changelog
 
-## 0.14.0:
+## 0.14.0: December 20, 2020
 
-### Enable NWNT Custom output language
-https://github.com/WilliamDraco/NWNT
+### Support for git branch-based workflow
+([#54](https://github.com/squattingmonk/nasher.nim/pull/54))
 
-Based on nwn_gff from the neverwinter.nim tools, this output format utilises
-the libraries of those tools for a custom output language instead of json.
-The output language is designed to be similar to Json that has been put through
-gron. A standalone conversion tool is also available at the project page.
+You can now specify a git branch to use when packing or unpacking a target. You
+can do this as a command-line parameter using `--branch:foo` or within your
+`nasher.cfg` using the `branch` field. The `branch` field can be used by the
+package or by targets. If a target does not have a branch specified, it will
+use that of the package. If neither has a branch specified, nasher will use
+whatever branch is currently checked out. The `--branch` command-line flag
+overrides any setting in `nasher.cfg`.
 
-To enable, use `nasher config gffFormat nwnt` (remember `--local` to only affect
-current package)
+Thanks to @tinygiant98 for his hard work on this feature.
+
+### Support for NWNT format
+([#60](https://github.com/squattingmonk/nasher.nim/pull/60))
 
-### Change to nwn.nim lib calls for gffConvert
+Nasher now supports the [nwnt](https://github.com/WilliamDraco/nwnt) file
+format. Based on nwn_gff from the neverwinter.nim tools, this output format
+utilises the libraries of those tools for a custom output language instead of
+json. The output language is designed to be similar to json that has been put
+through [gron](https://github.com/tomnomnom/gron). A standalone conversion tool
+is also available at the project page.
+
+To enable, use `nasher config gffFormat nwnt` (remember `--local` to only affect
+current package).
 
-Nasher calls neverwinter.nim as library, instead of deferring to the binaries.
-Only applies to gff format conversion, excluding .tlk
+Thanks to @WilliamDraco for his hard work on this feature.
 
 ## 0.13.0: November 07, 2020
 
-### Display an error message when a resource filename is > 16 characters \
-([#59](https://github.com/squattingmonk/nasher.nim/issues/59)).
+### Display an error message when a resource filename is > 16 characters
+([#59](https://github.com/squattingmonk/nasher.nim/issues/59))
 
 When a file being packed into a module, erf, or hak is > 16 characters long
 (not including the file extension), nasher will now emit an error and ask if
 the user wants to continue packing.
 
-### Ask which file to pack when mulitple copies exist \
+### Ask which file to pack when mulitple copies exist
 ([#58](https://github.com/squattingmonk/nasher.nim/issues/58))
 
 When the `convert` command finds multiple versions of the same source file

diff --git a/README.md b/README.md
@@ -15,7 +15,8 @@ it has some key differences:
   directories based on category)
 * nasher can install built targets into the NWN installation directory or
   launch them in-game
-* nasher uses json rather than yaml for storing gff files
+* nasher uses json or [nwnt](https://github.com/WillamDraco/nwnt) rather than
+  yaml for storing gff files
 
 This guide is current as of nasher release 0.13.0.
 
@@ -290,6 +291,7 @@ Some fields, while optional, are inherited from the package by
 | Field               | Repeatable | Description                                             |
 | ---                 | ---        | ---                                                     |
 | `flags`             | yes        | command line arguments to send to nwnsc at compile-time |
+| `branch`            | no         | the git branch to use for source files                  |
 | `modName`           | no         | the name to give a module target file                   |
 | `modMinGameVersion` | no         | the minimum game version to run a module target file    |
 
@@ -347,6 +349,7 @@ sections if they are not set for this target.
 | `exclude`           | yes        | yes       | glob pattern matching files to exclude                                    |
 | `filter`            | yes        | yes       | glob pattern matching cached files to be excluded after compilation       |
 | `flags`             | yes        | yes       | command line arguments to send to nwnsc at compile-time                   |
+| `branch`            | no         | yes       | the git branch to use for source files                                    |
 | `modName`           | no         | yes       | the name to give a module target file                                     |
 | `modMinGameVersion` | no         | yes       | the minimum game version to run a module target file                      |
 

diff --git a/dockerfile b/dockerfile
@@ -5,7 +5,7 @@ FROM nimlang/nim:alpine as nasher
 COPY --from=nwnsc usr/local/bin/nwnsc usr/local/bin/nwnsc
 COPY --from=nwnsc /nwn /nwn
 RUN apk add --no-cache bash pcre
-ARG NASHER_VERSION="0.13.0"
+ARG NASHER_VERSION="0.14.0"
 ENV PATH="/root/.nimble/bin:$PATH"
 RUN nimble install nasher@#${NASHER_VERSION} -y
 RUN nasher config --nssFlags:"-n /nwn/data -o" \

diff --git a/nasher.nimble b/nasher.nimble
@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.13.0"
+version       = "0.14.0"
 author        = "Michael A. Sinclair"
 description   = "A build tool for Neverwinter Nights projects"
 license       = "MIT"
@@ -11,6 +11,6 @@ bin           = @["nasher"]
 # Dependencies
 
 requires "nim >= 1.2.0"
-requires "neverwinter >= 1.4.0"
-requires "glob >= 0.9.1"
+requires "neverwinter >= 1.4.1"
+requires "glob >= 0.10.0"
 requires "nwnt >= 1.2.1"