may have gottem carried away

4 files changed, 43 insertions, 4 deletions

diff --git a/lib/Net.Compression/VNLib.Net.CompressionTests/VNLib.Net.CompressionTests.csproj b/lib/Net.Compression/VNLib.Net.CompressionTests/VNLib.Net.CompressionTests.csproj
index adf9496..56c67ed 100644
--- a/lib/Net.Compression/VNLib.Net.CompressionTests/VNLib.Net.CompressionTests.csproj
+++ b/lib/Net.Compression/VNLib.Net.CompressionTests/VNLib.Net.CompressionTests.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
diff --git a/lib/Net.Compression/vnlib_compress/CMakeLists.txt b/lib/Net.Compression/vnlib_compress/CMakeLists.txt
index 90fe75d..a5dfaa3 100644
--- a/lib/Net.Compression/vnlib_compress/CMakeLists.txt
+++ b/lib/Net.Compression/vnlib_compress/CMakeLists.txt
@@ -11,7 +11,7 @@ set(VNLIB_COMPRESS_SOURCES compression.c)
 #set options for enable botli and zlib
 option(ENABLE_BROTLI "Enable brotli compression" ON)
 option(ENABLE_ZLIB "Enable zlib compression" ON)
-option(ENABLE_RPMALLOC "Link local vnlib_rpmalloc allocator" ON)
+option(ENABLE_RPMALLOC "Link local vnlib_rpmalloc allocator" OFF)
 
 #add feature specific source files to the project
 if(ENABLE_BROTLI)
diff --git a/lib/Net.Compression/vnlib_compress/Taskfile.yaml b/lib/Net.Compression/vnlib_compress/Taskfile.yaml
index 51aaf79..74ab24a 100644
--- a/lib/Net.Compression/vnlib_compress/Taskfile.yaml
+++ b/lib/Net.Compression/vnlib_compress/Taskfile.yaml
@@ -8,14 +8,50 @@
 
 version: '3'
 
+vars:
+  THIRD_PARTY_DIR: '../third-party'
+  PROJECT_NAME: 'vnlib_compress'
+
 tasks:
-  
+
+  default:
+    cmds:
+     - cmd: echo "Building vnlib_compress"
+       silent: true
+
+     #make dirs on non-win
+     - cmd: mkdir {{.THIRD_PARTY_DIR}}
+       platforms: ['linux', 'darwin']
+
+     #make dirs on windows
+     - cmd: powershell -Command "mkdir {{.THIRD_PARTY_DIR}} -Force"
+       platforms: ['windows']
+
+     #clone libs
+     - cmd: cd {{.THIRD_PARTY_DIR}} && git clone https://github.com/cloudflare/zlib.git
+       ignore_error: true
+
+     - cmd: cd {{.THIRD_PARTY_DIR}} && git clone https://github.com/google/brotli.git
+       ignore_error: true
+ 
+     #invoke cmake for build
+     - cmake -B./build -DCMAKE_BUILD_TYPE=RELEASE {{.CMAKE_ARGS}}
+ 
+     #build for Windows
+     - cmd: cd build && msbuild {{.PROJECT_NAME}}.sln /p:Configuration=release {{.BUILD_FLAGS}}
+       platforms: ['windows']
+
+     #using make
+     - cmd: cd build && make
+       platforms: ['linux', 'darwin']
+          
+
   #when build succeeds, archive the output into a tgz 
   postbuild_success:
     cmds:
      - cmd: powershell mkdir -Force './bin'
      #copy source code to target
-     - powershell -Command "Get-ChildItem -Include *.c,*.h,*.txt -Path * | Resolve-Path -Relative | tar --files-from - -czf 'bin/src.tgz'"
+     - powershell -Command "tar --exclude build/* --exclude .vs/* --exclude bin/* -czvf bin/src.tgz ."
 
   postbuild_failed:
     cmds: []
diff --git a/lib/Net.Compression/vnlib_compress/vnlib_compress.vcxitems b/lib/Net.Compression/vnlib_compress/vnlib_compress.vcxitems
index 9249ad9..0bfdcbf 100644
--- a/lib/Net.Compression/vnlib_compress/vnlib_compress.vcxitems
+++ b/lib/Net.Compression/vnlib_compress/vnlib_compress.vcxitems
@@ -27,4 +27,7 @@
   <ItemGroup>
     <Text Include="$(MSBuildThisFileDirectory)CMakeLists.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)Taskfile.yaml" />
+  </ItemGroup>
 </Project>
\ No newline at end of file