Merge branch 'feature/build' into development

maradotwebp · Apr 18, 2022 · 974778a · 974778a
2 parents 9e0c939 + 7cd18fe
commit 974778a
Show file tree

Hide file tree

Showing 31 changed files with 22 additions and 56 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           nim-version: ${{ env.NIM_VERSION }}
       - name: Build
-        run: nimble build -y -d:ssl -d:release
+        run: nimble build -d:release -y
 
   test:
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -41,7 +41,7 @@ jobs:
         with:
           nim-version: ${{ env.NIM_VERSION }}
       - name: Build
-        run: nimble build -y -d:ssl -d:release
+        run: nimble build -d:release -y
       - name: Store artifacts
         uses: actions/upload-artifact@v2
         with:

diff --git a/pax.nimble b/pax.nimble
@@ -18,12 +18,3 @@ requires "zippy >= 0.6.2"
 
 task test, "Test project":
     exec "testament all"
-
-task buildDev, "Build for usage during development":
-    exec "nimble build -d:ssl"
-
-task buildProd, "Build for production":
-    exec "nimble build -d:ssl -d:release"
-
-task buildCI, "Build for production on the CI machine":
-    exec "nimble build -d:ssl -d:release -y"
diff --git a/readme.md b/readme.md
@@ -67,7 +67,7 @@ You'll need:
 * A C compiler (depending on your operating system, one might be already installed)
 
 Clone and `cd` into the repository - and you're good to go!\
-Run `nimble buildDev` to build the application for development, or run `nimble buildProd` to create an optimized release build.\
+Run `nimble build` to build the application for development, or run `nimble build -d:release` to create an optimized release build.\
 Execute the program with `./pax` (on Linux) or `pax.exe` (on Windows).
 
 

diff --git a/src/nim.cfg b/src/nim.cfg
@@ -0,0 +1 @@
+-d:ssl
diff --git a/tests/cmd/tadd/tadd_cffilestring.nim b/tests/cmd/tadd/tadd_cffilestring.nim
@@ -1,5 +1,4 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
   joinable: false
   batchable: false
   disabled: true

diff --git a/tests/cmd/tadd/tadd_cfstring.nim b/tests/cmd/tadd/tadd_cfstring.nim
@@ -1,5 +1,4 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
   joinable: false
   batchable: false
   disabled: true

diff --git a/tests/cmd/tadd/tadd_duplicates.nim b/tests/cmd/tadd/tadd_duplicates.nim
@@ -1,5 +1,4 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
   joinable: false
   batchable: false
   input: '''

diff --git a/tests/cmd/tadd/tadd_multistringsearch.nim b/tests/cmd/tadd/tadd_multistringsearch.nim
@@ -1,5 +1,4 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
   joinable: false
   batchable: false
   input: '''

diff --git a/tests/cmd/tadd/tadd_projectfileids.nim b/tests/cmd/tadd/tadd_projectfileids.nim
@@ -1,5 +1,4 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
   joinable: false
   batchable: false
   input: '''

diff --git a/tests/cmd/tadd/tadd_projectid.nim b/tests/cmd/tadd/tadd_projectid.nim
@@ -1,5 +1,4 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
   joinable: false
   batchable: false
   input: '''

diff --git a/tests/cmd/tadd/tadd_search.nim b/tests/cmd/tadd/tadd_search.nim
@@ -1,5 +1,4 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
   joinable: false
   batchable: false
   input: '''

diff --git a/tests/cmd/timpo/timpo_fabric.nim b/tests/cmd/timpo/timpo_fabric.nim
@@ -1,5 +1,4 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
   joinable: false
   batchable: false
 """

diff --git a/tests/cmd/timpo/timpo_forge.nim b/tests/cmd/timpo/timpo_forge.nim
@@ -1,6 +1,5 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
-  joinable: false
+    joinable: false
   batchable: false
 """
 

diff --git a/tests/cmd/tinit/tinit_fabric.nim b/tests/cmd/tinit/tinit_fabric.nim
@@ -1,6 +1,5 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
-  joinable: false
+    joinable: false
   batchable: false
   input: '''
 y

diff --git a/tests/cmd/tinit/tinit_forge.nim b/tests/cmd/tinit/tinit_forge.nim
@@ -1,6 +1,5 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
-  joinable: false
+    joinable: false
   batchable: false
   input: '''
 y

diff --git a/tests/cmd/tinit/tinit_rejectexisting.nim b/tests/cmd/tinit/tinit_rejectexisting.nim
@@ -1,6 +1,5 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
-  joinable: false
+    joinable: false
   batchable: false
   input: '''
 y

diff --git a/tests/cmd/tlist/tlist.nim b/tests/cmd/tlist/tlist.nim
@@ -1,6 +1,5 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
-  joinable: false
+    joinable: false
   batchable: false
   outputsub: '''
 [Δ] ALL MODS (1)

diff --git a/tests/cmd/tlist/tlist_status.nim b/tests/cmd/tlist/tlist_status.nim
@@ -1,6 +1,5 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
-  joinable: false
+    joinable: false
   batchable: false
   outputsub: '''
 [Δ] ALL MODS (1)

diff --git a/tests/cmd/tlist/tlist_without_version.nim b/tests/cmd/tlist/tlist_without_version.nim
@@ -1,6 +1,5 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
-  joinable: false
+    joinable: false
   batchable: false
   outputsub: '''
 [Δ] ALL MODS (1)

diff --git a/tests/cmd/tpin/tpin.nim b/tests/cmd/tpin/tpin.nim
@@ -1,6 +1,5 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
-  joinable: false
+    joinable: false
   batchable: false
   input: '''
 y

diff --git a/tests/cmd/tremove/tremove_with_dependency.nim b/tests/cmd/tremove/tremove_with_dependency.nim
@@ -1,6 +1,5 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
-  joinable: false
+    joinable: false
   batchable: false
   input: '''
 y

diff --git a/tests/cmd/tremove/tremove_with_dependents.nim b/tests/cmd/tremove/tremove_with_dependents.nim
@@ -1,6 +1,5 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
-  joinable: false
+    joinable: false
   batchable: false
   input: '''
 y

diff --git a/tests/cmd/tremove/tremove_with_explicit_dependency.nim b/tests/cmd/tremove/tremove_with_explicit_dependency.nim
@@ -1,6 +1,5 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
-  joinable: false
+    joinable: false
   batchable: false
   input: '''
 y

diff --git a/tests/cmd/tremove/tremove_without_dependencies.nim b/tests/cmd/tremove/tremove_without_dependencies.nim
@@ -1,6 +1,5 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
-  joinable: false
+    joinable: false
   batchable: false
   input: '''
 y

diff --git a/tests/cmd/tupdate/tupdate.nim b/tests/cmd/tupdate/tupdate.nim
@@ -1,6 +1,5 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
-  joinable: false
+    joinable: false
   batchable: false
   input: '''
 y

diff --git a/tests/cmd/tupdate/tupdate_pinned.nim b/tests/cmd/tupdate/tupdate_pinned.nim
@@ -1,6 +1,5 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
-  joinable: false
+    joinable: false
   batchable: false
   input: '''
 y

diff --git a/tests/cmd/tupgrade/tupgrade.nim b/tests/cmd/tupgrade/tupgrade.nim
@@ -1,6 +1,5 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
-  joinable: false
+    joinable: false
   batchable: false
   input: '''
 y

diff --git a/tests/cmd/tupgrade/tupgrade_pinned.nim b/tests/cmd/tupgrade/tupgrade_pinned.nim
@@ -1,6 +1,5 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
-  joinable: false
+    joinable: false
   batchable: false
   input: '''
 y

diff --git a/tests/cmd/tversion/tversion.nim b/tests/cmd/tversion/tversion.nim
@@ -1,6 +1,5 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
-  joinable: false
+    joinable: false
   batchable: false
   output: '''
 [:] Loading data from manifest..

diff --git a/tests/cmd/tversion/tversion_latest.nim b/tests/cmd/tversion/tversion_latest.nim
@@ -1,6 +1,5 @@
 discard """
-  cmd: "nim $target --hints:on -d:testing -d:ssl --nimblePath:tests/deps $options $file"
-  joinable: false
+    joinable: false
   batchable: false
   output: '''
 [:] Loading data from manifest..