fix compression source tree and source package

10 files changed, 23 insertions, 22 deletions

diff --git a/lib/Net.Compression/vnlib_compress/CMakeLists.txt b/lib/Net.Compression/vnlib_compress/CMakeLists.txt
index 6097a34..d0dbbb2 100644
--- a/lib/Net.Compression/vnlib_compress/CMakeLists.txt
+++ b/lib/Net.Compression/vnlib_compress/CMakeLists.txt
@@ -14,14 +14,13 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "The build configuration type")
 string(TOLOWER ${CMAKE_BUILD_TYPE} build_type)
 message(STATUS "Build type is '${build_type}'")
 
-#export all header files to the main project
-file(GLOB COMP_HEADERS *.h)
+include(FetchContent)
+
+#the compression source file is required, all other sources will be added
 set(VNLIB_COMPRESS_SOURCES 
-	compression.c
+	src/compression.c
 )
 
-include(FetchContent)
-
 ###############################
 #
 #	DOWNLOAD DEPENDENCIES
@@ -50,7 +49,7 @@ if(ENABLE_BROTLI)
 	include_directories(${lib_brotli_SOURCE_DIR}/c/include)
 
 	#add the brotli source files to the project
-	list(APPEND VNLIB_COMPRESS_SOURCES feature_brotli.c)
+	list(APPEND VNLIB_COMPRESS_SOURCES src/feature_brotli.c)
 	add_compile_definitions(VNLIB_COMPRESSOR_BROTLI_ENABLED)
 endif()
 
@@ -77,7 +76,7 @@ if(ENABLE_ZLIB)
 	include_directories(${lib_cf_zlib_SOURCE_DIR})
 
 	#enable the feature code for zlib and add the source files
-	list(APPEND VNLIB_COMPRESS_SOURCES feature_zlib.c)
+	list(APPEND VNLIB_COMPRESS_SOURCES src/feature_zlib.c)
 	add_compile_definitions(VNLIB_COMPRESSOR_ZLIB_ENABLED)
 endif()
 
@@ -104,12 +103,12 @@ endif()
 set(CMAKE_C_STANDARD_REQUIRED ON)
 
 if(COMPRESS_BUILD_SHARED)
-	add_library(${_COMP_PROJ_NAME} SHARED ${VNLIB_COMPRESS_SOURCES} ${COMP_HEADERS})
+	add_library(${_COMP_PROJ_NAME} SHARED ${VNLIB_COMPRESS_SOURCES})
 	#enable position independent code (for shared libraries with exports)
 	set_target_properties(${_COMP_PROJ_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 else()
 	set(_COMP_PROJ_NAME ${_COMP_PROJ_NAME}_static) #append static to the name
-	add_library(${_COMP_PROJ_NAME} STATIC ${VNLIB_COMPRESS_SOURCES} ${COMP_HEADERS})
+	add_library(${_COMP_PROJ_NAME} STATIC ${VNLIB_COMPRESS_SOURCES})
 endif()
 
 target_compile_features(${_COMP_PROJ_NAME} PRIVATE c_std_90)		#force compiler to use c90 standard for library
diff --git a/lib/Net.Compression/vnlib_compress/Taskfile.yaml b/lib/Net.Compression/vnlib_compress/Taskfile.yaml
index 32636ee..2133c0b 100644
--- a/lib/Net.Compression/vnlib_compress/Taskfile.yaml
+++ b/lib/Net.Compression/vnlib_compress/Taskfile.yaml
@@ -15,9 +15,9 @@ tasks:
 
   default:
     cmds:
-     - cmd: echo "Building {{.PROJECT_NAME}}"
+     - cmd: echo "Building {{ .PROJECT_NAME }}"
        silent: true
-     - cmake -Bbuild/ -DCMAKE_BUILD_TYPE=Release {{.CLI_ARGS}}
+     - cmake -Bbuild/ -DCMAKE_BUILD_TYPE=Release {{ .CLI_ARGS }}
      - cmake --build build/ --config Release    
 
   #called by ci pipline to build the winx64 project
@@ -77,8 +77,8 @@ tasks:
   embed:
     internal: true
     cmds:
-     - powershell cp ../LICENSE '{{.TARGET}}/license.txt'
-     - powershell cp compression.h '{{.TARGET}}/compression.h'
+     - powershell cp ../LICENSE '{{ .TARGET }}/license.txt'
+     - powershell cp src/compression.h '{{ .TARGET }}/compression.h'
   
   #packages source code for distribution
   pack_source:
@@ -87,30 +87,32 @@ tasks:
       EXCLUDES:
         
       INCLUDES:
-       "*.c
-        *.h
-        CMakeLists.txt
+        "src/*
         LICENSE
+        CMakeLists.txt
         Taskfile.yaml"
 
     cmds:
+     - powershell cp ../LICENSE 'LICENSE' -Force
      #just pack up current directory, excluding build, bin, and git directories
      - tar {{ .EXCLUDES }} -czf 'bin/src.tgz' {{ .INCLUDES }} 
 
+     - cmd: powershell rm LICENSE 
+
 
   #Remove the output dirs on clean
   clean:
     ignore_error: true
     cmds:
      - for: [ bin/, build/ ]
-       cmd: powershell rm -Recurse '{{.ITEM}}' -Force
+       cmd: powershell rm -Recurse '{{ .ITEM }}' -Force
     
   clean-third-party:
     internal: false
     ignore_error: true
     cmds:
     - cmd: powershell rm -Recurse -Force 'build/_deps/'
-      platforms: [windows]
+      platforms: [ windows ]
     - cmd: rm -rf 'build/_deps/'
-      platforms: [linux, darwin]
+      platforms: [ linux, darwin ]
        
\ No newline at end of file
diff --git a/lib/Net.Compression/vnlib_compress/compression.c b/lib/Net.Compression/vnlib_compress/src/compression.c
index 0cba998..0cba998 100644
--- a/lib/Net.Compression/vnlib_compress/compression.c
+++ b/lib/Net.Compression/vnlib_compress/src/compression.c
diff --git a/lib/Net.Compression/vnlib_compress/compression.h b/lib/Net.Compression/vnlib_compress/src/compression.h
index 3d03145..3d03145 100644
--- a/lib/Net.Compression/vnlib_compress/compression.h
+++ b/lib/Net.Compression/vnlib_compress/src/compression.h
diff --git a/lib/Net.Compression/vnlib_compress/feature_brotli.c b/lib/Net.Compression/vnlib_compress/src/feature_brotli.c
index 361c61a..361c61a 100644
--- a/lib/Net.Compression/vnlib_compress/feature_brotli.c
+++ b/lib/Net.Compression/vnlib_compress/src/feature_brotli.c
diff --git a/lib/Net.Compression/vnlib_compress/feature_brotli.h b/lib/Net.Compression/vnlib_compress/src/feature_brotli.h
index 1f2090b..1f2090b 100644
--- a/lib/Net.Compression/vnlib_compress/feature_brotli.h
+++ b/lib/Net.Compression/vnlib_compress/src/feature_brotli.h
diff --git a/lib/Net.Compression/vnlib_compress/feature_zlib.c b/lib/Net.Compression/vnlib_compress/src/feature_zlib.c
index a07f106..a07f106 100644
--- a/lib/Net.Compression/vnlib_compress/feature_zlib.c
+++ b/lib/Net.Compression/vnlib_compress/src/feature_zlib.c
diff --git a/lib/Net.Compression/vnlib_compress/feature_zlib.h b/lib/Net.Compression/vnlib_compress/src/feature_zlib.h
index 2544d25..2544d25 100644
--- a/lib/Net.Compression/vnlib_compress/feature_zlib.h
+++ b/lib/Net.Compression/vnlib_compress/src/feature_zlib.h
diff --git a/lib/Net.Compression/vnlib_compress/util.h b/lib/Net.Compression/vnlib_compress/src/util.h
index 292e3bf..292e3bf 100644
--- a/lib/Net.Compression/vnlib_compress/util.h
+++ b/lib/Net.Compression/vnlib_compress/src/util.h
diff --git a/lib/Net.Compression/vnlib_compress/vnlib_compress.vcxitems b/lib/Net.Compression/vnlib_compress/src/vnlib_compress.vcxitems
index 5b2a317..7f5eb0e 100644
--- a/lib/Net.Compression/vnlib_compress/vnlib_compress.vcxitems
+++ b/lib/Net.Compression/vnlib_compress/src/vnlib_compress.vcxitems
@@ -25,10 +25,10 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)feature_zlib.h" />
   </ItemGroup>
   <ItemGroup>
-    <Text Include="$(MSBuildThisFileDirectory)CMakeLists.txt" />
+    <None Include="$(MSBuildThisFileDirectory)..\package.json" />
+    <None Include="$(MSBuildThisFileDirectory)..\Taskfile.yaml" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)package.json" />
-    <None Include="$(MSBuildThisFileDirectory)Taskfile.yaml" />
+    <Text Include="$(MSBuildThisFileDirectory)..\CMakeLists.txt" />
   </ItemGroup>
 </Project>
\ No newline at end of file