Menu
▾
▴
gtk2hs-commit — Mailing list for Darcs commit messages.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(68) |
Aug
(4) |
Sep
|
Oct
(23) |
Nov
(95) |
Dec
(9) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(3) |
Feb
|
Mar
|
Apr
(51) |
May
(81) |
Jun
(2) |
Jul
(86) |
Aug
(143) |
Sep
(3) |
Oct
(31) |
Nov
(63) |
Dec
(90) |
| 2005 |
Jan
(277) |
Feb
(157) |
Mar
(99) |
Apr
(195) |
May
(151) |
Jun
(148) |
Jul
(98) |
Aug
(123) |
Sep
(20) |
Oct
(174) |
Nov
(155) |
Dec
(26) |
| 2006 |
Jan
(51) |
Feb
(19) |
Mar
(16) |
Apr
(12) |
May
(5) |
Jun
|
Jul
(11) |
Aug
(7) |
Sep
(10) |
Oct
(31) |
Nov
(174) |
Dec
(56) |
| 2007 |
Jan
(45) |
Feb
(52) |
Mar
(10) |
Apr
(5) |
May
(47) |
Jun
(16) |
Jul
(80) |
Aug
(29) |
Sep
(14) |
Oct
(59) |
Nov
(46) |
Dec
(16) |
| 2008 |
Jan
(10) |
Feb
(1) |
Mar
|
Apr
|
May
(49) |
Jun
(26) |
Jul
(8) |
Aug
(4) |
Sep
(25) |
Oct
(53) |
Nov
(9) |
Dec
(1) |
| 2009 |
Jan
(66) |
Feb
(11) |
Mar
(1) |
Apr
(14) |
May
(8) |
Jun
(1) |
Jul
(2) |
Aug
(2) |
Sep
(9) |
Oct
(23) |
Nov
(35) |
Dec
|
| 2010 |
Jan
(7) |
Feb
(2) |
Mar
(39) |
Apr
(19) |
May
(161) |
Jun
(19) |
Jul
(32) |
Aug
(65) |
Sep
(113) |
Oct
(120) |
Nov
(2) |
Dec
|
| 2012 |
Jan
|
Feb
(5) |
Mar
(4) |
Apr
(7) |
May
(9) |
Jun
(14) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
(1) |
Nov
(12) |
Dec
(2) |
| 2013 |
Jan
(1) |
Feb
(17) |
Mar
(4) |
Apr
(4) |
May
(9) |
Jun
|
Jul
(8) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Duncan C. <dun...@us...> - 2004-12-08 00:08:46
|
Update of /cvsroot/gtk2hs/gtk2hs/tools/c2hs/chs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16252/tools/c2hs/chs Modified Files: CHS.hs Log Message: Apply a couple of patches that we had in our old c2hs tree to our new one. This makes c2hs understand hierarchical module names and fixes the handling of typedef'ed C types. Also make GConfValue.chs & GConfClient.chs work with our new c2hs. It's not entirely obvious to me if this is an improvement in c2hs or a regression. Index: CHS.hs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/c2hs/chs/CHS.hs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- CHS.hs 21 Nov 2004 21:05:35 -0000 1.1 +++ CHS.hs 8 Dec 2004 00:08:20 -0000 1.2 @@ -755,14 +755,32 @@ parseImport pos toks = do (qual, modid, toks') <- case toks of - CHSTokIdent _ ide :toks -> return (False, ide, toks) - CHSTokQualif _: CHSTokIdent _ ide:toks -> return (True , ide, toks) + CHSTokIdent _ ide :toks -> + let (ide', toks') = rebuildModuleId ide toks + in return (False, ide', toks') + CHSTokQualif _: CHSTokIdent _ ide:toks -> + let (ide', toks') = rebuildModuleId ide toks + in return (True , ide', toks') _ -> syntaxError toks - chi <- loadCHI . identToLexeme $ modid + chi <- loadCHI . moduleNameToFileName . identToLexeme $ modid toks'' <- parseEndHook toks' frags <- parseFrags toks'' return $ CHSHook (CHSImport qual modid chi pos) : frags +-- Qualified module names do not get lexed as a single token so we need to +-- reconstruct it from a sequence of identifer and dot tokens. +-- +rebuildModuleId ide (CHSTokDot _ : CHSTokIdent _ ide' : toks) = + let catIdent ide ide' = onlyPosIdent (posOf ide) --FIXME: unpleasent hack + (identToLexeme ide ++ '.' : identToLexeme ide') + in rebuildModuleId (catIdent ide ide') toks +rebuildModuleId ide toks = (ide, toks) + +moduleNameToFileName :: String -> FilePath +moduleNameToFileName = map dotToSlash + where dotToSlash '.' = '/' + dotToSlash c = c + parseContext :: Position -> [CHSToken] -> CST s [CHSFrag] parseContext pos toks = do (olib , toks'' ) <- parseOptLib toks |
|
From: Duncan C. <dun...@us...> - 2004-12-08 00:08:46
|
Update of /cvsroot/gtk2hs/gtk2hs/gconf/System/Gnome/GConf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16252/gconf/System/Gnome/GConf Modified Files: GConfClient.chs GConfValue.chs Log Message: Apply a couple of patches that we had in our old c2hs tree to our new one. This makes c2hs understand hierarchical module names and fixes the handling of typedef'ed C types. Also make GConfValue.chs & GConfClient.chs work with our new c2hs. It's not entirely obvious to me if this is an improvement in c2hs or a regression. Index: GConfValue.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gconf/System/Gnome/GConf/GConfValue.chs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- GConfValue.chs 8 Aug 2004 19:09:56 -0000 1.3 +++ GConfValue.chs 8 Dec 2004 00:08:21 -0000 1.4 @@ -110,8 +110,8 @@ marshalToGConfValue n = do value <- {# call unsafe gconf_value_new #} (fromIntegral $ fromEnum GconfValueInt) - {# call unsafe gconf_value_set_int #} value (fromIntegral n) - return value + {# call unsafe gconf_value_set_int #} (GConfValue value) (fromIntegral n) + return (GConfValue value) instance GConfValueClass Bool where typeofGConfValue _ = GconfValueBool @@ -119,8 +119,8 @@ marshalToGConfValue b = do value <- {# call unsafe gconf_value_new #} (fromIntegral $ fromEnum GconfValueBool) - {# call unsafe gconf_value_set_bool #} value (fromBool b) - return value + {# call unsafe gconf_value_set_bool #} (GConfValue value) (fromBool b) + return (GConfValue value) instance GConfValueClass Double where typeofGConfValue _ = GconfValueFloat @@ -128,8 +128,8 @@ marshalToGConfValue f = do value <- {# call unsafe gconf_value_new #} (fromIntegral $ fromEnum GconfValueFloat) - {# call unsafe gconf_value_set_float #} value (realToFrac f) - return value + {# call unsafe gconf_value_set_float #} (GConfValue value) (realToFrac f) + return (GConfValue value) -- Now unfortunately String & [a] overlap, although really they don't since Char -- is not an instance of GConfPrimitiveValueClass, however classes are open so @@ -145,8 +145,8 @@ value <- {# call unsafe gconf_value_new #} (fromIntegral $ fromEnum GconfValueString) withCString s $ \strPtr -> - {# call unsafe gconf_value_set_string #} value strPtr - return value + {# call unsafe gconf_value_set_string #} (GConfValue value) strPtr + return (GConfValue value) instance (GConfPrimitiveValueClass a, GConfPrimitiveValueClass b) => GConfValueClass (a,b) where typeofGConfValue _ = GconfValuePair @@ -154,8 +154,8 @@ unsafeMarshalFromGConfValue value = do a <- {# call unsafe gconf_value_get_car #} value b <- {# call unsafe gconf_value_get_cdr #} value - a' <- marshalFromGConfValue a - b' <- marshalFromGConfValue b + a' <- marshalFromGConfValue (GConfValue a) + b' <- marshalFromGConfValue (GConfValue b) return (a',b') marshalToGConfValue (a,b) = do @@ -163,9 +163,9 @@ (fromIntegral $ fromEnum GconfValuePair) a' <- marshalToGConfValue a b' <- marshalToGConfValue b - {# call unsafe gconf_value_set_car_nocopy #} value a' - {# call unsafe gconf_value_set_cdr_nocopy #} value b' - return value + {# call unsafe gconf_value_set_car_nocopy #} (GConfValue value) a' + {# call unsafe gconf_value_set_cdr_nocopy #} (GConfValue value) b' + return (GConfValue value) instance GConfPrimitiveValueClass a => GConfValueClass [a] where @@ -189,10 +189,10 @@ (fromIntegral $ fromEnum GconfValueList) valuesPtrs <- mapM (liftM (\(GConfValue ptr) -> ptr) . marshalToGConfValue) list valuesList <- toGSList valuesPtrs - {# call unsafe gconf_value_set_list_type #} value + {# call unsafe gconf_value_set_list_type #} (GConfValue value) (fromIntegral $ fromEnum $ typeofGConfValue (undefined::a)) - {# call unsafe gconf_value_set_list_nocopy #} value valuesList - return value + {# call unsafe gconf_value_set_list_nocopy #} (GConfValue value) valuesList + return (GConfValue value) ---------------- -- For convenience and best practice, an instance for Enum @@ -273,19 +273,19 @@ (fromIntegral $ fromEnum GconfValueList) valuesPtrs <- mapM (liftM (\(GConfValue ptr) -> ptr) . marshalToGConfValue) as valuesList <- toGSList valuesPtrs - {# call unsafe gconf_value_set_list_type #} value + {# call unsafe gconf_value_set_list_type #} (GConfValue value) (fromIntegral $ fromEnum $ (case as of [] -> GconfValueInvalid --unknown type (a:_) -> gconfValueDynGetType (head as))) - {# call unsafe gconf_value_set_list_nocopy #} value valuesList - return value + {# call unsafe gconf_value_set_list_nocopy #} (GConfValue value) valuesList + return (GConfValue value) unsafeMarshalGConfValueDynPairFromGConfValue :: GConfValue -> IO (GConfValueDyn, GConfValueDyn) unsafeMarshalGConfValueDynPairFromGConfValue value = do a <- {# call unsafe gconf_value_get_car #} value b <- {# call unsafe gconf_value_get_cdr #} value - a' <- marshalFromGConfValue a - b' <- marshalFromGConfValue b + a' <- marshalFromGConfValue (GConfValue a) + b' <- marshalFromGConfValue (GConfValue b) return (a', b') marshalGConfValueDynPairToGConfValue :: (GConfValueDyn, GConfValueDyn) -> IO GConfValue @@ -294,9 +294,9 @@ (fromIntegral $ fromEnum GconfValuePair) a' <- marshalToGConfValue a b' <- marshalToGConfValue b - {# call unsafe gconf_value_set_car_nocopy #} value a' - {# call unsafe gconf_value_set_cdr_nocopy #} value b' - return value + {# call unsafe gconf_value_set_car_nocopy #} (GConfValue value) a' + {# call unsafe gconf_value_set_cdr_nocopy #} (GConfValue value) b' + return (GConfValue value) instance GConfValueClass GConfValueDyn where typeofGConfValue _ = undefined -- will never be used Index: GConfClient.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gconf/System/Gnome/GConf/GConfClient.chs,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- GConfClient.chs 19 Aug 2004 07:54:19 -0000 1.5 +++ GConfClient.chs 8 Dec 2004 00:08:21 -0000 1.6 @@ -222,7 +222,7 @@ keyStrPtr <- {# call unsafe gconf_entry_get_key #} entry valuePtr <- {# call unsafe gconf_entry_get_value #} entry key <- peekUTFString keyStrPtr - value <- marshalFromGConfValue valuePtr + value <- marshalFromGConfValue (GConfValue valuePtr) handler key value gconfNotifyRemove :: GConf -> GConfConnectId -> IO () @@ -241,7 +241,7 @@ value <- propagateGError $ \gerrorPtr -> withCString key $ \strPtr -> {# call gconf_client_get #} gc strPtr gerrorPtr - marshalFromGConfValue value + marshalFromGConfValue (GConfValue value) gconfGetInt :: GConf -> String -> IO Int gconfGetInt = gconfGet @@ -308,7 +308,7 @@ value <- propagateGError $ \gerrorPtr -> withCString key $ \strPtr -> {# call gconf_client_get_without_default #} gc strPtr gerrorPtr - marshalFromGConfValue value + marshalFromGConfValue (GConfValue value) -- | Returns the default value stored in the key's schema, if the key has a -- schema associated and the schema exists and the schema contains a default @@ -321,7 +321,7 @@ value <- propagateGError $ \gerrorPtr -> withCString key $ \strPtr -> {# call gconf_client_get_default_from_schema #} gc strPtr gerrorPtr - marshalFromGConfValue value + marshalFromGConfValue (GConfValue value) -- | Unsets the value of key; if key is already unset, has no effect. An error -- of note is 'GConfOverridden', indicating that the system administrator has @@ -375,7 +375,7 @@ keyStrPtr <- {# call unsafe gconf_entry_get_key #} entry' valuePtr <- {# call unsafe gconf_entry_get_value #} entry' key <- peekUTFString keyStrPtr - value <- marshalFromGConfValue valuePtr + value <- marshalFromGConfValue (GConfValue valuePtr) -- gconf_entry_free is depreciated, use gconf_entry_unref -- however gconf_entry_unref is not documented and docs -- still say to use gconf_entry_free. Confusing. |
|
From: Axel S. <as...@us...> - 2004-12-03 10:13:40
|
Update of /cvsroot/gtk2hs/gtk2hs/demo/unicode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3302 Modified Files: Arabic.hs Log Message: Simplyfied this example for teaching purposes. Index: Arabic.hs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/demo/unicode/Arabic.hs,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Arabic.hs 11 Apr 2003 15:14:06 -0000 1.8 +++ Arabic.hs 3 Dec 2004 10:13:31 -0000 1.9 @@ -8,17 +8,16 @@ initGUI dia <- dialogNew dialogAddButton dia stockYes ResponseYes - noBut <- buttonNewFromStock stockNo - dialogAddActionWidget dia noBut ResponseCancel - widgetShow noBut + dialogAddButton dia stockNo ResponseNo contain <- dialogGetUpper dia theText <- labelNew Nothing labelSetMarkup theText arabic boxPackStartDefaults contain theText - widgetShow theText - noBut `onClicked` yell - dialogRun dia - return () + widgetShowAll dia + res <- dialogRun dia + case res of + ResponseNo -> yell + _ -> return () arabic :: Markup arabic = markSpan [FontSize $ FSPoint 48] $ |
|
From: Jens-Ulrik P. <ju...@us...> - 2004-12-01 16:20:42
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24577 Modified Files: ChangeLog Makefile.am Log Message: * Makefile.am (EXTRA_DIST): Add "tools/checkDirs.sh". Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Makefile.am 1 Dec 2004 15:57:39 -0000 1.14 +++ Makefile.am 1 Dec 2004 16:20:34 -0000 1.15 @@ -23,8 +23,9 @@ tools/callbackGen/Signal.chs-boot1 \ tools/callbackGen/Signal.chs-boot2 \ tools/callbackGen/gtkmarshal.list \ - tools/hierarchyGen/hierarchy.list \ - tools/c2hs/toplevel/c2hs_config.h + tools/checkDirs.sh \ + tools/c2hs/toplevel/c2hs_config.h \ + tools/hierarchyGen/hierarchy.list # fixme: this should be in configure.ac: HSCPP = $(CPP) -x c -traditional-cpp -P Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.241 retrieving revision 1.242 diff -u -d -r1.241 -r1.242 --- ChangeLog 1 Dec 2004 15:57:22 -0000 1.241 +++ ChangeLog 1 Dec 2004 16:20:33 -0000 1.242 @@ -5,6 +5,7 @@ VERSION variable with VERSION file. * Makefile.am (EXTRA_DIST): No longer include VERSION file. + Add "tools/checkDirs.sh". 2004-12-01 Axel Simon <A....@ke...> |
|
From: Jens-Ulrik P. <ju...@us...> - 2004-12-01 15:57:49
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19103 Modified Files: ChangeLog Makefile.am configure.ac Removed Files: VERSION Log Message: remove VERSION file: * configure.ac: Use modern invocation of AC_INIT with name and version. Call AM_INIT_AUTOMAKE without args. No longer override VERSION variable with VERSION file. * Makefile.am (EXTRA_DIST): No longer include VERSION file. Index: configure.ac =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- configure.ac 28 Nov 2004 20:51:43 -0000 1.8 +++ configure.ac 1 Dec 2004 15:57:39 -0000 1.9 @@ -21,8 +21,8 @@ dnl Process this file with autoconf to produce a configure script. dnl ###################################################################### -AC_INIT(VERSION) -AM_INIT_AUTOMAKE(gtk2hs, 0.9.6pre) +AC_INIT(gtk2hs, 0.9.7pre) +AM_INIT_AUTOMAKE dnl * We require autoconf version 2.50 dnl We need 2.50 due to the use of OBJEXT @@ -431,9 +431,6 @@ esac; fi -# Read the version file -VERSION=`cat $TOP/VERSION` - dnl Documentation AC_PATH_PROG(HADDOCK,haddock) --- VERSION DELETED --- Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Makefile.am 1 Dec 2004 13:19:28 -0000 1.13 +++ Makefile.am 1 Dec 2004 15:57:39 -0000 1.14 @@ -19,7 +19,7 @@ tools/c2hs/base/syntax tools/c2hs/base/sysdep tools/c2hs/c \ tools/c2hs/chs tools/c2hs/gen tools/c2hs/state tools/c2hs/toplevel -EXTRA_DIST = VERSION \ +EXTRA_DIST = \ tools/callbackGen/Signal.chs-boot1 \ tools/callbackGen/Signal.chs-boot2 \ tools/callbackGen/gtkmarshal.list \ Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.240 retrieving revision 1.241 diff -u -d -r1.240 -r1.241 --- ChangeLog 1 Dec 2004 13:19:28 -0000 1.240 +++ ChangeLog 1 Dec 2004 15:57:22 -0000 1.241 @@ -1,3 +1,11 @@ +2004-12-02 Jens Petersen <pet...@ha...> + + * configure.ac: Use modern invocation of AC_INIT with name and + version. Call AM_INIT_AUTOMAKE without args. No longer override + VERSION variable with VERSION file. + + * Makefile.am (EXTRA_DIST): No longer include VERSION file. + 2004-12-01 Axel Simon <A....@ke...> * gtk/menuComboToolbar/Toolbar.chs.pp: Removed two slashes that |
|
From: Axel S. <as...@us...> - 2004-12-01 13:19:37
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15526/mk Modified Files: common.mk Log Message: Understand my intention, revert the last commit and fix the real error. Index: common.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- common.mk 1 Dec 2004 10:12:45 -0000 1.38 +++ common.mk 1 Dec 2004 13:19:28 -0000 1.39 @@ -18,7 +18,7 @@ @echo Building for $(NAME) $(strip $(HC) -c $< -o $@ $($(NAME)_HCFLAGS) -i$(VPATH) \ $(addprefix -package ,$($(NAME)_PACKAGEDEPS)) \ - $(addprefix -package-name ,$($(NAME)_PACKAGE)) \ + $(addprefix -package-name ,$(notdir $(basename $($(NAME)_PACKAGE)))) \ $(addprefix '-\#include<,$(addsuffix >',$(CONFIG_H) \ $($(NAME)_HEADER))) \ $(AM_CPPFLAGS) $($(NAME)_CPPFLAGS)) |
|
From: Axel S. <as...@us...> - 2004-12-01 13:19:36
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15526 Modified Files: ChangeLog Makefile.am Log Message: Understand my intention, revert the last commit and fix the real error. Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Makefile.am 1 Dec 2004 10:12:35 -0000 1.12 +++ Makefile.am 1 Dec 2004 13:19:28 -0000 1.13 @@ -175,7 +175,7 @@ libgtk2hs_a_NAME = libgtk2hs.a $(libgtk2hs_a_NAME) : NAME = libgtk2hs_a -libgtk2hs_a_PACKAGE = gtk2hs +libgtk2hs_a_PACKAGE = gtk/gtk2hs.pkg libgtk2hs_a_PACKAGEDEPS = data libgtk2hs_a_HEADER = gtk/gtk.h libgtk2hs_a_PRECOMP = gtk/gtk.precomp Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.239 retrieving revision 1.240 diff -u -d -r1.239 -r1.240 --- ChangeLog 1 Dec 2004 10:12:35 -0000 1.239 +++ ChangeLog 1 Dec 2004 13:19:28 -0000 1.240 @@ -1,11 +1,10 @@ 2004-12-01 Axel Simon <A....@ke...> - * Makefile.am: Renamed the package back to gtk2hs. - * gtk/menuComboToolbar/Toolbar.chs.pp: Removed two slashes that confused haddock. - * mk/common.mk: Removed a bogus variable during linking. + * mk/common.mk: Build the package with the correct name, not the + name of the package file. Removed a bogus variable during linking. 2004-11-28 Axel Simon <A....@ke...> |
|
From: Axel S. <as...@us...> - 2004-12-01 10:13:21
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9242 Modified Files: ChangeLog Makefile.am Log Message: Reverted an over-zealous search and replace. Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile.am 28 Nov 2004 22:17:26 -0000 1.11 +++ Makefile.am 1 Dec 2004 10:12:35 -0000 1.12 @@ -175,7 +175,7 @@ libgtk2hs_a_NAME = libgtk2hs.a $(libgtk2hs_a_NAME) : NAME = libgtk2hs_a -libgtk2hs_a_PACKAGE = gtk/gtk2hs.pkg +libgtk2hs_a_PACKAGE = gtk2hs libgtk2hs_a_PACKAGEDEPS = data libgtk2hs_a_HEADER = gtk/gtk.h libgtk2hs_a_PRECOMP = gtk/gtk.precomp Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.238 retrieving revision 1.239 diff -u -d -r1.238 -r1.239 --- ChangeLog 28 Nov 2004 21:42:34 -0000 1.238 +++ ChangeLog 1 Dec 2004 10:12:35 -0000 1.239 @@ -1,3 +1,12 @@ +2004-12-01 Axel Simon <A....@ke...> + + * Makefile.am: Renamed the package back to gtk2hs. + + * gtk/menuComboToolbar/Toolbar.chs.pp: Removed two slashes that + confused haddock. + + * mk/common.mk: Removed a bogus variable during linking. + 2004-11-28 Axel Simon <A....@ke...> * Makefile.am: Add all _stub.o files as library dependencies. This |
|
From: Axel S. <as...@us...> - 2004-12-01 10:13:11
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9242/mk Modified Files: common.mk Log Message: Reverted an over-zealous search and replace. Index: common.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- common.mk 28 Nov 2004 21:12:24 -0000 1.37 +++ common.mk 1 Dec 2004 10:12:45 -0000 1.38 @@ -12,7 +12,7 @@ LINK = $(strip $(HC) -o $@ $($(NAME)_HCFLAGS) \ $(addprefix -package ,$($(NAME)_PACKAGEDEPS)) \ - $(AM_LDFLAGS) $($(NAME)_EXTRA_LDFLAGS) $($(NAME)_LDFLAGS)) + $(AM_LDFLAGS) $($(NAME)_LDFLAGS)) .hs.o: $(CONFIG_H) @echo Building for $(NAME) @@ -64,8 +64,8 @@ .PHONY: debug debug : @echo VPATH: $(VPATH) - @echo dep files: $(gtk_libgtk2hs_a_CHSFILES_HS:.hs=.dep) - @echo $(gtk_libgtk2hs_a_HSFILES) + @echo hs files: $(libgtk2hs_a_HSFILES) + %.precomp : |
|
From: Axel S. <as...@us...> - 2004-12-01 10:12:54
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/menuComboToolbar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9242/gtk/menuComboToolbar Modified Files: Toolbar.chs.pp Log Message: Reverted an over-zealous search and replace. Index: Toolbar.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/menuComboToolbar/Toolbar.chs.pp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Toolbar.chs.pp 21 Nov 2004 15:06:15 -0000 1.1 +++ Toolbar.chs.pp 1 Dec 2004 10:12:39 -0000 1.2 @@ -43,7 +43,7 @@ -- 'onPopupContextMenu'. -- #ifndef DISABLE_DEPRECATED --- * The following information applies to the /old/ interface only. +-- * The following information applies to the old interface only. -- -- 'Button's, 'RadioButton's and 'ToggleButton's can be added by refering to -- stock images. Their size can be changed by calling 'toolbarSetIconSize'. In |
|
From: Axel S. <as...@us...> - 2004-11-28 22:17:35
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11125 Modified Files: Makefile.am Log Message: Touching a non-existent _stub.o file is not enough. Build an empty one. Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile.am 28 Nov 2004 21:55:11 -0000 1.10 +++ Makefile.am 28 Nov 2004 22:17:26 -0000 1.11 @@ -333,7 +333,8 @@ gtk/treeList/TreeModel_stub.o gtk/general/Signal_stub.o \ gtk/treeList/TreeSelection_stub.o gtk/glib/GObject_stub.o \ gtk/treeList/TreeView_stub.o: - touch $@ + touch $(@:.o=.c) + $(CC) -c -o $@ $(@:.o=.c) am_libgtk2hs_a_OBJECTS = \ |
|
From: Axel S. <as...@us...> - 2004-11-28 22:03:35
|
Update of /cvsroot/gtk2hs/gtk2hs/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7193/tools Modified Files: checkDirs.sh Log Message: Remove spurius i. Index: checkDirs.sh =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/checkDirs.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- checkDirs.sh 28 Nov 2004 20:51:56 -0000 1.1 +++ checkDirs.sh 28 Nov 2004 22:03:21 -0000 1.2 @@ -10,7 +10,7 @@ -L*) DIR=`echo $FLAG | sed "s/-L//"`; if test -d $DIR; then if test -z "`echo $LDFLAGS | grep -e $FLAG`"; then - RES="$RES $FLAG"i; fi; + RES="$RES $FLAG"; fi; fi;; -I*) DIR=`echo $FLAG | sed "s/-I//"`; if test -d $DIR; then |
|
From: Axel S. <as...@us...> - 2004-11-28 21:55:30
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5010 Modified Files: Makefile.am Log Message: If a _stub.o file is not created by GHC, just touch it. The linker will ignore it. Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile.am 28 Nov 2004 21:42:34 -0000 1.9 +++ Makefile.am 28 Nov 2004 21:55:11 -0000 1.10 @@ -326,6 +326,15 @@ gtk/treeList/TreeSelection_stub.o gtk/glib/GObject_stub.o \ gtk/treeList/TreeView_stub.o +# Pretend these stub files can be created by a simple rule. +gtk/abstract/Container_stub.o \ + gtk/multiline/TextIter_stub.o gtk/entry/EntryCompletion_stub.o \ + gtk/multiline/TextTagTable_stub.o gtk/general/General_stub.o \ + gtk/treeList/TreeModel_stub.o gtk/general/Signal_stub.o \ + gtk/treeList/TreeSelection_stub.o gtk/glib/GObject_stub.o \ + gtk/treeList/TreeView_stub.o: + touch $@ + am_libgtk2hs_a_OBJECTS = \ $(addsuffix .$(OBJEXT),$(basename $(basename $(libgtk2hs_a_SOURCES)))) |
|
From: Axel S. <as...@us...> - 2004-11-28 21:42:43
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2136 Modified Files: ChangeLog Makefile.am Log Message: Link in _stub.o files. Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile.am 28 Nov 2004 20:51:43 -0000 1.8 +++ Makefile.am 28 Nov 2004 21:42:34 -0000 1.9 @@ -17,8 +17,7 @@ tools/c2hs/base/general tools/c2hs/base/graphs \ tools/c2hs/base/state tools/c2hs/base/syms \ tools/c2hs/base/syntax tools/c2hs/base/sysdep tools/c2hs/c \ - tools/c2hs/chs tools/c2hs/gen tools/c2hs/lib tools/c2hs/state \ - tools/c2hs/toplevel + tools/c2hs/chs tools/c2hs/gen tools/c2hs/state tools/c2hs/toplevel EXTRA_DIST = VERSION \ tools/callbackGen/Signal.chs-boot1 \ @@ -319,6 +318,15 @@ compat/LocalControl.hs \ compat/LocalData.hs +libgtk2hs_a_LIBADD = \ + gtk/abstract/Container_stub.o \ + gtk/multiline/TextIter_stub.o gtk/entry/EntryCompletion_stub.o \ + gtk/multiline/TextTagTable_stub.o gtk/general/General_stub.o \ + gtk/treeList/TreeModel_stub.o gtk/general/Signal_stub.o \ + gtk/treeList/TreeSelection_stub.o gtk/glib/GObject_stub.o \ + gtk/treeList/TreeView_stub.o + + am_libgtk2hs_a_OBJECTS = \ $(addsuffix .$(OBJEXT),$(basename $(basename $(libgtk2hs_a_SOURCES)))) Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.237 retrieving revision 1.238 diff -u -d -r1.237 -r1.238 --- ChangeLog 28 Nov 2004 20:56:16 -0000 1.237 +++ ChangeLog 28 Nov 2004 21:42:34 -0000 1.238 @@ -1,4 +1,10 @@ 2004-11-28 Axel Simon <A....@ke...> + + * Makefile.am: Add all _stub.o files as library dependencies. This + seems to be enough to link the stub files into the archive. + + * tools/c2hs/base/sysdep/SysDep([GN]HC?|Posix{UN}AVAIL).hs: Tie + SysDep.hs and SysDepPosix.hs directly to the GHC 6 versions. * gtk/gtk2hs.pkg: Package file for gtk2hs. |
|
From: Axel S. <as...@us...> - 2004-11-28 21:20:00
|
Update of /cvsroot/gtk2hs/gtk2hs/tools/c2hs/base/sysdep In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29541 Added Files: SysDep.hs SysDepPosix.hs Removed Files: SysDepGHC3.hs SysDepGHC4.hs SysDepGHC5.hs SysDepGHC6.hs SysDepNHC1.hs SysDepPosixAVAIL.hs SysDepPosixUNAVAIL.hs Log Message: Remove the compatability stuff of c2hs. --- NEW FILE: SysDepPosix.hs --- -- Compiler Toolkit: posix dependent stuff - EMPTY STUB -- -- Author : Manuel M. T. Chakravarty -- Created: 18 August 2000 -- -- Version $Revision: 1.1 $ from $Date: 2004/11/28 21:19:52 $ -- -- Copyright (c) 2000 Manuel M. T. Chakravarty -- -- This file is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This file is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- --- DESCRIPTION --------------------------------------------------------------- -- -- This module provides stub routines for building on a system configuration -- where the `posix' package from HSLibs is not available. -- --- DOCU ---------------------------------------------------------------------- -- -- language: Haskell 98 -- -- * may only import `Config' -- -- Provides the same symbols as `SysDepPosixAVAIL', but without an -- implementation. -- --- TODO ---------------------------------------------------------------------- -- module SysDepPosix ( ProcessID, -- re-exported runPiped ) where import IO (Handle) -- definition doesn't matter as it isn't used anyway -- type ProcessID = () -- Process management -- ------------------ runPiped :: FilePath -- command -> [String] -- arguments -> Maybe [(String, String)] -- environment -> Maybe FilePath -- working directory -> IO (ProcessID,Handle,Handle) -- (child pid, fromChild, toChild) runPiped _ _ _ _ = error "SysDepPosix.runPiped: not supported on this system" --- SysDepGHC3.hs DELETED --- --- SysDepGHC6.hs DELETED --- --- SysDepPosixUNAVAIL.hs DELETED --- --- SysDepNHC1.hs DELETED --- --- SysDepGHC4.hs DELETED --- --- SysDepPosixAVAIL.hs DELETED --- --- NEW FILE: SysDep.hs --- -- Compiler Toolkit: system dependent stuff (GHC 4.x version; x >= 02) -- -- Author : Manuel M. T. Chakravarty -- Derived: 11 March 1999 (from SysDepGHC3.hs) -- -- Version $Revision: 1.1 $ from $Date: 2004/11/28 21:19:52 $ -- -- Copyright (c) [1996..2000] Manuel M. T. Chakravarty -- -- This file is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This file is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- --- DESCRIPTION --------------------------------------------------------------- -- -- This module provides the system dependent routines for building with the -- Glasgow Haskell Compiler (GHC) version 4.x, from x >= 02. -- -- The original definition of `runPiped' is courtesy of Sven Panne -- <Sve...@in...> as distributed on the -- gla...@dc... mailing list as -- <362...@in...>. -- --- DOCU ---------------------------------------------------------------------- -- -- language: Haskell 98 (tested with the low-level interfaces of -- GHC 4.0[2..8] and 5.00) -- -- * may only import `Config' -- -- * has to be compiled with `-syslib exts' -- -- Provided Services -- ----------------- -- -- * IO monad: -- - fixpoint combinator -- -- * Mutable variables and arrays: -- - creation, read & write -- -- * Process management (if provided by `SysDepPosix'): -- - creation of child process connected with pipes -- -- * Tracing primitive -- -- * Unsafe integer cells -- -- Currently, the functionality of `SysDepPosix' is always available when -- compiling with GHC, *except* on cygwin. -- --- TODO ---------------------------------------------------------------------- -- module SysDep ( -- -- for Haskell 1.4/98 compatibility -- ioError, -- -- extra IO functions -- fixIO, -- -- mutable variables and arrays (in IO) -- IORef, newIORef, readIORef, writeIORef, IOArray, newIOArray, boundsIOArray, readIOArray, writeIOArray, -- -- fork -- module SysDepPosix, -- -- tracing -- trace, -- -- UNSAFE stuff -- *Real* Haskell Hackers only!!! -- unsafeNewIntRef, unsafeReadAndIncIntRef ) where import Ix (Ix) import Monad (when) import IOExts (fixIO, unsafePerformIO, IORef, newIORef, readIORef, writeIORef, IOArray, newIOArray, boundsIOArray, readIOArray, writeIOArray, trace) -- other system-dependent components -- import SysDepPosix -- UNSAFE mutable variables -- ------------------------ -- WARNING: The following does not exist, or at least, it belongs to another -- world. And if you believe into the lambda calculus, you don't -- want to know about this other world. -- -- *** DON'T TOUCH NOR USE THIS STUFF *** -- (unless you really know what you are doing!) -- UNSAFELY create a mutable integer (EXPORTED) -- unsafeNewIntRef :: Int -> IORef Int unsafeNewIntRef i = unsafePerformIO (newIORef i) -- UNSAFELY increment a mutable integer and yield its value before the -- increment (EXPORTED) -- unsafeReadAndIncIntRef :: IORef Int -> Int unsafeReadAndIncIntRef mv = unsafePerformIO $ do v <- readIORef mv writeIORef mv (v + 1) return v --- SysDepGHC5.hs DELETED --- |
|
From: Axel S. <as...@us...> - 2004-11-28 21:12:44
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28221/mk Modified Files: common.mk Log Message: Do "depend" if there are more than one Haskell file to compile Index: common.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- common.mk 28 Nov 2004 20:51:44 -0000 1.36 +++ common.mk 28 Nov 2004 21:12:24 -0000 1.37 @@ -33,14 +33,14 @@ .PHONY: depend depend: $($(NAME)_BUILDSOURCES) - $(strip $(if $($(NAME)_BUILDSOURCES),\ + $(if $(word 2,$($(NAME)_HSFILES)),\ $(HC) -M $(addprefix -optdep,-f $(NAME).deps) \ $($(NAME)_HCFLAGS) -i$(VPATH) \ $(addprefix -package ,$($(NAME)_PACKAGEDEPS)) \ $(addprefix '-\#include<,$(addsuffix >',$(CONFIG_H) \ $($(NAME)_HEADER))) \ $(AM_CPPFLAGS) $(EXTRA_CPPFLAGS) $(CPPFLAGS) \ - $($(NAME)_HSFILES))) + $($(NAME)_HSFILES)) .chs.dep : $(CHSDEPEND) -i$(VPATH) $< |
|
From: Axel S. <as...@us...> - 2004-11-28 20:56:25
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25062/gtk Added Files: gtk2hs.pkg.in Log Message: Forgot to add the new package file. --- NEW FILE: gtk2hs.pkg.in --- Package { name = "gtk2hs", auto = False, import_dirs = ["@hidir@"], source_dirs = [], library_dirs = [@GTK_LIBDIR_CQ@], hs_libraries = ["gtk2hs"], extra_libraries = [@GTK_LIBS_CQ@], include_dirs = [@GTK_CFLAGS_CQ@], c_includes = ["gtk/gtk.h"], package_deps = ["data"], extra_ghc_opts = [], extra_cc_opts = [], extra_ld_opts = [@GTK_LIBEXTRA_CQ@] } |
|
From: Axel S. <as...@us...> - 2004-11-28 20:56:25
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25062 Modified Files: ChangeLog Log Message: Forgot to add the new package file. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.236 retrieving revision 1.237 diff -u -d -r1.236 -r1.237 --- ChangeLog 28 Nov 2004 20:51:43 -0000 1.236 +++ ChangeLog 28 Nov 2004 20:56:16 -0000 1.237 @@ -1,4 +1,6 @@ 2004-11-28 Axel Simon <A....@ke...> + + * gtk/gtk2hs.pkg: Package file for gtk2hs. * configure.ac, tools/checkDir.sh: Determine CFLAGS and LDFLAGS for each of the libraries, in particular remove directories that |
|
From: Axel S. <as...@us...> - 2004-11-28 20:52:24
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24106/mk Modified Files: common.mk Removed Files: application.mk config.mk.in library.mk recurse.mk Log Message: Better dependency calculation. GHC packages on install. --- recurse.mk DELETED --- Index: common.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- common.mk 21 Nov 2004 20:54:59 -0000 1.35 +++ common.mk 28 Nov 2004 20:51:44 -0000 1.36 @@ -3,8 +3,9 @@ # A file with CPP "defines" that reflect the current configuration. CONFIG_H = config.h -EMPTY = -SPACE = $(EMPTY) $(EMPTY) +EMPTY := +SPACE := $(EMPTY) $(EMPTY) +COMMA := , VPATH = $(subst $(SPACE),:,$(strip \ $(if $(subst .,,$(srcdir)),$(addprefix $(srcdir)/,$(SOURCEDIRS)), \ $(SOURCEDIRS)))) @@ -14,53 +15,70 @@ $(AM_LDFLAGS) $($(NAME)_EXTRA_LDFLAGS) $($(NAME)_LDFLAGS)) .hs.o: $(CONFIG_H) + @echo Building for $(NAME) $(strip $(HC) -c $< -o $@ $($(NAME)_HCFLAGS) -i$(VPATH) \ $(addprefix -package ,$($(NAME)_PACKAGEDEPS)) \ $(addprefix -package-name ,$($(NAME)_PACKAGE)) \ $(addprefix '-\#include<,$(addsuffix >',$(CONFIG_H) \ $($(NAME)_HEADER))) \ - $(AM_CPPFLAGS) $(EXTRA_CPPFLAGS) $(CPPFLAGS)) + $(AM_CPPFLAGS) $($(NAME)_CPPFLAGS)) .DELETE_ON_ERROR : %.deps %.deps : - touch $@ - $(if $($*_BUILDSOURCES),$(strip \ - $(MAKE) $(AM_MAKEFLAGS) NAME="$*" $($*_BUILDSOURCES) \ - &&))\ - $(strip $(HC) -M $(addprefix -optdep,-f $*.deps) \ - $($*_HCFLAGS) -i$(VPATH) \ - $(addprefix -package ,$($*_PACKAGEDEPS)) \ + @echo Checking if deps up to date for $@ + $(strip if test -f $@; then touch $@; else \ + touch $@; $(MAKE) $(AM_MAKEFLAGS) NAME="$*" depend; fi;) + +.PHONY: depend + +depend: $($(NAME)_BUILDSOURCES) + $(strip $(if $($(NAME)_BUILDSOURCES),\ + $(HC) -M $(addprefix -optdep,-f $(NAME).deps) \ + $($(NAME)_HCFLAGS) -i$(VPATH) \ + $(addprefix -package ,$($(NAME)_PACKAGEDEPS)) \ $(addprefix '-\#include<,$(addsuffix >',$(CONFIG_H) \ - $($*_HEADER))) \ + $($(NAME)_HEADER))) \ $(AM_CPPFLAGS) $(EXTRA_CPPFLAGS) $(CPPFLAGS) \ - $($*_HSFILES)) + $($(NAME)_HSFILES))) .chs.dep : - @if test -f $@; then touch $@; else $(CHSDEPEND) -i$(VPATH) $<; fi; + $(CHSDEPEND) -i$(VPATH) $< +.hs.chi : + @: .o.hi: @: +# The cheeky rule for .hi files says that .hi files can be created as +# side-effect of generating a .o file. Make sure the .hi files are not +# deleted as normal intermediate files are. +.PRECIOUS: %.hi + +# Same for .chi +.PRECIOUS: %.chi + HSTOOLFLAGS = -H500m .PHONY: debug debug : @echo VPATH: $(VPATH) @echo dep files: $(gtk_libgtk2hs_a_CHSFILES_HS:.hs=.dep) + @echo $(gtk_libgtk2hs_a_HSFILES) + %.precomp : $(strip $(C2HS) $(C2HS_FLAGS) \ +RTS $(HSTOOLFLAGS) $(PROFFLAGS) -RTS \ - $(addprefix -C,$(CFLAGS) $(CPPFLAGS)) \ + $(addprefix -C,$($(NAME)_CFLAGS) $($(NAME)_CPPFLAGS)) \ --precomp=$($(NAME)_PRECOMP) $($(NAME)_HEADER)) .chs.pp.chs: $(CONFIG_H) + echo Preprocessing for $(NAME) $(strip $(HSCPP) $(AM_CPPFLAGS) \ - $(EXTRA_CPPFLAGS) $(CPPFLAGS) \ - $(EXTRA_CFLAGS) $(CFLAGS) \ - $(addprefix -include ,$(CONFIG_H) $($(NAME)_EXTRA_HFILES)) \ + $(if $(NAME),$($(NAME)_CPPFLAGS) $($(NAME)_CFLAGS),$(CPPFLAGS)) \ + $(addprefix -include ,$(CONFIG_H)) \ $< -o $@) .hsc.hs: $(CONFIG_H) @@ -68,13 +86,14 @@ $(addprefix -L-optl,\ $(AM_LDFLAGS) $($(NAME)_EXTRA_LIBS) $($(NAME)_LIBS)) \ $(addprefix -C, $(filter-out -I%,$(AM_CPPFLAGS)) \ - $(EXTRA_CFLAGS) $(CFLAGS))\ + $($(NAME)_CFLAGS))\ $(filter -I%,$(AM_CPPFLAGS)) \ - $(EXTRA_CPPFLAGS) $(CPPFLAGS)\ + $($(NAME)_CPPFLAGS)\ --include $(CONFIG_H) \ --cc=$(HC) --lflag=-no-hs-main $<) .chs.hs: + @echo Building .hs file for $(NAME) $(if $(subst no,,$(BUILT_IN_C2HS)),$(strip \ if test -x $(C2HS); then :; else \ $(MAKE) $(AM_MAKEFLAGS) NAME="tools_c2hs_c2hsLocal" \ @@ -87,3 +106,25 @@ $(CHSDEPEND) -i$(VPATH) $< +# installation of packages + +getVar = $($(subst .,_,$(subst /,_,$(1)))_$(2)) + +install-data-hook : + $(if $(PKGCONF),if test -f $(PKGCONF); then :; \ + else echo "[]" > $(PKGCONF); fi;) + $(foreach pkgname,$(lib_LIBRARIES), \ + $(GHCPKG) $(addprefix -f ,$(PKGCONF)) -a -g \ + -Dprefix=$(prefix) -Dexec_prefix=$(exec_prefix) \ + -i $(call getVar,$(pkgname),PACKAGE)) + +uninstall-hook : + $(foreach pkgname,$(lib_LIBRARIES), \ + if test -f $(PKGCONF); then \ + $(GHCPKG) $(addprefix -f ,$(PKGCONF)) \ + -r $(patsubst lib%,%,$(basename $(notdir $(pkgname)))); \ + $(if $(PKGCONF),\ + if test -n `head $(PKGCONF) | $(GREP) -e "\[\]"`; then \ + $(RM) $(PKGCONF) $(PKGCONF).old; fi;) \ + fi;) + --- config.mk.in DELETED --- --- application.mk DELETED --- --- library.mk DELETED --- |
|
From: Axel S. <as...@us...> - 2004-11-28 20:52:23
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24106 Modified Files: ChangeLog Makefile.am configure.ac Log Message: Better dependency calculation. GHC packages on install. Index: configure.ac =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- configure.ac 26 Nov 2004 15:08:09 -0000 1.7 +++ configure.ac 28 Nov 2004 20:51:43 -0000 1.8 @@ -22,7 +22,7 @@ dnl ###################################################################### AC_INIT(VERSION) -AM_INIT_AUTOMAKE(gtk2hs, 0.9.9) +AM_INIT_AUTOMAKE(gtk2hs, 0.9.6pre) dnl * We require autoconf version 2.50 dnl We need 2.50 due to the use of OBJEXT @@ -189,24 +189,15 @@ AC_MSG_ERROR([ghc-pkg not found. (But ghc exists!?)]); fi -dnl Determine how to list local packages with ghc-pkg. -GHCPKG_LISTLOCAL="-l"; -GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -ge, 6.00.0, [GHCPKG_LISTLOCAL="-L"]) - dnl Optimise Haskell by default and give sufficient space. if test -z "$HCFLAGS"; then HCFLAGS=" -O -H180m " fi - -dnl Due to the interdependencies between the different packages we need to -dnl install one package before we can compile the next one. We do this by -dnl using a local package file called localpackage.conf in the toplevel -dnl directory. The user may specify an alternative file and using the complete -dnl suite in-place. +dnl Check whether to use a local package file. AC_ARG_WITH(pkgconf, - [ --with-pkgconf=pkg.conf use another package.conf file for building in-place], - [LOCALPKGCONF=$withval],[LOCALPKGCONF='$(TOP)/localpackage.conf']) + [ --with-pkgconf=FILE GHC package file to install packages], + [PKGCONF=$withval;],[PKGCONF=;]) dnl Check for pkg-config which holds information about all Gtk related dnl libraries. @@ -281,81 +272,52 @@ dnl The configuration program for GTK is kind of stupid in that it dnl lists directories which don't exist. ghc-pkg in ghc 5.04 or greater dnl does not like that, so we need to filter out non-existent directories. -TMPGTK_CFLAGS=$GTK_CFLAGS; -GTK_CFLAGS=; -for FLAG in $TMPGTK_CFLAGS; do - case $FLAG in - -I*) DIR=`echo $FLAG | $SED "s/-I//"`; - if test -d $DIR; then GTK_CFLAGS="$GTK_CFLAGS -I$DIR"; fi;; - *) GTK_CFLAGS="$GTK_CFLAGS $FLAG";; - esac; -done; -TMPGTK_LIBS=$GTK_LIBS; -GTK_LIBS=; -for FLAG in $TMPGTK_LIBS; do - case $FLAG in - -L*) DIR=`echo $FLAG | $SED "s/-L//"`; - if test -d $DIR; then GTK_LIBS="$GTK_LIBS -L$DIR"; fi;; - *) GTK_LIBS="$GTK_LIBS $FLAG";; - esac; -done; +dnl Furthermore we remove all libraries and directories for packages that +dnl built on top of gtk so that they don't appear several times on the +dnl command line. +GTK_CFLAGS=`tools/checkDirs.sh $GTK_CFLAGS`; +GTK_LIBS=`tools/checkDirs.sh $GTK_LIBS`; +SOURCEVIEW_CFLAGS=`CFLAGS="$GTK_CFLAGS" tools/checkDirs.sh $SOURCEVIEW_CFLAGS`; +SOURCEVIEW_LIBS=`LDFLAGS="$GTK_LIBS" tools/checkDirs.sh $SOURCEVIEW_LIBS`; +LIBGLADE_CFLAGS=`CFLAGS="$GTK_CFLAGS" tools/checkDirs.sh $LIBGLADE_CFLAGS`; +LIBGLADE_LIBS=`LDFLAGS="$GTK_LIBS" tools/checkDirs.sh $LIBGLADE_LIBS`; +GCONF_CFLAGS=`CFLAGS="$GTK_CFLAGS" tools/checkDirs.sh $GCONF_CFLAGS`; +GCONF_LIBS=`LDFLAGS="$GTK_LIBS" tools/checkDirs.sh $GCONF_LIBS`; -TMPSOURCEVIEW_CFLAGS=$SOURCEVIEW_CFLAGS; -SOURCEVIEW_CFLAGS=; -for FLAG in $TMPSOURCEVIEW_CFLAGS; do - case $FLAG in - -I*) DIR=`echo $FLAG | $SED "s/-I//"`; - if test -d $DIR; then SOURCEVIEW_CFLAGS="$SOURCEVIEW_CFLAGS -I$DIR"; fi;; - *) SOURCEVIEW_CFLAGS="$SOURCEVIEW_CFLAGS $FLAG";; - esac; -done; -TMPSOURCEVIEW_LIBS=$SOURCEVIEW_LIBS; -SOURCEVIEW_LIBS=; -for FLAG in $TMPSOURCEVIEW_LIBS; do - case $FLAG in - -L*) DIR=`echo $FLAG | $SED "s/-L//"`; - if test -d $DIR; then SOURCEVIEW_LIBS="$SOURCEVIEW_LIBS -L$DIR"; fi;; - *) SOURCEVIEW_LIBS="$SOURCEVIEW_LIBS $FLAG";; - esac; -done; +dnl Fix for ghc-pkg in that it doesn't differ between paths to extra +dnl libraries and paths to Haskell libraries. We have to append the +dnl path to where the Haskell libraries are going to be installed in +dnl case they go into a non-standard directory. If they go into a +dnl standard directory then we duplicate a path here. Dough. +GTK_LIBS="$GTK_LIBS -L$libdir"; -TMPLIBGLADE_CFLAGS=$LIBGLADE_CFLAGS; -LIBGLADE_CFLAGS=; -for FLAG in $TMPLIBGLADE_CFLAGS; do +dnl Change the representation of these flags to "flag1","flag2". The +dnl letters CQ stand for Comma, Quote. +C=; GTK_CFLAGS_CQ=; +for FLAG in $GTK_CFLAGS; do case $FLAG in - -I*) DIR=`echo $FLAG | $SED "s/-I//"`; - if test -d $DIR; then LIBGLADE_CFLAGS="$LIBGLADE_CFLAGS -I$DIR"; fi;; - *) LIBGLADE_CFLAGS="$LIBGLADE_CFLAGS $FLAG";; + -I*) TMP=${FLAG#-I}; + GTK_CFLAGS_CQ="$GTK_CFLAGS_CQ$C\"$TMP\""; C=",";; esac; done; -TMPLIBGLADE_LIBS=$LIBGLADE_LIBS; -LIBGLADE_LIBS=; -for FLAG in $TMPLIBGLADE_LIBS; do +AC_SUBST(GTK_CFLAGS_CQ) +C_LIBS=; GTK_LIBS_CQ=; C_LDIR=; GTK_LIBDIR_CQ=; C_XTRA=; GTK_LIBEXTRA_CQ=; +for FLAG in $GTK_LIBS; do case $FLAG in - -L*) DIR=`echo $FLAG | $SED "s/-L//"`; - if test -d $DIR; then LIBGLADE_LIBS="$LIBGLADE_LIBS -L$DIR"; fi;; - *) LIBGLADE_LIBS="$LIBGLADE_LIBS $FLAG";; + -l*) GTK_LIBS_CQ="$GTK_LIBS_CQ$C_LIBS\"${FLAG#-l}\""; C_LIBS=",";; + -L*) GTK_LIBDIR_CQ="$GTK_LIBDIR_CQ$C_LDIR\"${FLAG#-L}\""; C_LDIR=",";; + *) GTK_LIBEXTRA_CQ="$GTK_LIBEXTRA_CQ$C_XTRA\"$FLAG\""; C_XTRA=",";; esac; done; +AC_SUBST(GTK_LIBS_CQ) +AC_SUBST(GTK_LIBDIR_CQ) +AC_SUBST(GTK_LIBEXTRA_CQ) -TMPGCONF_CFLAGS=$GCONF_CFLAGS; -GCONF_CFLAGS=; -for FLAG in $TMPGCONF_CFLAGS; do - case $FLAG in - -I*) DIR=`echo $FLAG | $SED "s/-I//"`; - if test -d $DIR; then GCONF_CFLAGS="$GCONF_CFLAGS -I$DIR"; fi;; - *) GCONF_CFLAGS="$GCONF_CFLAGS $FLAG";; - esac; -done; -TMPGCONF_LIBS=$GCONF_LIBS; -GCONF_LIBS=; -for FLAG in $TMPGCONF_LIBS; do - case $FLAG in - -L*) DIR=`echo $FLAG | $SED "s/-L//"`; - if test -d $DIR; then GCONF_LIBS="$GCONF_LIBS -L$DIR"; fi;; - *) GCONF_LIBS="$GCONF_LIBS $FLAG";; - esac; -done; +AC_ARG_WITH(hidir, + [ --with-hidir=DIR specify install dir for .hi files], + [hidir=$withval], + [hidir=$libdir/hi]) +AC_SUBST(hidir) dnl Check if user wants bindings for deprecated APIs. Defaults to yes. AC_MSG_CHECKING([whether to build deprecated bindings]) @@ -486,7 +448,7 @@ AC_SUBST(MULTIPLE_CHS) AC_SUBST(FOUR_WORD_CALLBACK) AC_SUBST(GHCPKG_LISTLOCAL) -AC_SUBST(LOCALPKGCONF) +AC_SUBST(PKGCONF) AC_SUBST(HCFLAGS) AC_SUBST(C2HS) AC_SUBST(MARSHALLDEFS) @@ -543,9 +505,8 @@ tools/c2hs/toplevel/C2HSConfig.hs gtk2hs.spec mk/chsDepend - mk/config.mk -], - [chmod a+x mk/chsDepend && chmod a+x install-sh]) + gtk/gtk2hs.pkg], + [chmod a+x mk/chsDepend && chmod a+x install-sh]) dnl ...and chat with the user echo "**************************************************" Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile.am 26 Nov 2004 15:08:09 -0000 1.7 +++ Makefile.am 28 Nov 2004 20:51:43 -0000 1.8 @@ -3,23 +3,8 @@ MOSTLYCLEANFILES = CLEANFILES = DISTCLEANFILES = *.precomp - -# Before chaning anything on dependency calculation: -# - Note that the initial dependencies are computed when make checks if -# the include files are up to date. -# - CFLAGS and CPPFLAGS are not package/application specific. This is due -# to the initial dependency calculation where it is not clear which -# package a particular file belongs to. But the CPPFLAGS are needed for -# the .chs.pp rule which runs files through the pre-processor. -# - Dependencies between Haskell .hs modules are stored in -# .deps/<pkg-name>.deps . To calculate these dependencies, c2hs must be -# run on the .chs and the header file belonging to the package to which -# the .chs file belongs to. But since the dependencies for a package are -# stored in a file with the package's name, set the NAME variable to the -# file name of the target .deps/<pkg-name>.deps and then run c2hs. - -CFLAGS = $(filter-out -I%,$(GTK_CFLAGS)) -CPPFLAGS = $(filter -I%,$(GTK_CFLAGS)) +CPPFLAGS+= $(GTK_CFLAGS) $(SOURCEVIEW_CFLAGS) $(LIBGLADE_CFLAGS) \ + $(GCONF_CFLAGS) # Build c2hs before anything else. @@ -50,7 +35,7 @@ HSC = hsc2hs # all packages and applications -lib_LIBRARIES = gtk/libgtk2hs.a +lib_LIBRARIES = libgtk2hs.a noinst_PROGRAMS = \ tools/hierarchyGen/TypeGenerator \ tools/callbackGen/HookGenerator \ @@ -188,19 +173,19 @@ -include tools_c2hs_c2hsLocal.deps # gtk2hs GUI library -gtk_libgtk2hs_a_NAME = gtk/libgtk2hs.a -$(gtk_libgtk2hs_a_NAME) : NAME = gtk_libgtk2hs_a +libgtk2hs_a_NAME = libgtk2hs.a +$(libgtk2hs_a_NAME) : NAME = libgtk2hs_a -gtk_libgtk2hs_a : tools/c2hs/c2hs -gtk_libgtk2hs_a_PACKAGECONF = libgtk2hs.conf -gtk_libgtk2hs_a_PACKAGE = gtk2hs -gtk_libgtk2hs_a_PACKAGEDEPS = data -gtk_libgtk2hs_a_HEADER = gtk/gtk.h -gtk_libgtk2hs_a_PRECOMP = gtk/gtk.precomp -gtk_libgtk2hs_a_LIBS = @GTK_LIBS@ -gtk_libgtk2hs_a_HCFLAGS = -fglasgow-exts +libgtk2hs_a_PACKAGE = gtk/gtk2hs.pkg +libgtk2hs_a_PACKAGEDEPS = data +libgtk2hs_a_HEADER = gtk/gtk.h +libgtk2hs_a_PRECOMP = gtk/gtk.precomp +libgtk2hs_a_LIBS = @GTK_LIBS@ +libgtk2hs_a_HCFLAGS = -fglasgow-exts +libgtk2hs_a_CFLAGS = $(filter-out -I%,$(GTK_CFLAGS)) +libgtk2hs_a_CPPFLAGS = $(filter -I%,$(GTK_CFLAGS)) -gtk_libgtk2hs_a_SOURCES = \ +libgtk2hs_a_SOURCES = \ gtk/general/Hierarchy.chs \ gtk/general/Signal.chs \ gtk/glib/GValue.chs \ @@ -334,33 +319,35 @@ compat/LocalControl.hs \ compat/LocalData.hs -am_gtk_libgtk2hs_a_OBJECTS = \ - $(addsuffix .$(OBJEXT),$(basename $(basename $(gtk_libgtk2hs_a_SOURCES)))) +am_libgtk2hs_a_OBJECTS = \ + $(addsuffix .$(OBJEXT),$(basename $(basename $(libgtk2hs_a_SOURCES)))) -gtk_libgtk2hs_a_CHSPPFILES = $(filter %.chs.pp,$(gtk_libgtk2hs_a_SOURCES)) -gtk_libgtk2hs_a_CHSFILES = \ - $(filter %.chs,$(gtk_libgtk2hs_a_SOURCES:.chs.pp=.chs)) -gtk_libgtk2hs_a_CHSFILES_HS = $(gtk_libgtk2hs_a_CHSFILES:.chs=.hs) -gtk_libgtk2hs_a_HSCFILES = $(filter %.hsc, $(gtk_libgtk2hs_a_SOURCES)) -gtk_libgtk2hs_a_HSCFILES_HS = $(gtk_libgtk2hs_a_HSCFILES:.hsc=.hs) -gtk_libgtk2hs_a_BUILDSOURCES = \ - $(gtk_libgtk2hs_a_CHSPPFILES:.chs.pp=.chs) \ - $(gtk_libgtk2hs_a_CHSFILES_HS) \ - $(gtk_libgtk2hs_a_HSCFILES_HS) -gtk_libgtk2hs_a_HSFILES = \ - $(filter %.hs,$(gtk_libgtk2hs_a_BUILDSOURCES)) \ - $(filter %.hs,$(gtk_libgtk2hs_a_SOURCES)) -.PRECIOUS: $(gtk_libgtk2hs_a_HSFILES:.hs=hi) +libgtk2hs_a_CHSPPFILES = $(filter %.chs.pp,$(libgtk2hs_a_SOURCES)) +libgtk2hs_a_CHSFILES = \ + $(filter %.chs,$(libgtk2hs_a_SOURCES:.chs.pp=.chs)) +libgtk2hs_a_CHSFILES_HS = $(libgtk2hs_a_CHSFILES:.chs=.hs) +libgtk2hs_a_HSCFILES = $(filter %.hsc, $(libgtk2hs_a_SOURCES)) +libgtk2hs_a_HSCFILES_HS = $(libgtk2hs_a_HSCFILES:.hsc=.hs) +libgtk2hs_a_BUILDSOURCES = \ + $(libgtk2hs_a_CHSPPFILES:.chs.pp=.chs) \ + $(libgtk2hs_a_CHSFILES_HS) \ + $(libgtk2hs_a_HSCFILES_HS) +libgtk2hs_a_HSFILES = \ + $(filter %.hs,$(libgtk2hs_a_BUILDSOURCES)) \ + $(filter %.hs,$(libgtk2hs_a_SOURCES)) -MOSTLYCLEANFILES+ = $(am_gtk_libgtk2hs_a_OBJECTS) -MOSTLYCLEANFILES+ = $(gtk_libgtk2hs_a_HSFILES:.hs=.hi) -CLEANFILES+= $(gtk_libgtk2hs_a_BUILDSOURCES) +# add prefix nobase_ when changing to hierarchical module namespace +hi_SCRIPTS = $(libgtk2hs_a_HSFILES:.hs=.hi) -DISTCLEANFILES+= gtk_libgtk2hs_a.deps $(gtk_libgtk2hs_a_CHSFILES_HS:.hs=.dep) --include gtk_libgtk2hs_a.deps $(gtk_libgtk2hs_a_CHSFILES_HS:.hs=.dep) +MOSTLYCLEANFILES+ = $(am_libgtk2hs_a_OBJECTS) +MOSTLYCLEANFILES+ = $(libgtk2hs_a_HSFILES:.hs=.hi) +CLEANFILES+= $(libgtk2hs_a_BUILDSOURCES) + +DISTCLEANFILES+= libgtk2hs_a.deps $(libgtk2hs_a_CHSFILES_HS:.hs=.dep) +-include libgtk2hs_a.deps $(libgtk2hs_a_CHSFILES_HS:.hs=.dep) # All generated source files go here. -BUILDSOURCES = $(gtk_libgtk2hs_a_BUILDSOURCES) +BUILDSOURCES = $(libgtk2hs_a_BUILDSOURCES) include mk/common.mk Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.235 retrieving revision 1.236 diff -u -d -r1.235 -r1.236 --- ChangeLog 26 Nov 2004 15:08:09 -0000 1.235 +++ ChangeLog 28 Nov 2004 20:51:43 -0000 1.236 @@ -1,3 +1,22 @@ +2004-11-28 Axel Simon <A....@ke...> + + * configure.ac, tools/checkDir.sh: Determine CFLAGS and LDFLAGS + for each of the libraries, in particular remove directories that + are already present in Gtk from more derived libraries. + + * Makefile.am, mk/common.mk: Add a new goal for calculating + dependencies for Haskell files. This new target allows the + recursive invocation with the name of the library/application for + which dependencies are generated. This allows for choosing the + correct CFLAGS for doing pre-processing. Furthermore, fixed the + installation of a package. + + * mk/applicatoin.mk, config.mk.in, library.mk, recurse.mk: Remove. + +2004-11-26 Axel Simon <A....@ke...> + + * configure.ac: Changed AC_CONFIG_HEADERS to AM_CONFIG_HEADER. + 2004-11-26 Jens Petersen <pet...@ha...> * Makefile.am (EXTRA_DIST): Include Signal.chs-boot*, |
|
From: Axel S. <as...@us...> - 2004-11-28 20:52:06
|
Update of /cvsroot/gtk2hs/gtk2hs/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24106/tools Added Files: checkDirs.sh Log Message: Better dependency calculation. GHC packages on install. --- NEW FILE: checkDirs.sh --- #!/bin/sh # Return only flags that refer to existing directories and those # that are not yet in CFLAGS or LDFLAGS. # Usage: # ./checkDirs.sh {-I<dir1> | -L<dir2> | <flag>} # RES=; for FLAG in $@; do case $FLAG in -L*) DIR=`echo $FLAG | sed "s/-L//"`; if test -d $DIR; then if test -z "`echo $LDFLAGS | grep -e $FLAG`"; then RES="$RES $FLAG"i; fi; fi;; -I*) DIR=`echo $FLAG | sed "s/-I//"`; if test -d $DIR; then if test -z "`echo $CFLAGS | grep -e $FLAG`"; then RES="$RES $FLAG"; fi; fi;; *) if test -z "`echo $CFLAGS $LDFLAGS | grep -e $FLAG`"; then RES="$RES $FLAG"; fi;; esac; done; echo $RES; |
|
From: Jens-Ulrik P. <ju...@us...> - 2004-11-26 15:08:25
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4281 Modified Files: ChangeLog Makefile.am configure.ac Log Message: * Makefile.am (EXTRA_DIST): Include Signal.chs-boot*, gtkmarshal.list, hierarchy.list and c2hs_config.h in tarball. * configure.ac: Output mk/config.mk. * tools/c2hs/toplevel/Main.hs: Fix spelling of finish. Index: configure.ac =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- configure.ac 26 Nov 2004 09:10:30 -0000 1.6 +++ configure.ac 26 Nov 2004 15:08:09 -0000 1.7 @@ -542,7 +542,9 @@ AC_OUTPUT([ tools/c2hs/toplevel/C2HSConfig.hs gtk2hs.spec - mk/chsDepend], + mk/chsDepend + mk/config.mk +], [chmod a+x mk/chsDepend && chmod a+x install-sh]) dnl ...and chat with the user Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile.am 21 Nov 2004 20:54:58 -0000 1.6 +++ Makefile.am 26 Nov 2004 15:08:09 -0000 1.7 @@ -35,6 +35,13 @@ tools/c2hs/chs tools/c2hs/gen tools/c2hs/lib tools/c2hs/state \ tools/c2hs/toplevel +EXTRA_DIST = VERSION \ + tools/callbackGen/Signal.chs-boot1 \ + tools/callbackGen/Signal.chs-boot2 \ + tools/callbackGen/gtkmarshal.list \ + tools/hierarchyGen/hierarchy.list \ + tools/c2hs/toplevel/c2hs_config.h + # fixme: this should be in configure.ac: HSCPP = $(CPP) -x c -traditional-cpp -P Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.234 retrieving revision 1.235 diff -u -d -r1.234 -r1.235 --- ChangeLog 21 Nov 2004 20:54:58 -0000 1.234 +++ ChangeLog 26 Nov 2004 15:08:09 -0000 1.235 @@ -1,3 +1,12 @@ +2004-11-26 Jens Petersen <pet...@ha...> + + * Makefile.am (EXTRA_DIST): Include Signal.chs-boot*, + gtkmarshal.list, hierarchy.list and c2hs_config.h in tarball. + + * configure.ac: Output mk/config.mk. + + * tools/c2hs/toplevel/Main.hs: Fix spelling of finish. + 2004-11-21 Axel Simon <A....@ke...> * Makefile.am, tools/c2hs/gen/GenBind.hs, |
|
From: Jens-Ulrik P. <ju...@us...> - 2004-11-26 15:08:20
|
Update of /cvsroot/gtk2hs/gtk2hs/tools/c2hs/toplevel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4281/tools/c2hs/toplevel Modified Files: Main.hs Log Message: * Makefile.am (EXTRA_DIST): Include Signal.chs-boot*, gtkmarshal.list, hierarchy.list and c2hs_config.h in tarball. * configure.ac: Output mk/config.mk. * tools/c2hs/toplevel/Main.hs: Fix spelling of finish. Index: Main.hs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/c2hs/toplevel/Main.hs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Main.hs 21 Nov 2004 21:05:42 -0000 1.1 +++ Main.hs 26 Nov 2004 15:08:10 -0000 1.2 @@ -645,7 +645,7 @@ -- save the attributed C to disk -- liftIO $ putBinFileWithDict preCompFile (WithNameSupply cheader) - printElapsedTime "finnished serialising header" + printElapsedTime "finished serialising header" -- -- remove the pre-processed header -- @@ -653,7 +653,7 @@ unless keep $ removeFileCIO preprocFile - printElapsedTime "finnish" + printElapsedTime "finish" return () where tracePreproc cmd = putTraceStr tracePhasesSW $ @@ -700,7 +700,7 @@ dumpCHI hsFile chi -- different suffix will be appended -- CHS file did not contain C declarations, so return False - printElapsedTime "finnish" + printElapsedTime "finish" return False where traceCHSDump mod = do |
|
From: Axel S. <as...@us...> - 2004-11-26 09:10:40
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29389 Modified Files: configure.ac Log Message: Changed AC_CONFIG_HEADERS to AM_CONFIG_HEADER. Index: configure.ac =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- configure.ac 21 Nov 2004 20:54:58 -0000 1.5 +++ configure.ac 26 Nov 2004 09:10:30 -0000 1.6 @@ -31,7 +31,7 @@ dnl Check system type. AC_CANONICAL_HOST -AC_CONFIG_HEADERS(config.h) +AM_CONFIG_HEADER(config.h) AH_TOP([#include<gtk/gtkversion.h>]) dnl Checks for programs. |
|
From: Jens-Ulrik P. <ju...@us...> - 2004-11-25 12:33:56
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14082 Modified Files: INSTALL Log Message: fix typo: patch -> path Index: INSTALL =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/INSTALL,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- INSTALL 16 Nov 2003 13:37:53 -0000 1.7 +++ INSTALL 25 Nov 2004 12:33:46 -0000 1.8 @@ -39,7 +39,7 @@ --with-c2hs=yes Search for a c2hs installation in the current PATH. ---with-c2hs=<patch to your c2hs-config> +--with-c2hs=<path to your c2hs-config> Use this specific installation of c2hs. Make sure you specify the c2hs-config program, not c2hs itself. |
2 messages has been excluded from this view by a project administrator.
