HROOT 0.8 → 0.9
raw patch · 4 files changed
+19/−145 lines, 4 filesdep +HROOT-treedep +fficxxdep +template-haskelldep ~fficxx-runtime
Dependencies added: HROOT-tree, fficxx, template-haskell
Dependency ranges changed: fficxx-runtime
Files
- CHANGES +0/−39
- Config.hs +0/−85
- HROOT.cabal +15/−20
- src/HROOT.hs +4/−1
− CHANGES
@@ -1,39 +0,0 @@-0.5.0: 31 Jul 2011- * initial preview release--0.5.1: 3 Aug 2011- * support for delete --0.6: 16 Aug 2011- * implement Deletable. delete method for every object- * refactor HROOT generated file names (Interface.hs, Implementation.hs, FFI.hs) --0.6.3: 22 Sep 2011 - * Implement Existential Types --0.6.4: 28 Sep 2011 - * add many TH2 class methods--0.6.6: 7 Oct 2011 - * do not need OverlappingInstances, IncoherentInstances, UndecidableInstances ---0.6.7: 18 Oct 2011- * implement almost all TH1 class methods--0.6.8: 20 Oct 2011- * implement almost all class methods of TH2, TH3, TFormula, TF1 and TGraph--0.6.9: 20 Oct 2011 - * implement almost all class methods of TLine, TAttLine, TAttMarker, TAttText and TAttPad--0.7 : 8 Nov 2011- * separate all class interfaces and implementation in different modules- * overhaul Existential --0.7.1 : 12 Nov 2011 - * support for static methods- * add TROOT--0.8 : 17 Jun 2014- * separate packages into HROOT-core, HROOT-hist, HROOT-io, HROOT-math, HROOT-graf and HROOT is now an umbrella package
− Config.hs
@@ -1,85 +0,0 @@-{-# LANGUAGE ScopedTypeVariables #-}--module Config where- -import Distribution.Simple-import Distribution.Simple.Setup-import Distribution.PackageDescription-import Distribution.Simple.LocalBuildInfo--import System.Exit-import System.Process--config :: LocalBuildInfo -> IO (Maybe HookedBuildInfo)-config bInfo = do - (excode, out, err) <- readProcessWithExitCode "root-config" ["--glibs"] ""- liboptset' <- case excode of - ExitSuccess -> do - return . Just . mkLibraryOptionSet . words $ out- _ -> do - putStrLn $ "root-config failure but I am installing HROOT without ROOT. It will not work. This is only for documentation." - return Nothing - (excode2,out2,err2) <- readProcessWithExitCode "root-config" ["--incdir"] ""- incdir' <- case excode2 of - ExitSuccess -> do - return . Just . head . words $ out2- _ -> do - putStrLn $ "root-config failure but I am installing HROOT without ROOT. It will not work. This is only for documentation." - return Nothing- let Just lib = library . localPkgDescr $ bInfo- buildinfo = libBuildInfo lib- let (r :: Maybe HookedBuildInfo) = case liboptset' of - Nothing -> Nothing- Just liboptset -> - case incdir' of - Nothing -> Nothing - Just incdir -> - let hbi = emptyBuildInfo { extraLibs = extraLibs buildinfo - ++ libs liboptset- , extraLibDirs = libdirs liboptset - , includeDirs = incdir : includeDirs buildinfo- }- in Just (Just hbi, []) - return r ---data LibraryOptionSet = LibraryOptionSet { - libs :: [String], - libdirs :: [String], - libopts :: [String]-} deriving Show--data LibraryOption = Lib String - | Dir String- | Opt String - deriving Show--mkLibraryOptionSet :: [String] -> LibraryOptionSet-mkLibraryOptionSet strs = let opts = libraryOptions strs- in foldr f (LibraryOptionSet [] [] []) opts - where f x (LibraryOptionSet l d o) = case x of- Lib st -> LibraryOptionSet (st:l) d o - Dir st -> LibraryOptionSet l (st:d) o - Opt st -> LibraryOptionSet l d (st:o) --libraryOptions :: [String] -> [LibraryOption] -- LibraryOptionSet -libraryOptions = map f - where f x = let r = parseLibraryOptionClassifier x- in case r of - Left msg -> error (show msg)- Right result -> result---parseLibraryOptionClassifier :: String -> Either String LibraryOption -parseLibraryOptionClassifier [] = Left "empty option"-parseLibraryOptionClassifier str@(x:xs) = - case x of- '-' -> if null xs - then Left "parse error"- else let (y:ys) = xs- in case y of- 'L' -> Right (Dir ys)- 'l' -> Right (Lib ys)- _ -> Right (Opt str)- _ -> Right (Opt str) -
HROOT.cabal view
@@ -1,19 +1,17 @@-Name: HROOT-Version: 0.8-Synopsis: Haskell binding to ROOT RooFit modules-Description: HROOT is a haskell Foreign Function Interface (FFI) binding to ROOT. ROOT(http://root.cern.ch) is an object-oriented program and library developed by CERN for physics data analysis.+Name: HROOT+Version: 0.9+Synopsis: Haskell binding to the ROOT data analysis framework+Description: HROOT is a haskell Foreign Function Interface (FFI) binding to ROOT. ROOT(http://root.cern.ch) is an object-oriented program and library developed by CERN for physics data analysis. Homepage: http://ianwookim.org/HROOT-License: LGPL-2.1-License-file: LICENSE-Author: Ian-Woo Kim-Maintainer: Ian-Woo Kim <ianwookim@gmail.com>+license: LGPL-2.1+license-file: LICENSE+Author: Ian-Woo Kim+Maintainer: Ian-Woo Kim <ianwookim@gmail.com> Category: Graphics, Statistics, Math, Numerical Tested-with: GHC >= 7.6-Build-Type: Custom+Build-Type: Custom cabal-version: >=1.10-Extra-source-files: - CHANGES- Config.hs+Extra-source-files: @@ -23,20 +21,17 @@ hs-source-dirs: src ghc-options: -Wall -funbox-strict-fields -fno-warn-unused-do-bind -fno-warn-orphans -fno-warn-unused-imports ghc-prof-options: -caf-all -auto-all- Build-Depends: base>4 && < 5, fficxx-runtime >= 0.0.999 ,HROOT-core,HROOT-graf,HROOT-hist,HROOT-math,HROOT-io+ cc-options: -std=c++14+ Build-Depends: base>4 && < 5, fficxx >= 0.3, fficxx-runtime >= 0.3, template-haskell,HROOT-core,HROOT-hist,HROOT-math,HROOT-tree,HROOT-graf,HROOT-io Exposed-Modules: HROOT- + Other-Modules: extra-lib-dirs: extra-libraries: stdc++ - Include-dirs: csrc - Install-includes: -- C-sources: -+ Install-includes: - + C-sources:
src/HROOT.hs view
@@ -3,7 +3,8 @@ , module HROOT.Hist , module HROOT.Graf , module HROOT.IO-, module HROOT.Math +, module HROOT.Math+, module HROOT.Tree ) where import HROOT.Core@@ -11,5 +12,7 @@ import HROOT.Graf import HROOT.IO import HROOT.Math+import HROOT.Tree+