Split packages into zlib/zlib-clib

haskell · Apr 20, 2024 · c3809b5 · c3809b5
1 parent 16571cb
commit c3809b5
Show file tree

Hide file tree

Showing 60 changed files with 111 additions and 30 deletions.
diff --git a/.github/workflows/other.yml b/.github/workflows/other.yml
@@ -31,19 +31,19 @@ jobs:
         key: ${{ runner.os }}-ghc-${{ steps.setup-haskell-cabal.outputs.ghc-version }}
     - name: Build
       run: |
-        cabal sdist -z -o .
+        cabal sdist -o . all
         cabal get zlib-*.tar.gz
-        cd zlib-*/
-        cabal build
+        echo "packages: ./$(ls zlib-clib-*.tar.gz | sed 's/\.tar\.gz//')/" > cabal.project
+        rm zlib-clib*.tar.gz
+        echo "          ./$(ls zlib-*.tar.gz | sed 's/\.tar\.gz//')/" >> cabal.project
+        cabal build all
     - name: Test
       run: |
-        cd zlib-*/
-        cabal test
+        cabal test all
     - name: Haddock
       if: matrix.ghc != '7.10' && matrix.ghc != '8.0'
       run: |
-        cd zlib-*/
-        cabal haddock
+        cabal haddock all
 
   bundled-c-zlib:
     runs-on: ${{ matrix.os }}
@@ -68,18 +68,18 @@ jobs:
         key: ${{ runner.os }}-ghc-${{ steps.setup-haskell-cabal.outputs.ghc-version }}
     - name: Build
       run: |
-        cabal sdist -z -o .
+        cabal sdist -o . all
         cabal get zlib-*.tar.gz
-        cd zlib-*/
-        cabal build -c 'zlib +bundled-c-zlib'
+        echo "packages: ./$(ls zlib-clib-*.tar.gz | sed 's/\.tar\.gz//')/" > cabal.project
+        rm zlib-clib*.tar.gz
+        echo "          ./$(ls zlib-*.tar.gz | sed 's/\.tar\.gz//')/" >> cabal.project
+        cabal build -c 'zlib +bundled-c-zlib' all
     - name: Test
       run: |
-        cd zlib-*/
-        cabal test -c 'zlib +bundled-c-zlib'
+        cabal test -c 'zlib +bundled-c-zlib' all
     - name: Haddock
       run: |
-        cd zlib-*/
-        cabal haddock
+        cabal haddock all
 
   wasi:
     runs-on: ubuntu-latest
@@ -109,7 +109,7 @@ jobs:
     - name: Build
       run: |
         mv cabal.project.wasi cabal.project.local
-        wasm32-wasi-cabal build --enable-tests
+        wasm32-wasi-cabal build --enable-tests all
         wasm32-wasi-cabal list-bin test:tests
     - name: Test
       run: |
@@ -130,4 +130,4 @@ jobs:
       run: |
         source ~/.ghcup/env
         cabal update
-        cabal test
+        cabal test all
diff --git a/cabal.project b/cabal.project
@@ -0,0 +1,2 @@
+packages: ./zlib/
+          ./zlib-clib/
diff --git a/cabal.project.wasi b/cabal.project.wasi
@@ -1,3 +1,6 @@
+packages: ./zlib/
+          ./zlib-clib/
+
 -- https://github.com/haskellari/splitmix/pull/73
 source-repository-package
   type: git

diff --git a/zlib-clib/LICENSE b/zlib-clib/LICENSE
@@ -0,0 +1,22 @@
+Copyright notice:
+
+ (C) 1995-2024 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
diff --git a/zlib-clib/README.md b/zlib-clib/README.md
@@ -0,0 +1,3 @@
+# zlib-clib
+
+Zlib C library bits following https://zlib.net
diff --git a/cbits/adler32.c → zlib-clib/cbits/adler32.c b/cbits/adler32.c → zlib-clib/cbits/adler32.c
diff --git a/cbits/compress.c → zlib-clib/cbits/compress.c b/cbits/compress.c → zlib-clib/cbits/compress.c
diff --git a/cbits/crc32.c → zlib-clib/cbits/crc32.c b/cbits/crc32.c → zlib-clib/cbits/crc32.c
diff --git a/cbits/crc32.h → zlib-clib/cbits/crc32.h b/cbits/crc32.h → zlib-clib/cbits/crc32.h
diff --git a/cbits/deflate.c → zlib-clib/cbits/deflate.c b/cbits/deflate.c → zlib-clib/cbits/deflate.c
diff --git a/cbits/deflate.h → zlib-clib/cbits/deflate.h b/cbits/deflate.h → zlib-clib/cbits/deflate.h
diff --git a/cbits/gzguts.h → zlib-clib/cbits/gzguts.h b/cbits/gzguts.h → zlib-clib/cbits/gzguts.h
diff --git a/cbits/infback.c → zlib-clib/cbits/infback.c b/cbits/infback.c → zlib-clib/cbits/infback.c
diff --git a/cbits/inffast.c → zlib-clib/cbits/inffast.c b/cbits/inffast.c → zlib-clib/cbits/inffast.c
diff --git a/cbits/inffast.h → zlib-clib/cbits/inffast.h b/cbits/inffast.h → zlib-clib/cbits/inffast.h
diff --git a/cbits/inffixed.h → zlib-clib/cbits/inffixed.h b/cbits/inffixed.h → zlib-clib/cbits/inffixed.h
diff --git a/cbits/inflate.c → zlib-clib/cbits/inflate.c b/cbits/inflate.c → zlib-clib/cbits/inflate.c
diff --git a/cbits/inflate.h → zlib-clib/cbits/inflate.h b/cbits/inflate.h → zlib-clib/cbits/inflate.h
diff --git a/cbits/inftrees.c → zlib-clib/cbits/inftrees.c b/cbits/inftrees.c → zlib-clib/cbits/inftrees.c
diff --git a/cbits/inftrees.h → zlib-clib/cbits/inftrees.h b/cbits/inftrees.h → zlib-clib/cbits/inftrees.h
diff --git a/cbits/trees.c → zlib-clib/cbits/trees.c b/cbits/trees.c → zlib-clib/cbits/trees.c
diff --git a/cbits/trees.h → zlib-clib/cbits/trees.h b/cbits/trees.h → zlib-clib/cbits/trees.h
diff --git a/cbits/uncompr.c → zlib-clib/cbits/uncompr.c b/cbits/uncompr.c → zlib-clib/cbits/uncompr.c
diff --git a/cbits/zconf.h → zlib-clib/cbits/zconf.h b/cbits/zconf.h → zlib-clib/cbits/zconf.h
diff --git a/cbits/zlib.h → zlib-clib/cbits/zlib.h b/cbits/zlib.h → zlib-clib/cbits/zlib.h
diff --git a/cbits/zutil.c → zlib-clib/cbits/zutil.c b/cbits/zutil.c → zlib-clib/cbits/zutil.c
diff --git a/cbits/zutil.h → zlib-clib/cbits/zutil.h b/cbits/zutil.h → zlib-clib/cbits/zutil.h
diff --git a/zlib-clib/changelog.md b/zlib-clib/changelog.md
@@ -0,0 +1,3 @@
+1.3.1 Julian Ospald <hasufell@posteo> March 2024
+
+* initial split off of zlib package
diff --git a/update-c-sources.sh → zlib-clib/update-c-sources.sh b/update-c-sources.sh → zlib-clib/update-c-sources.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+set -x
 set -e pipefail
 
 curl -s http://zlib.net/zlib.tar.gz | tar xz
@@ -9,4 +10,5 @@ do
     mv zlib-*/"${csrc##*/}" cbits/
 done
 
-rm -rf zlib-*
+rm -rf zlib-*/ zlib-*.tar.gz
+
diff --git a/zlib-clib/zlib-clib.cabal b/zlib-clib/zlib-clib.cabal
@@ -0,0 +1,53 @@
+cabal-version:   2.4
+name:            zlib-clib
+version:         1.3.1
+
+copyright:       (c) 2006-2016 Duncan Coutts
+license:         Zlib
+license-file:    LICENSE
+author:          Duncan Coutts <duncan@community.haskell.org>
+maintainer:      Duncan Coutts <duncan@community.haskell.org>, Andrew Lelechenko <andrew.lelechenko@gmail.com>, Emily Pillmore <emilypi@cohomolo.gy>, Herbert Valerio Riedel <hvr@gnu.org>
+bug-reports:     https://github.com/haskell/zlib/issues
+category:        Codec
+synopsis:        zlib C library bits
+description:     This package provides the zlib C library bits that Haskell
+                 bindings can use to link against.
+build-type:      Simple
+extra-source-files: changelog.md
+                    README.md
+
+source-repository head
+  type: git
+  location: https://github.com/haskell/zlib.git
+
+library
+  default-language: Haskell2010
+
+  include-dirs: cbits
+  includes: zlib.h
+
+  c-sources: cbits/adler32.c
+             cbits/compress.c
+             cbits/crc32.c
+             cbits/deflate.c
+             cbits/infback.c
+             cbits/inffast.c
+             cbits/inflate.c
+             cbits/inftrees.c
+             cbits/trees.c
+             cbits/uncompr.c
+             cbits/zutil.c
+
+  install-includes:
+     crc32.h
+     inffast.h
+     inflate.h
+     trees.h
+     deflate.h
+     inffixed.h
+     inftrees.h
+     zutil.h
+     gzguts.h
+     zlib.h
+     zconf.h
+
diff --git a/Codec/Compression/GZip.hs → zlib/Codec/Compression/GZip.hs b/Codec/Compression/GZip.hs → zlib/Codec/Compression/GZip.hs
diff --git a/Codec/Compression/Zlib.hs → zlib/Codec/Compression/Zlib.hs b/Codec/Compression/Zlib.hs → zlib/Codec/Compression/Zlib.hs
diff --git a/Codec/Compression/Zlib/ByteStringCompat.hs → ...odec/Compression/Zlib/ByteStringCompat.hs b/Codec/Compression/Zlib/ByteStringCompat.hs → ...odec/Compression/Zlib/ByteStringCompat.hs
diff --git a/Codec/Compression/Zlib/Internal.hs → zlib/Codec/Compression/Zlib/Internal.hs b/Codec/Compression/Zlib/Internal.hs → zlib/Codec/Compression/Zlib/Internal.hs
diff --git a/Codec/Compression/Zlib/Raw.hs → zlib/Codec/Compression/Zlib/Raw.hs b/Codec/Compression/Zlib/Raw.hs → zlib/Codec/Compression/Zlib/Raw.hs
diff --git a/Codec/Compression/Zlib/Stream.hsc → zlib/Codec/Compression/Zlib/Stream.hsc b/Codec/Compression/Zlib/Stream.hsc → zlib/Codec/Compression/Zlib/Stream.hsc
diff --git a/LICENSE → zlib/LICENSE b/LICENSE → zlib/LICENSE
diff --git a/README.md → zlib/README.md b/README.md → zlib/README.md
diff --git a/cbits-extra/hs-zlib.c → zlib/cbits-extra/hs-zlib.c b/cbits-extra/hs-zlib.c → zlib/cbits-extra/hs-zlib.c
diff --git a/cbits-extra/hs-zlib.h → zlib/cbits-extra/hs-zlib.h b/cbits-extra/hs-zlib.h → zlib/cbits-extra/hs-zlib.h
diff --git a/changelog.md → zlib/changelog.md b/changelog.md → zlib/changelog.md
@@ -1,5 +1,9 @@
 See also http://pvp.haskell.org/faq
 
+0.7.1.0 Julian Ospald <hasufell@posteo> March 2024
+
+* split zlib C sources into `zlib-clib` package
+
 0.7.0.0 Bodigrim <andrew.lelechenko@gmail.com> February 2024
 
  * Bump bundled `zlib` to 1.3.1.

diff --git a/examples/gunzip.hs → zlib/examples/gunzip.hs b/examples/gunzip.hs → zlib/examples/gunzip.hs
diff --git a/examples/gzip.hs → zlib/examples/gzip.hs b/examples/gzip.hs → zlib/examples/gzip.hs
diff --git a/examples/zpipe.hs → zlib/examples/zpipe.hs b/examples/zpipe.hs → zlib/examples/zpipe.hs
diff --git a/test/Makefile → zlib/test/Makefile b/test/Makefile → zlib/test/Makefile
diff --git a/test/Test.hs → zlib/test/Test.hs b/test/Test.hs → zlib/test/Test.hs
diff --git a/test/Test/Codec/Compression/Zlib/Internal.hs → ...t/Test/Codec/Compression/Zlib/Internal.hs b/test/Test/Codec/Compression/Zlib/Internal.hs → ...t/Test/Codec/Compression/Zlib/Internal.hs
diff --git a/test/Test/Codec/Compression/Zlib/Stream.hs → ...est/Test/Codec/Compression/Zlib/Stream.hs b/test/Test/Codec/Compression/Zlib/Stream.hs → ...est/Test/Codec/Compression/Zlib/Stream.hs
diff --git a/test/Utils.hs → zlib/test/Utils.hs b/test/Utils.hs → zlib/test/Utils.hs
diff --git a/test/data/bad-crc.gz → zlib/test/data/bad-crc.gz b/test/data/bad-crc.gz → zlib/test/data/bad-crc.gz
diff --git a/test/data/custom-dict.zlib → zlib/test/data/custom-dict.zlib b/test/data/custom-dict.zlib → zlib/test/data/custom-dict.zlib
diff --git a/test/data/custom-dict.zlib-dict → zlib/test/data/custom-dict.zlib-dict b/test/data/custom-dict.zlib-dict → zlib/test/data/custom-dict.zlib-dict
diff --git a/test/data/hello.gz → zlib/test/data/hello.gz b/test/data/hello.gz → zlib/test/data/hello.gz
diff --git a/test/data/not-gzip → zlib/test/data/not-gzip b/test/data/not-gzip → zlib/test/data/not-gzip
diff --git a/test/data/two-files.gz → zlib/test/data/two-files.gz b/test/data/two-files.gz → zlib/test/data/two-files.gz
diff --git a/test/gzip-compress.sh → zlib/test/gzip-compress.sh b/test/gzip-compress.sh → zlib/test/gzip-compress.sh
diff --git a/test/gzip-uncompress.sh → zlib/test/gzip-uncompress.sh b/test/gzip-uncompress.sh → zlib/test/gzip-uncompress.sh
diff --git a/test/zpipe-compress.sh → zlib/test/zpipe-compress.sh b/test/zpipe-compress.sh → zlib/test/zpipe-compress.sh
diff --git a/test/zpipe.c → zlib/test/zpipe.c b/test/zpipe.c → zlib/test/zpipe.c
diff --git a/zlib.cabal → zlib/zlib.cabal b/zlib.cabal → zlib/zlib.cabal
@@ -1,6 +1,6 @@
 cabal-version:   >= 1.10
 name:            zlib
-version:         0.7.0.0
+version:         0.7.1.0
 
 copyright:       (c) 2006-2016 Duncan Coutts
 license:         BSD3
@@ -38,11 +38,6 @@ tested-with:     GHC == 7.10.3
 
 extra-source-files: changelog.md
                     README.md
-                    -- zlib headers
-                    cbits/crc32.h cbits/inffast.h cbits/inflate.h
-                    cbits/trees.h cbits/deflate.h cbits/inffixed.h
-                    cbits/inftrees.h cbits/zutil.h cbits/gzguts.h
-                    cbits/zlib.h cbits/zconf.h
                     -- extra headers
                     cbits-extra/hs-zlib.h
                     -- test data files
@@ -106,13 +101,7 @@ library
     cpp-options:   -DNON_BLOCKING_FFI
 
   if flag(bundled-c-zlib) || impl(ghcjs) || os(ghcjs) || arch(wasm32)
-    -- We bundle a complete copy of the C sources of zlib-1.3.1,
-    -- downloaded via update-c-sources.sh.
-    c-sources:   cbits/adler32.c cbits/compress.c cbits/crc32.c
-                 cbits/deflate.c cbits/infback.c
-                 cbits/inffast.c cbits/inflate.c cbits/inftrees.c
-                 cbits/trees.c cbits/uncompr.c cbits/zutil.c
-    include-dirs:  cbits
+    build-depends: zlib-clib
   else
     if flag(pkg-config)
       -- NB: pkg-config is available on windows as well when using msys2
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# zlib-clib

		Zlib C library bits following https://zlib.net
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		1.3.1 Julian Ospald <hasufell@posteo> March 2024

		* initial split off of zlib package