build(app): swallow vnlib.webserver into core & build updates

7 files changed, 57 insertions, 130 deletions

diff --git a/lib/Utils.Cryptography/argon2/.gitattributes b/lib/Utils.Cryptography/argon2/.gitattributes
deleted file mode 100644
index 177bed9..0000000
--- a/lib/Utils.Cryptography/argon2/.gitattributes
+++ /dev/null
@@ -1,10 +0,0 @@
-# Export ignore
-.gitattributes export-ignore
-.gitignore export-ignore
-.travis.yml export-ignore
-appveyor.yml export-ignore
-export.sh export-ignore
-latex/* export-ignore
-
-# Linguist documentation
-latex/* linguist-documentation
diff --git a/lib/Utils.Cryptography/argon2/.gitignore b/lib/Utils.Cryptography/argon2/.gitignore
deleted file mode 100644
index 2bb1416..0000000
--- a/lib/Utils.Cryptography/argon2/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-argon2
-libargon2.a
-libargon2.so*
-libargon2.dylib
-libargon2.pc
-.DS_Store
-src/*.o
-src/blake2/*.o
-genkat
-.idea
-*.pyc
-testcase
-*.gcda
-*.gcno
-*.gcov
-bench
-vs2015/build
-Argon2.sdf
-Argon2.VC.opendb
-*.zip
-*.tar.gz
-tags
diff --git a/lib/Utils.Cryptography/argon2/.travis.yml b/lib/Utils.Cryptography/argon2/.travis.yml
deleted file mode 100644
index 265fc48..0000000
--- a/lib/Utils.Cryptography/argon2/.travis.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-language: c
-
-compiler:
-  - clang
-  - gcc
-
-os:
-  - linux
-  - osx
-
-# Clang on Linux needs to run in a VM to use ASAN.
-# See: https://github.com/travis-ci/travis-ci/issues/9033
-matrix:
-  exclude:
-    - compiler: clang
-      os: linux
-  include:
-    - compiler: clang
-      os: linux
-      sudo: true
-
-script: make && make testci
-
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
diff --git a/lib/Utils.Cryptography/argon2/Taskfile.yaml b/lib/Utils.Cryptography/argon2/Taskfile.yaml
index 73fb8fa..d08d3b6 100644
--- a/lib/Utils.Cryptography/argon2/Taskfile.yaml
+++ b/lib/Utils.Cryptography/argon2/Taskfile.yaml
@@ -19,68 +19,84 @@ tasks:
     cmds:
       #build with defaults
       - task: build
-      - cmd: echo "Your Argon2 dll file can be found in '{{.USER_WORKING_DIR}}/build'"
+      - cmd: echo "Your Argon2 library file can be found in '{{ .USER_WORKING_DIR }}/build'"
         silent: true
   
   build:
     cmds:
      #init cmake build with greedy enabled
-     - cmake -B./build
- 
-     - cmake --build build/ --config Debug
-     - cmake --build build/ --config Release 
+     - cmake -B./build 
+     - cmake --build build/ --config debug
+     - cmake --build build/ --config release 
 
  
   postbuild_success:
-    vars:
-      #required files to include in tar
-      TAR_FILES: "license.txt readme.txt argon2.h"
-    
     cmds:
       #make bin dir
-    - cmd: powershell -Command "New-Item -Type Directory -Force -Path './bin'"
+    - cmd: powershell mkdir -Force 'bin/'
       ignore_error: true
-
-    #add embeded resources to output dirs
-    - task: embed
-      vars: 
-        TARGET: './build/Debug'
-
-    - task: embed
-      vars:
-        TARGET: './build/Release'
-   
-
-    #static debug lib
-    - cd build/Debug && tar -czf '../../bin/msvc-x64-debug-{{.PROJECT_NAME}}-static.tgz' {{.PROJECT_NAME}}_static.lib {{.TAR_FILES}} {{.PROJECT_NAME}}_static.pdb
-    #dynamic debug lib
-    - cd build/Debug && tar -czf '../../bin/msvc-x64-debug-{{.PROJECT_NAME}}.tgz' {{.PROJECT_NAME}}.dll {{.TAR_FILES}} {{.PROJECT_NAME}}.pdb
     
-    #release static lib
-    - cd build/Release && tar -czf '../../bin/msvc-x64-release-{{.PROJECT_NAME}}-static.tgz' {{.PROJECT_NAME}}_static.lib {{.TAR_FILES}}
-    #release dll
-    - cd build/Release && tar -czf '../../bin/msvc-x64-release-{{.PROJECT_NAME}}.tgz' {{.PROJECT_NAME}}.dll {{.TAR_FILES}}
+    - task: parallel_postbuild
+  
+  parallel_postbuild:
+    internal: true
+    vars:
+      #required files to include in tar
+      BIN_FILES: 
+        license.txt 
+        readme.txt 
+        argon2.h 
+        '{{ .PROJECT_NAME }}.dll'
+
+    deps:
+     - task: pack_source
+  
+     - task: pack_artifacts
+       vars: { BUILD_MODE: 'debug', TAR_FILES: '{{ .BIN_FILES }} {{ .PROJECT_NAME }}.pdb' }  
+     - task: pack_artifacts
+       vars: { BUILD_MODE: 'release', TAR_FILES: '{{ .BIN_FILES }}' }
 
-    #source code
-    - task: pack_source
+  #packs up the binary artifacts for distribution
+  pack_artifacts:
+    internal: true
+    deps:
+      - task: embed
+        vars: { TARGET: './build/{{ .BUILD_MODE }}' }
+    cmds:
+      - cmd: cd build/{{ .BUILD_MODE }} && tar -czf '../../bin/msvc-x64-{{ .BUILD_MODE }}-{{ .PROJECT_NAME }}.tgz' {{ .TAR_FILES }}
 
+  #add embeded resources to the binary output for distribution
   embed:
+    internal: true
     cmds:
-     #add license file
-     - powershell -Command "Copy-Item -Path ./license -Destination '{{.TARGET}}/license.txt'"
-     #add readme file
-     - powershell -Command "Copy-Item -Path ./build.readme.txt -Destination '{{.TARGET}}/readme.txt'"
-     #add argon2 header file
-     - powershell -Command "Copy-Item -Path ./include/argon2.h -Destination '{{.TARGET}}/argon2.h'"
+     - powershell cp LICENSE '{{.TARGET}}/license.txt'
+     - powershell cp build.readme.txt '{{.TARGET}}/readme.txt'
+     - powershell cp include/argon2.h '{{.TARGET}}/argon2.h'
   
+  #packages source code for distribution
   pack_source:
+    internal: true
+    vars:
+      EXCLUDES:
+        
+      INCLUDES:
+        src/*
+        include/*
+        CHANGELOG.md
+        CMakeLists.txt
+        README.md
+        LICENSE
+        Argon2.sln
+        libargon2.pc.in
+        Makefile
+        Taskfile.yaml
+
     cmds:
      #just pack up current directory, excluding build, bin, and git directories
-     - powershell -Command "tar --exclude build/* --exclude bin/* -czf bin/src.tgz ."
-
+     - tar {{ .EXCLUDES }} -czf 'bin/src.tgz' {{ .INCLUDES }}
 
   clean:
     ignore_error: true
     cmds: 
-     - cmd: powershell -Command "Remove-Item -Recurse './bin'"
-     - cmd: powershell -Command "Remove-Item -Recurse './build'"
\ No newline at end of file
+     - for: [ bin/, build/ ]
+       cmd: powershell -Command "Remove-Item -Recurse '{{ .ITEM }}'"
diff --git a/lib/Utils.Cryptography/argon2/appveyor.yml b/lib/Utils.Cryptography/argon2/appveyor.yml
deleted file mode 100644
index fb1f048..0000000
--- a/lib/Utils.Cryptography/argon2/appveyor.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-os: Visual Studio 2015
-
-environment:
-  matrix:
-    - platform: x86
-      configuration: Debug
-    - platform: x86
-      configuration: Release
-    - platform: x64
-      configuration: Debug
-    - platform: x64
-      configuration: Release
-
-matrix:
-  fast_finish: false
-
-build:
-  parallel: true
-  project: Argon2.sln
-  verbosity: minimal
-
-test_script:
-  - ps: kats\test.ps1
-  - ps: if ("Release" -eq $env:configuration) { vs2015\build\Argon2OptTestCI.exe }
-  - ps: if ("Release" -eq $env:configuration) { vs2015\build\Argon2RefTestCI.exe }
diff --git a/lib/Utils.Cryptography/argon2/argon2-specs.pdf b/lib/Utils.Cryptography/argon2/argon2-specs.pdf
deleted file mode 100644
index d916af6..0000000
--- a/lib/Utils.Cryptography/argon2/argon2-specs.pdf
+++ /dev/null
diff --git a/lib/Utils.Cryptography/argon2/export.sh b/lib/Utils.Cryptography/argon2/export.sh
deleted file mode 100644
index 9757b10..0000000
--- a/lib/Utils.Cryptography/argon2/export.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-FILE=`date "+%Y%m%d"`
-BRANCH=master
-
-git archive --format zip --output $FILE.zip $BRANCH
-git archive --format tar.gz --output $FILE.tar.gz $BRANCH