WIP

well-typed · Aug 21, 2024 · a6f65db · a6f65db
1 parent 91e1597
commit a6f65db
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -148,6 +148,7 @@ jobs:
           touch cabal.project
           echo "packages: $GITHUB_WORKSPACE/source/hs-bindgen-patterns" >> cabal.project
           echo "packages: $GITHUB_WORKSPACE/source/hs-bindgen" >> cabal.project
+          echo "packages: $GITHUB_WORKSPACE/source/hs-bindgen-libclang" >> cabal.project
           cat cabal.project
       - name: sdist
         run: |
@@ -163,22 +164,29 @@ jobs:
           echo "PKGDIR_hs_bindgen_patterns=${PKGDIR_hs_bindgen_patterns}" >> "$GITHUB_ENV"
           PKGDIR_hs_bindgen="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/hs-bindgen-[0-9.]*')"
           echo "PKGDIR_hs_bindgen=${PKGDIR_hs_bindgen}" >> "$GITHUB_ENV"
+          PKGDIR_hs_bindgen_libclang="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/hs-bindgen-libclang-[0-9.]*')"
+          echo "PKGDIR_hs_bindgen_libclang=${PKGDIR_hs_bindgen_libclang}" >> "$GITHUB_ENV"
           rm -f cabal.project cabal.project.local
           touch cabal.project
           touch cabal.project.local
           echo "packages: ${PKGDIR_hs_bindgen_patterns}" >> cabal.project
           echo "packages: ${PKGDIR_hs_bindgen}" >> cabal.project
+          echo "packages: ${PKGDIR_hs_bindgen_libclang}" >> cabal.project
           echo "package hs-bindgen-patterns" >> cabal.project
           echo "    ghc-options: -Werror=missing-methods" >> cabal.project
           echo "package hs-bindgen" >> cabal.project
           echo "    ghc-options: -Werror=missing-methods" >> cabal.project
+          echo "package hs-bindgen-libclang" >> cabal.project
+          echo "    ghc-options: -Werror=missing-methods" >> cabal.project
           cat >> cabal.project <<EOF
           package hs-bindgen
-            flags: +build-clang-tutorial
+            flags:       +build-clang-tutorial
+            ghc-options: -Werror -Wno-error=unused-packages
 
           package hs-bindgen-patterns
+            ghc-options: -Werror
           EOF
-          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(hs-bindgen|hs-bindgen-patterns)$/; }' >> cabal.project.local
+          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(hs-bindgen|hs-bindgen-libclang|hs-bindgen-patterns)$/; }' >> cabal.project.local
           cat cabal.project
           cat cabal.project.local
       - name: dump install plan
@@ -207,6 +215,8 @@ jobs:
           ${CABAL} -vnormal check
           cd ${PKGDIR_hs_bindgen} || false
           ${CABAL} -vnormal check
+          cd ${PKGDIR_hs_bindgen_libclang} || false
+          ${CABAL} -vnormal check
       - name: haddock
         run: |
           $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all

diff --git a/cabal.project.ci b/cabal.project.ci
@@ -4,6 +4,9 @@ packages: hs-bindgen-libclang
 
 package hs-bindgen
   flags: +build-clang-tutorial
+  -- unused-packages gives false positive for hs-bindgen-libclang
+  -- we could suppress that by providing a dummy empty module.
+  -- ... or later having a module generated by hs-bindgen itself.
   ghc-options: -Werror -Wno-error=unused-packages
 
 package hs-bindgen-patterns

diff --git a/hs-bindgen/hs-bindgen.cabal b/hs-bindgen/hs-bindgen.cabal
@@ -36,10 +36,6 @@ common lang
       RoleAnnotations
       TypeFamilies
 
--- @libclang@
---
--- TODO: <https://github.com/llvm/llvm-project/issues/9777>
--- It seems @libclang@ does not support @pkg-config@.
 common clang-wrappers
   build-depends:
       hs-bindgen-libclang ==0.1.0