Permalink
Browse files

No more Eiffel.

Ignore-this: 99fa69b041a7dfe4601b3d545bb91d47

Based on Eric Kow patch 3rd Nov 2011.

"Just use the autogenerated (and now manually maintained) Haskell module
instead."

"wxEiffel seems to be a dead project at the time of this patch, so we're not
exactly getting a cross-project reafctor out of this. Having the Eiffel around
just creates the impression of complexity for little gain."

Eric changed the cabal file in a later patch. I have done so here for completeness.

darcs-hash:20120314231028-75908-d04ee10735ae0a8cb79cddff3e149dd43f5ca7a1.gz
  • Loading branch information...
1 parent b00002c commit af2e67fd649fbfb5828e0d861ba6301610b8c0ae @jodonoghue committed Mar 14, 2012
Showing with 0 additions and 3,586 deletions.
  1. +0 −8 wxcore/Setup.hs
  2. +0 −1,158 wxcore/src/eiffel/stc.e
  3. +0 −2,231 wxcore/src/eiffel/wx_defs.e
  4. +0 −186 wxcore/src/eiffel/wxc_defs.e
  5. +0 −3 wxcore/wxcore.cabal
View
@@ -18,12 +18,10 @@ main = defaultMainWithHooks simpleUserHooks { confHook = myConfHook }
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
sourceDirectory :: FilePath
-eiffelDirectory :: FilePath
includeDirectory :: FilePath
wxcoreDirectory :: FilePath
sourceDirectory = "src"
-eiffelDirectory = sourceDirectory </> "eiffel"
includeDirectory = sourceDirectory </> "include"
wxcoreDirectory = sourceDirectory </> "haskell/Graphics/UI/WXCore"
@@ -32,11 +30,6 @@ wxcoreDirectory = sourceDirectory </> "haskell/Graphics/UI/WXCore"
wxcoreIncludeFile :: FilePath
wxcoreIncludeFile = includeDirectory </> "wxc.h"
-eiffelFiles :: [FilePath]
-eiffelFiles =
- map ((<.> "e") . (eiffelDirectory </>)) names
- where
- names = ["wxc_defs", "wx_defs", "stc"]
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
@@ -46,7 +39,6 @@ myConfHook (pkg0, pbi) flags = do
system $ "wxdirect -t --wxc " ++ sourceDirectory ++ " -o " ++ wxcoreDirectory ++ " " ++ wxcoreIncludeFile
system $ "wxdirect -i --wxc " ++ sourceDirectory ++ " -o " ++ wxcoreDirectory ++ " " ++ wxcoreIncludeFile
system $ "wxdirect -c --wxc " ++ sourceDirectory ++ " -o " ++ wxcoreDirectory ++ " " ++ wxcoreIncludeFile
- system $ "wxdirect -d --wxc " ++ sourceDirectory ++ " -o " ++ wxcoreDirectory ++ " " ++ intercalate " " eiffelFiles
-- ver <- fmap (head . drop 1 . splitBy (== '.')) (readProcess "wx-config" ["--version"] "")
let extra_wx_libs = if os == "mingw32"
Oops, something went wrong.

0 comments on commit af2e67f

Please sign in to comment.