Minor fix for fixing the pckConfig dependency, travis fixes

Author: chetant

.travis.yml

@@ -1,14 +1,102 @@
-language: haskell
+# This Travis job script has been generated by a script via
+#
+#   make_travis_yml_2.hs 'LibClang.cabal'
+#
+# For more information, see https://github.com/hvr/multi-ghc-travis
+#
+language: c
+sudo: false
 
-before_install:
-  - git submodule update --init --recursive
+git:
+  submodules: false  # whether to recursively clone submodules
+
+cache:
+  directories:
+    - $HOME/.cabal/packages
+    - $HOME/.cabal/store
 
-branches:
-  only:
-    - master
+before_cache:
+  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
+  # remove files that are regenerated by 'cabal update'
+  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
+  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
+  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
+  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
+  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
+
+matrix:
+  include:
+    - compiler: "ghc-7.8.4"
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
+      addons: {apt: {packages: [libstdc++6,
+                                llvm-3.8,llvm-3.8-dev,llvm-3.8-runtime,libllvm3.8,
+                                libclang-3.8-dev,
+                                ghc-ppa-tools,cabal-install-head,ghc-7.8.4,alex-3.1.7,happy-1.19.5],
+                     sources: [hvr-ghc,llvm-toolchain-precise-3.8,ubuntu-toolchain-r-test]}}
+    - compiler: "ghc-7.10.3"
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
+      addons: {apt: {packages: [libstdc++6,
+                                llvm-3.8,llvm-3.8-dev,llvm-3.8-runtime,libllvm3.8,
+                                libclang-3.8-dev,
+                                ghc-ppa-tools,cabal-install-head,ghc-7.10.3,alex-3.1.7,happy-1.19.5],
+                     sources: [hvr-ghc,llvm-toolchain-precise-3.8,ubuntu-toolchain-r-test]}}
+    - compiler: "ghc-8.0.2"
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
+      addons: {apt: {packages: [libstdc++6,
+                                llvm-3.8,llvm-3.8-dev,llvm-3.8-runtime,libllvm3.8,
+                                libclang-3.8-dev,
+                                ghc-ppa-tools,cabal-install-head,ghc-8.0.2,alex-3.1.7,happy-1.19.5],
+                     sources: [hvr-ghc,llvm-toolchain-precise-3.8,ubuntu-toolchain-r-test]}}
+
+before_install:
+ - HC=${CC}
+ - unset CC
+ - export HAPPYVER=1.19.5
+ - export ALEXVER=3.1.7
+ - PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:/opt/happy/$HAPPYVER/bin:/opt/alex/$ALEXVER/bin:$PATH
+ - PKGNAME='LibClang'
 
 install:
-  - cabal update && cabal install Cabal cabal-install && cabal install --only-dependencies --enable-tests
+ - cabal --version
+ - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
+ - BENCH=${BENCH---enable-benchmarks}
+ - TEST=${TEST---enable-tests}
+ - travis_retry cabal update -v
+ - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
+ - cabal install c2hs hsc2hs
+ - rm -fv cabal.project.local
+ - "echo 'packages: .' > cabal.project"
+ - rm -f cabal.project.freeze
+ - cabal new-build -w ${HC} ${TEST} ${BENCH} --dep -j2
+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2
 
+# Here starts the actual work to be performed for the package under test;
+# any command which exits with a non-zero exit code causes the build to fail.
 script:
-  - cabal configure --enable-tests && cabal build && cabal test
+ - if [ -f configure.ac ]; then autoreconf -i; fi
+ - rm -rf dist/
+ - cabal sdist # test that a source-distribution can be generated
+ - cd dist/
+ - SRCTAR=(${PKGNAME}-*.tar.gz)
+ - SRC_BASENAME="${SRCTAR/%.tar.gz}"
+ - tar -xvf "./$SRC_BASENAME.tar.gz"
+ - cd "$SRC_BASENAME/"
+## from here on, CWD is inside the extracted source-tarball
+ - rm -fv cabal.project.local
+ - "echo 'packages: .' > cabal.project"
+ # this builds all libraries and executables (without tests/benchmarks)
+ - rm -f cabal.project.freeze
+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks
+ # this builds all libraries and executables (including tests/benchmarks)
+ # - rm -rf ./dist-newstyle
+ - cabal new-build -w ${HC} ${TEST} ${BENCH}
+
+ # there's no 'cabal new-test' yet, so let's emulate for now
+ - TESTS=( $(awk 'tolower($0) ~ /^test-suite / { print $2 }' *.cabal) )
+ - if [ "$TEST" != "--enable-tests" ]; then TESTS=(); fi
+ - shopt -s globstar;
+   RC=true; for T in ${TESTS[@]}; do echo "== $T ==";
+   if dist-newstyle/build/**/$SRC_BASENAME/**/build/$T/$T; then echo "= $T OK =";
+   else echo "= $T FAILED ="; RC=false; fi; done; $RC
+
+# EOF

LibClang.cabal

@@ -17,9 +17,12 @@ Description:
   Please use <https://github.com/chetant/LibClang/issues> to report bugs
 
 Category: Language
+Tested-With: GHC == 7.8.4
+           , GHC == 7.10.3
+           , GHC == 8.0.2
 Build-type: Custom
 Extra-Source-Files: cbits/utils.h, cbits/visitors.h, cbits/wrappers.h,
-                    test/*.hs, test/*.c, test/runTest.sh
+                    test/*.hs, test/*.c, test/runTest.sh, test/Makefile
 Source-Repository head
   type: git
   location: git://github.com/chetant/LibClang.git
@@ -68,5 +71,5 @@ Library
                  Clang.Internal.FFI,
                  Clang.Internal.FFIConstants
   default-language: Haskell2010
-  pkgconfig-depends: ncurses, llvm == 3.8.0
-  extra-libraries: clang-3.8.0
+  pkgconfig-depends: ncurses
+  extra-libraries: clang-3.8

Setup.hs

@@ -1,12 +1,17 @@
+{-# LANGUAGE CPP #-}
 import Distribution.Simple
+import Distribution.PackageDescription
+import Data.Version
 import Data.List
-import Data.Char (isSpace)
+import Data.Char(isSpace)
+import Data.Maybe
 import System.Directory(getCurrentDirectory, removeFile)
 import System.IO(IOMode(..), openFile, hPutStr, hFlush, hClose)
 import System.IO.Error(catchIOError)
 import System.Process(readProcess)
 import System.Environment(lookupEnv, getEnv, setEnv)
 import System.FilePath.Posix((</>))
+import Control.Applicative((<$>))
 import Control.Exception(bracket)
 
 rtrim :: String -> String
@@ -15,45 +20,59 @@ rtrim = f . f
 
 getLLVMDetails llvmConfigPath = do
   version <- rtrim <$> readProcess llvmConfigPath ["--version"] []
-  cxxFlags <- rtrim <$> readProcess llvmConfigPath ["--cxxflags"] []
   libPath <- rtrim <$> readProcess llvmConfigPath ["--libdir"] []
   includePath <- rtrim <$> readProcess llvmConfigPath ["--includedir"] []
-  let cFlags = unwords $ filter (not . isPrefixOf "-std") $ words cxxFlags
-  return (version,cFlags,libPath,includePath)
+  return (version,libPath,includePath)
 
 setupLLVMPkgConfig tmpPCPath outf = do
   let tryElse act failAct = catchIOError act (const failAct)
-  (version,cFlags,libPath,includePath) <- getLLVMDetails "llvm-config" `tryElse`
-                                          getLLVMDetails "llvm-config-3.8" `tryElse`
-                                          (getEnv "LLVM_CONFIG" >>= getLLVMDetails) `tryElse`
-                                          (error "ERROR: cannot find llvm-config, please setup environment variable LLVM_CONFIG with location of llvm-config and try again")
+  (version,libPath,includePath) <- getLLVMDetails "llvm-config-3.8" `tryElse`
+                                   getLLVMDetails "llvm-config" `tryElse`
+                                   (getEnv "LLVM_CONFIG" >>= getLLVMDetails) `tryElse`
+                                   (error "ERROR: cannot find llvm-config, please setup environment variable LLVM_CONFIG with location of llvm-config and try again")
   let pc = unlines $ ["Name: LLVM"
                      ,"Description: Low-level Virtual Machine compiler framework"
                      ,"Version: " ++ version
                      ,"URL: http://www.llvm.org/"
                      ,"Requires:"
                      ,"Conflicts:"
                      ,"Libs: -L" ++ libPath ++ " -lLLVM-" ++ version
-                     ,"Cflags: -I" ++ includePath ++ " " ++ cFlags]
+                     ,"Cflags: -I" ++ includePath]
       pkgConfigPath = "PKG_CONFIG_PATH"
-  -- putStrLn pc
   hPutStr outf pc
   hFlush outf
   mpc <- lookupEnv pkgConfigPath
-  setEnv pkgConfigPath $ case mpc of
-    Just pc -> pc ++ ":" ++ tmpPCPath
-    Nothing -> tmpPCPath
+  let pkgConfigPathVal = case mpc of
+        Just pc -> pc ++ ":" ++ tmpPCPath
+        Nothing -> tmpPCPath
+  -- putStrLn $ pkgConfigPath ++ "=" ++ pkgConfigPathVal
+  setEnv pkgConfigPath pkgConfigPathVal
 
 withTmpPC runM = do
   cwd <- getCurrentDirectory
   let llvmPCFname = cwd </> "llvm.pc"
   bracket
     (openFile llvmPCFname WriteMode)
-    -- (\outf -> hClose outf >> removeFile llvmPCFname)
-    hClose
+    (\outf -> hClose outf >> removeFile llvmPCFname)
     (runM cwd)
 
+pcHook = simpleUserHooks { confHook = confHookM }
+  where confHookM (gpd, hbi) cf = do
+          let cdt = fromJust $ condLibrary gpd
+              lib = condTreeData cdt
+              lbi = libBuildInfo lib
+              vRange = withinVersion $ makeVersion [3,8]
+              lbi' = lbi { pkgconfigDepends = pkgconfigDepends lbi ++
+                                              [Dependency (PackageName "llvm") vRange] }
+              lib' = lib { libBuildInfo = lbi' }
+              gpd' = gpd { condLibrary = Just (cdt { condTreeData = lib' }) }
+          (confHook simpleUserHooks) (gpd', hbi) cf
+
+#if __GLASGOW_HASKELL__ < 710
+makeVersion xs = Version xs []
+#endif
+
 main =
   withTmpPC $ \cwd outf -> do
     setupLLVMPkgConfig cwd outf
-    defaultMain
+    defaultMainWithHooks pcHook

src/Clang/Comment.hs

@@ -29,6 +29,7 @@ module Clang.Comment
 , FFI.InlineCommandRenderStyle (..)
 ) where
 
+import Control.Applicative
 import Control.Monad
 import Control.Monad.IO.Class
 import Data.Maybe

src/Clang/Completion.hs

@@ -41,6 +41,7 @@ module Clang.Completion
 , getBriefComment
 ) where
 
+import Control.Applicative
 import Control.Monad
 import Control.Monad.IO.Class
 import Data.Typeable

src/Clang/Cursor.hs

@@ -85,6 +85,7 @@ module Clang.Cursor
 , getCompletionString
 ) where
 
+import Control.Applicative
 import Control.Monad.IO.Class
 import GHC.Word
 

src/Clang/File.hs

@@ -21,6 +21,7 @@ module Clang.File
 , FFI.UniqueId
 ) where
 
+import Control.Applicative
 import Control.Monad.IO.Class
 import Data.Time.Clock.POSIX (POSIXTime, posixSecondsToUTCTime)
 import Data.Time.Clock (UTCTime)

src/Clang/Index.hs

@@ -21,6 +21,7 @@ module Clang.Index
 , FFI.threadBackgroundPriorityForAll
 ) where
 
+import Control.Applicative
 import Control.Monad.IO.Class
 
 import Clang.Internal.BitFlags

src/Clang/Internal/Comment.hs

@@ -9,6 +9,7 @@ module Clang.Internal.Comment
 , getFFIComment
 ) where
 
+import Control.Applicative
 import Control.Monad
 import Control.Monad.IO.Class
 import Data.Typeable

src/Clang/Internal/FFI.chs

@@ -341,6 +341,7 @@ module Clang.Internal.FFI
 , remap_getFilenames
 ) where
 
+import Control.Applicative
 import Control.Monad (forM_)
 import Control.Monad.Trans
 import qualified Data.ByteString as B