Move zlib-intel to src/native/external

dotnet · Dec 11, 2021 · 31c4d33 · 31c4d33
1 parent 7db8138
commit 31c4d33
Show file tree

Hide file tree

Showing 32 changed files with 26 additions and 23 deletions.
diff --git a/src/native/external/zlib-intel-version.txt b/src/native/external/zlib-intel-version.txt
@@ -0,0 +1,6 @@
+bf103c626c6c0d80580748f6b814ec534614ca52
+
+https://github.com/jtkukunas/zlib/commit/bf103c626c6c0d80580748f6b814ec534614ca52
+
+Note: This library is not using a proper release lifecycle. v1.2.11.1_jtkv6.3 was the last version released in 2019.
+      Therefore, we are pointing to a random commit from 2021 rather than a version tag.
diff --git a/src/native/external/zlib-intel.cmake b/src/native/external/zlib-intel.cmake
@@ -0,0 +1,19 @@
+set(ZLIB_SOURCES_BASE
+    adler32.c
+    compress.c
+    crc_folding.c
+    crc32.c
+    deflate_medium.c
+    deflate_quick.c
+    deflate.c
+    inffast.c
+    inflate.c
+    inftrees.c
+    match.c
+    slide_sse.c
+    trees.c
+    x86.c
+    zutil.c
+)
+
+addprefix(ZLIB_SOURCES "${CMAKE_CURRENT_LIST_DIR}/zlib-intel"  "${ZLIB_SOURCES_BASE}")
diff --git a/....Compression.Native/zlib-intel/README.txt → src/native/external/zlib-intel/README.txt b/....Compression.Native/zlib-intel/README.txt → src/native/external/zlib-intel/README.txt
diff --git a/...O.Compression.Native/zlib-intel/adler32.c → src/native/external/zlib-intel/adler32.c b/...O.Compression.Native/zlib-intel/adler32.c → src/native/external/zlib-intel/adler32.c
diff --git a/....Compression.Native/zlib-intel/compress.c → src/native/external/zlib-intel/compress.c b/....Compression.Native/zlib-intel/compress.c → src/native/external/zlib-intel/compress.c
diff --git a/....IO.Compression.Native/zlib-intel/crc32.c → src/native/external/zlib-intel/crc32.c b/....IO.Compression.Native/zlib-intel/crc32.c → src/native/external/zlib-intel/crc32.c
diff --git a/....IO.Compression.Native/zlib-intel/crc32.h → src/native/external/zlib-intel/crc32.h b/....IO.Compression.Native/zlib-intel/crc32.h → src/native/external/zlib-intel/crc32.h
diff --git a/...mpression.Native/zlib-intel/crc_folding.c → src/native/external/zlib-intel/crc_folding.c b/...mpression.Native/zlib-intel/crc_folding.c → src/native/external/zlib-intel/crc_folding.c
diff --git a/...O.Compression.Native/zlib-intel/deflate.c → src/native/external/zlib-intel/deflate.c b/...O.Compression.Native/zlib-intel/deflate.c → src/native/external/zlib-intel/deflate.c
diff --git a/...O.Compression.Native/zlib-intel/deflate.h → src/native/external/zlib-intel/deflate.h b/...O.Compression.Native/zlib-intel/deflate.h → src/native/external/zlib-intel/deflate.h
diff --git a/...ession.Native/zlib-intel/deflate_medium.c → ...tive/external/zlib-intel/deflate_medium.c b/...ession.Native/zlib-intel/deflate_medium.c → ...tive/external/zlib-intel/deflate_medium.c
diff --git a/...ression.Native/zlib-intel/deflate_quick.c → ...ative/external/zlib-intel/deflate_quick.c b/...ression.Native/zlib-intel/deflate_quick.c → ...ative/external/zlib-intel/deflate_quick.c
diff --git a/...IO.Compression.Native/zlib-intel/gzguts.h → src/native/external/zlib-intel/gzguts.h b/...IO.Compression.Native/zlib-intel/gzguts.h → src/native/external/zlib-intel/gzguts.h
diff --git a/...O.Compression.Native/zlib-intel/inffast.c → src/native/external/zlib-intel/inffast.c b/...O.Compression.Native/zlib-intel/inffast.c → src/native/external/zlib-intel/inffast.c
diff --git a/...O.Compression.Native/zlib-intel/inffast.h → src/native/external/zlib-intel/inffast.h b/...O.Compression.Native/zlib-intel/inffast.h → src/native/external/zlib-intel/inffast.h
diff --git a/....Compression.Native/zlib-intel/inffixed.h → src/native/external/zlib-intel/inffixed.h b/....Compression.Native/zlib-intel/inffixed.h → src/native/external/zlib-intel/inffixed.h
diff --git a/...O.Compression.Native/zlib-intel/inflate.c → src/native/external/zlib-intel/inflate.c b/...O.Compression.Native/zlib-intel/inflate.c → src/native/external/zlib-intel/inflate.c
diff --git a/...O.Compression.Native/zlib-intel/inflate.h → src/native/external/zlib-intel/inflate.h b/...O.Compression.Native/zlib-intel/inflate.h → src/native/external/zlib-intel/inflate.h
diff --git a/....Compression.Native/zlib-intel/inftrees.c → src/native/external/zlib-intel/inftrees.c b/....Compression.Native/zlib-intel/inftrees.c → src/native/external/zlib-intel/inftrees.c
diff --git a/....Compression.Native/zlib-intel/inftrees.h → src/native/external/zlib-intel/inftrees.h b/....Compression.Native/zlib-intel/inftrees.h → src/native/external/zlib-intel/inftrees.h
diff --git a/....IO.Compression.Native/zlib-intel/match.c → src/native/external/zlib-intel/match.c b/....IO.Compression.Native/zlib-intel/match.c → src/native/external/zlib-intel/match.c
diff --git a/...Compression.Native/zlib-intel/slide_sse.c → src/native/external/zlib-intel/slide_sse.c b/...Compression.Native/zlib-intel/slide_sse.c → src/native/external/zlib-intel/slide_sse.c
diff --git a/....IO.Compression.Native/zlib-intel/trees.c → src/native/external/zlib-intel/trees.c b/....IO.Compression.Native/zlib-intel/trees.c → src/native/external/zlib-intel/trees.c
diff --git a/....IO.Compression.Native/zlib-intel/trees.h → src/native/external/zlib-intel/trees.h b/....IO.Compression.Native/zlib-intel/trees.h → src/native/external/zlib-intel/trees.h
diff --git a/...em.IO.Compression.Native/zlib-intel/x86.c → src/native/external/zlib-intel/x86.c b/...em.IO.Compression.Native/zlib-intel/x86.c → src/native/external/zlib-intel/x86.c
diff --git a/...em.IO.Compression.Native/zlib-intel/x86.h → src/native/external/zlib-intel/x86.h b/...em.IO.Compression.Native/zlib-intel/x86.h → src/native/external/zlib-intel/x86.h
diff --git a/....IO.Compression.Native/zlib-intel/zconf.h → src/native/external/zlib-intel/zconf.h b/....IO.Compression.Native/zlib-intel/zconf.h → src/native/external/zlib-intel/zconf.h
diff --git a/...m.IO.Compression.Native/zlib-intel/zlib.h → src/native/external/zlib-intel/zlib.h b/...m.IO.Compression.Native/zlib-intel/zlib.h → src/native/external/zlib-intel/zlib.h
diff --git a/....IO.Compression.Native/zlib-intel/zutil.c → src/native/external/zlib-intel/zutil.c b/....IO.Compression.Native/zlib-intel/zutil.c → src/native/external/zlib-intel/zutil.c
diff --git a/....IO.Compression.Native/zlib-intel/zutil.h → src/native/external/zlib-intel/zutil.h b/....IO.Compression.Native/zlib-intel/zutil.h → src/native/external/zlib-intel/zutil.h
diff --git a/src/native/libs/System.IO.Compression.Native/CMakeLists.txt b/src/native/libs/System.IO.Compression.Native/CMakeLists.txt
@@ -83,23 +83,7 @@ else ()
     endif ()
 
     if (CLR_CMAKE_HOST_ARCH_I386 OR CLR_CMAKE_HOST_ARCH_AMD64)
-        set(ZLIB_SOURCES
-            zlib-intel/adler32.c
-            zlib-intel/compress.c
-            zlib-intel/crc_folding.c
-            zlib-intel/crc32.c
-            zlib-intel/deflate_medium.c
-            zlib-intel/deflate_quick.c
-            zlib-intel/deflate.c
-            zlib-intel/inffast.c
-            zlib-intel/inflate.c
-            zlib-intel/inftrees.c
-            zlib-intel/match.c
-            zlib-intel/slide_sse.c
-            zlib-intel/trees.c
-            zlib-intel/x86.c
-            zlib-intel/zutil.c
-        )
+        include(${CLR_SRC_NATIVE_DIR}/external/zlib-intel.cmake)
     else ()
         include(${CLR_SRC_NATIVE_DIR}/external/zlib.cmake)
     endif ()

diff --git a/src/native/libs/System.IO.Compression.Native/zlib.md b/src/native/libs/System.IO.Compression.Native/zlib.md