Merge pull request #63 from haskellari/separate-packages

Use build-type: Simple when possible

Author: phadej

.github/workflows/haskell-ci.yml

@@ -1,6 +1,6 @@
 # This GitHub workflow config has been generated by a script via
 #
-#   haskell-ci 'github' 'postgresql-libpq.cabal'
+#   haskell-ci 'github' 'cabal.project'
 #
 # To regenerate the script (for example after adjusting tested-with) run
 #
@@ -10,7 +10,7 @@
 #
 # version: 0.19.20240708
 #
-# REGENDATA ("0.19.20240708",["github","postgresql-libpq.cabal"])
+# REGENDATA ("0.19.20240708",["github","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -175,6 +175,8 @@ jobs:
         run: |
           touch cabal.project
           echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project
+          echo "packages: $GITHUB_WORKSPACE/source/postgresql-libpq-pkgconfig" >> cabal.project
+          echo "packages: $GITHUB_WORKSPACE/source/postgresql-libpq-configure" >> cabal.project
           cat cabal.project
       - name: sdist
         run: |
@@ -188,15 +190,25 @@ jobs:
         run: |
           PKGDIR_postgresql_libpq="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/postgresql-libpq-[0-9.]*')"
           echo "PKGDIR_postgresql_libpq=${PKGDIR_postgresql_libpq}" >> "$GITHUB_ENV"
+          PKGDIR_postgresql_libpq_pkgconfig="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/postgresql-libpq-pkgconfig-[0-9.]*')"
+          echo "PKGDIR_postgresql_libpq_pkgconfig=${PKGDIR_postgresql_libpq_pkgconfig}" >> "$GITHUB_ENV"
+          PKGDIR_postgresql_libpq_configure="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/postgresql-libpq-configure-[0-9.]*')"
+          echo "PKGDIR_postgresql_libpq_configure=${PKGDIR_postgresql_libpq_configure}" >> "$GITHUB_ENV"
           rm -f cabal.project cabal.project.local
           touch cabal.project
           touch cabal.project.local
           echo "packages: ${PKGDIR_postgresql_libpq}" >> cabal.project
+          echo "packages: ${PKGDIR_postgresql_libpq_pkgconfig}" >> cabal.project
+          echo "packages: ${PKGDIR_postgresql_libpq_configure}" >> cabal.project
           echo "package postgresql-libpq" >> cabal.project
           echo "    ghc-options: -Werror=missing-methods" >> cabal.project
+          echo "package postgresql-libpq-pkgconfig" >> cabal.project
+          echo "    ghc-options: -Werror=missing-methods" >> cabal.project
+          echo "package postgresql-libpq-configure" >> cabal.project
+          echo "    ghc-options: -Werror=missing-methods" >> cabal.project
           cat >> cabal.project <<EOF
           EOF
-          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(postgresql-libpq)$/; }' >> cabal.project.local
+          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(postgresql-libpq|postgresql-libpq-configure|postgresql-libpq-pkgconfig)$/; }' >> cabal.project.local
           cat cabal.project
           cat cabal.project.local
       - name: dump install plan
@@ -226,13 +238,26 @@ jobs:
         run: |
           cd ${PKGDIR_postgresql_libpq} || false
           ${CABAL} -vnormal check
+          cd ${PKGDIR_postgresql_libpq_pkgconfig} || false
+          ${CABAL} -vnormal check
+          cd ${PKGDIR_postgresql_libpq_configure} || false
+          ${CABAL} -vnormal check
       - name: haddock
         run: |
           $CABAL v2-haddock --disable-documentation $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
       - name: unconstrained build
         run: |
           rm -f cabal.project.local
           $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
+      - name: prepare for constraint sets
+        run: |
+          rm -f cabal.project.local
+      - name: constraint set pkg-config
+        run: |
+          $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='postgresql-libpq +use-pkg-config' all --dry-run
+          cabal-plan topo | sort
+          $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='postgresql-libpq +use-pkg-config' --dependencies-only -j2 all
+          $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='postgresql-libpq +use-pkg-config' all
       - name: save cache
         uses: actions/cache/save@v4
         if: always()

.github/workflows/simple.yml

@@ -50,13 +50,20 @@ jobs:
           key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
           restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
 
-      - name: cabal.project.local
+      - name: cabal.project (win)
         if: matrix.os == 'windows-latest'
-        run: cp cabal.project.local.win cabal.project.local
+        run: cp cabal.project.win cabal.project
+
+      - name: cabal.project (macos)
+        if: matrix.os == 'macos-latest'
+        run: cp cabal.project.macos cabal.project
 
       - name: ghc-pkg dump
         run: ghc-pkg list
 
+      - name: Dependencies
+        run: cabal build all --enable-tests --only-dependencies
+
       - name: Build
         run: cabal build all --enable-tests
 

CHANGELOG.md

@@ -1,3 +1,10 @@
+0.10.2.0
+--------
+
+- Split the c library dependency into separate packages.
+  Now the dependencies are either all `build-type: Simple` (`-f +use-pkg-config`)
+  or  `build-type: Configure` (`-f -use-pkg-config`).
+
 0.10.1.0
 --------
 

Setup.hs

@@ -4,3 +4,6 @@ postgresql:         True
 -- due build-type: Custom
 test-output-direct: False
 haddock-components: libs
+
+constraint-set pkg-config
+  constraints: postgresql-libpq +use-pkg-config

cabal.haskell-ci

@@ -1 +1,3 @@
 packages: .
+packages: postgresql-libpq-pkgconfig
+packages: postgresql-libpq-configure

cabal.project

@@ -0,0 +1,7 @@
+packages: .
+packages: postgresql-libpq-configure
+
+constraints: unix installed
+
+package postgresql-libpq
+  flags: -use-pkg-config

cabal.project.local.win

@@ -0,0 +1,7 @@
+packages: .
+packages: postgresql-libpq-configure
+
+constraints: Win32 installed
+
+package postgresql-libpq
+  flags: -use-pkg-config

cabal.project.macos

@@ -0,0 +1,5 @@
+postgresql-libpq-configure.buildinfo
+config.log
+config.status
+aclocal.m4
+autom4te.cache/