Skip to content

Commit c3809b5

Browse files
hasufellBodigrim
authored andcommitted
Split packages into zlib/zlib-clib
1 parent 16571cb commit c3809b5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+111
-30
lines changed

.github/workflows/other.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@ jobs:
3131
key: ${{ runner.os }}-ghc-${{ steps.setup-haskell-cabal.outputs.ghc-version }}
3232
- name: Build
3333
run: |
34-
cabal sdist -z -o .
34+
cabal sdist -o . all
3535
cabal get zlib-*.tar.gz
36-
cd zlib-*/
37-
cabal build
36+
echo "packages: ./$(ls zlib-clib-*.tar.gz | sed 's/\.tar\.gz//')/" > cabal.project
37+
rm zlib-clib*.tar.gz
38+
echo " ./$(ls zlib-*.tar.gz | sed 's/\.tar\.gz//')/" >> cabal.project
39+
cabal build all
3840
- name: Test
3941
run: |
40-
cd zlib-*/
41-
cabal test
42+
cabal test all
4243
- name: Haddock
4344
if: matrix.ghc != '7.10' && matrix.ghc != '8.0'
4445
run: |
45-
cd zlib-*/
46-
cabal haddock
46+
cabal haddock all
4747
4848
bundled-c-zlib:
4949
runs-on: ${{ matrix.os }}
@@ -68,18 +68,18 @@ jobs:
6868
key: ${{ runner.os }}-ghc-${{ steps.setup-haskell-cabal.outputs.ghc-version }}
6969
- name: Build
7070
run: |
71-
cabal sdist -z -o .
71+
cabal sdist -o . all
7272
cabal get zlib-*.tar.gz
73-
cd zlib-*/
74-
cabal build -c 'zlib +bundled-c-zlib'
73+
echo "packages: ./$(ls zlib-clib-*.tar.gz | sed 's/\.tar\.gz//')/" > cabal.project
74+
rm zlib-clib*.tar.gz
75+
echo " ./$(ls zlib-*.tar.gz | sed 's/\.tar\.gz//')/" >> cabal.project
76+
cabal build -c 'zlib +bundled-c-zlib' all
7577
- name: Test
7678
run: |
77-
cd zlib-*/
78-
cabal test -c 'zlib +bundled-c-zlib'
79+
cabal test -c 'zlib +bundled-c-zlib' all
7980
- name: Haddock
8081
run: |
81-
cd zlib-*/
82-
cabal haddock
82+
cabal haddock all
8383
8484
wasi:
8585
runs-on: ubuntu-latest
@@ -109,7 +109,7 @@ jobs:
109109
- name: Build
110110
run: |
111111
mv cabal.project.wasi cabal.project.local
112-
wasm32-wasi-cabal build --enable-tests
112+
wasm32-wasi-cabal build --enable-tests all
113113
wasm32-wasi-cabal list-bin test:tests
114114
- name: Test
115115
run: |
@@ -130,4 +130,4 @@ jobs:
130130
run: |
131131
source ~/.ghcup/env
132132
cabal update
133-
cabal test
133+
cabal test all

cabal.project

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
packages: ./zlib/
2+
./zlib-clib/

cabal.project.wasi

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
packages: ./zlib/
2+
./zlib-clib/
3+
14
-- https://github.com/haskellari/splitmix/pull/73
25
source-repository-package
36
type: git

zlib-clib/LICENSE

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Copyright notice:
2+
3+
(C) 1995-2024 Jean-loup Gailly and Mark Adler
4+
5+
This software is provided 'as-is', without any express or implied
6+
warranty. In no event will the authors be held liable for any damages
7+
arising from the use of this software.
8+
9+
Permission is granted to anyone to use this software for any purpose,
10+
including commercial applications, and to alter it and redistribute it
11+
freely, subject to the following restrictions:
12+
13+
1. The origin of this software must not be misrepresented; you must not
14+
claim that you wrote the original software. If you use this software
15+
in a product, an acknowledgment in the product documentation would be
16+
appreciated but is not required.
17+
2. Altered source versions must be plainly marked as such, and must not be
18+
misrepresented as being the original software.
19+
3. This notice may not be removed or altered from any source distribution.
20+
21+
Jean-loup Gailly Mark Adler
22+

zlib-clib/README.md

Lines changed: 3 additions & 0 deletions
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)