qtah-cpp-qt5 0.1.1 → 0.1.2

raw patch · 3 files changed

+23/−16 lines, 3 filessetup-changed

Files

• Setup.hs +21/−14
• cpp/qtah.pro +1/−1
• qtah-cpp-qt5.cabal +1/−1

@@ -44,13 +44,16 @@   BuildFlags,   CleanFlags,   ConfigFlags,-  CopyDest (NoCopyDest),+  CopyDest (CopyTo, NoCopyDest),   buildVerbosity,   cleanVerbosity,   configConfigurationsFlags,   configVerbosity,+  copyDest,   copyVerbosity,+  flagToMaybe,   fromFlagOrDefault,+  installDistPref,   installVerbosity,   ) import Distribution.Simple.UserHooks (@@ -99,10 +102,13 @@   , buildHook = \pd lbi uh bf -> do doBuild lbi bf                                     buildHook simpleUserHooks pd lbi uh bf   , copyHook = \pd lbi uh cf -> do let verbosity = fromFlagOrDefault normal $ copyVerbosity cf-                                   doInstall verbosity pd lbi+                                       dest = fromFlagOrDefault NoCopyDest $ copyDest cf+                                   doInstall verbosity pd lbi dest                                    copyHook simpleUserHooks pd lbi uh cf   , instHook = \pd lbi uh if' -> do let verbosity = fromFlagOrDefault normal $ installVerbosity if'-                                    doInstall verbosity pd lbi+                                        dest = maybe NoCopyDest CopyTo $+                                               flagToMaybe $ installDistPref if'+                                    doInstall verbosity pd lbi dest                                     instHook simpleUserHooks pd lbi uh if'   , cleanHook = \pd z uh cf -> do doClean cf                                   cleanHook simpleUserHooks pd z uh cf@@ -125,18 +131,19 @@   startDir <- getCurrentDirectory   let cppSourceDir = startDir </> "cpp"       programDb = withPrograms localBuildInfo+      verbosity = fromFlagOrDefault normal $ configVerbosity configFlags    -- Parse the Qt version to use from flags and the environment, and export it   -- to the generator.   _ <- exportQtVersion configFlags localBuildInfo    -- Generate binding source code.-  runDbProgram normal generatorProgram programDb ["--gen-cpp", "cpp"]-  runDbProgram normal listenerGenProgram programDb ["--gen-cpp-dir", "cpp"]+  runDbProgram verbosity generatorProgram programDb ["--gen-cpp", "cpp"]+  runDbProgram verbosity listenerGenProgram programDb ["--gen-cpp-dir", "cpp"]    -- Run qmake to generate the makefile.   setCurrentDirectory cppSourceDir-  runDbProgram normal qmakeProgram programDb ["qtah.pro"]+  runDbProgram verbosity qmakeProgram programDb ["qtah.pro"]    setCurrentDirectory startDir @@ -167,19 +174,19 @@    setCurrentDirectory cppSourceDir   notice verbosity $ concat ["Building the Qtah C++ library", jobMsg, "..."]-  runDbProgram normal makeProgram programDb makeArgs+  runDbProgram verbosity makeProgram programDb makeArgs    setCurrentDirectory startDir -doInstall :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()-doInstall verbosity packageDesc localBuildInfo = do+doInstall :: Verbosity -> PackageDescription -> LocalBuildInfo -> CopyDest -> IO ()+doInstall verbosity packageDesc localBuildInfo copyDest = do   startDir <- getCurrentDirectory   let cppSourceDir = startDir </> "cpp"-      libDir = libdir $ absoluteInstallDirs packageDesc localBuildInfo NoCopyDest+      libDir = libdir $ absoluteInstallDirs packageDesc localBuildInfo copyDest    -- Install the built library into the package's libdir.   createDirectoryIfMissing True libDir-  forM_ ["libqtah.so", "libqtah.so.0", "libqtah.so.0.1", "libqtah.so.0.1.0"] $ \p -> do+  forM_ ["libqtah.so", "libqtah.so.0", "libqtah.so.0.1", "libqtah.so.0.1.2"] $ \p -> do     let path = libDir </> p     shouldDelete <-       catchIOError (do _ <- getSymbolicLinkStatus path@@ -187,9 +194,9 @@       (\e -> if isDoesNotExistError e then return False else ioError e)     when shouldDelete $ removeFile path   installExecutableFile verbosity-                        (cppSourceDir </> "libqtah.so.0.1.0")-                        (libDir </> "libqtah.so.0.1.0")-  createSymbolicLink "libqtah.so.0.1.0" (libDir </> "libqtah.so.0.1")+                        (cppSourceDir </> "libqtah.so.0.1.2")+                        (libDir </> "libqtah.so.0.1.2")+  createSymbolicLink "libqtah.so.0.1.2" (libDir </> "libqtah.so.0.1")   createSymbolicLink "libqtah.so.0.1" (libDir </> "libqtah.so.0")   createSymbolicLink "libqtah.so.0" (libDir </> "libqtah.so") 

@@ -21,7 +21,7 @@  TARGET = qtah TEMPLATE = lib-VERSION = 0.1.0+VERSION = 0.1.2 # Doesn't seem to work here: CONFIG += c++11 QMAKE_CXXFLAGS += -std=c++11 

@@ -1,5 +1,5 @@ name: qtah-cpp-qt5-version: 0.1.1+version: 0.1.2 synopsis: Qt bindings for Haskell - C++ library homepage: http://khumba.net/projects/qtah license: LGPL-3