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-18 20:46:45
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21432/mk Modified Files: chsDepend.in Log Message: make chsDepend understand hierarchical modules names and change the dependency of .hs files to be on the .chi files rather than the .chs files. This is how it is done for .o and .hs files, that is, the .o file depends on the .hi files. Index: chsDepend.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/chsDepend.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- chsDepend.in 21 Nov 2004 15:06:16 -0000 1.8 +++ chsDepend.in 18 Dec 2004 20:46:29 -0000 1.9 @@ -24,7 +24,7 @@ FULLNAMEDEP=`echo "$FULLNAME" | $SED 's/\.chs/.dep/'`; FULLNAMEHS=`echo "$FULLNAME" | $SED 's/\.chs/.hs/'`; if test -f "$FULLNAME"; then - DEPS=`$GREP "{#import" $FULLNAME 2> /dev/null | $SED 's/^{#import \([a-zA-Z1-9]*\)#}.*/\1.chs/'`; + DEPS=`$GREP "{#import" $FULLNAME 2> /dev/null | $SED 'y/./\//;s/^{#import \([a-zA-Z1-9/]*\)#}.*/\1/'`; #echo Looking for dependent files: $DEPS DEPNAMES=; for DEP in $DEPS; do @@ -32,9 +32,9 @@ for DEPDIR in $SEARCHPATH; do DEPNAME=`echo "$DEPDIR/$DEP" | $SED 's%\.//*%%'`; #echo Looking for $DEP in $DEPDIR , i.e.: $DEPNAME - if test -f "$DEPNAME"; then + if test -f "$DEPNAME.chs"; then #echo Found $DEP in $DEPDIR - DEPNAMES="$DEPNAMES $DEPNAME"; + DEPNAMES="$DEPNAMES $DEPNAME.chi"; break; fi; done; |
|
From: Duncan C. <dun...@us...> - 2004-12-18 20:46:02
|
Update of /cvsroot/gtk2hs/gtk2hs/mozembed/Graphics/UI/Gtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21289/mozembed/Graphics/UI/Gtk Modified Files: MozEmbed.chs Log Message: tidy up module header Index: MozEmbed.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mozembed/Graphics/UI/Gtk/MozEmbed.chs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- MozEmbed.chs 17 Dec 2004 21:21:44 -0000 1.1 +++ MozEmbed.chs 18 Dec 2004 20:45:50 -0000 1.2 @@ -1,7 +1,8 @@ --- |GIMP Toolkit (GTK) Binding for Haskell: widget embedding the -*-haskell-*- --- Mozilla browser engine (Gecko) +-- -*-haskell-*- +-- GIMP Toolkit (GTK) Widget embedding the Mozilla browser engine (Gecko) -- -- Author : Jonas Svensson +-- -- Created: 26 February 2002 -- -- Version $Revision$ from $Date$ @@ -18,7 +19,6 @@ -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- --- -- Modified 2004 by Scott West for basic use in gtk2hs -- -- Further modified 2004 by Wolfram Kahl: @@ -26,18 +26,9 @@ -- * added additional interface functions -- * circumvented render_data problem -- +-- | This widgets embeds Mozilla's browser engine (Gecko) into a GTK+ widget. +-- See <http://www.mozilla.org/unix/gtk-embedding.html> for an API reference. -- ---- DESCRIPTION --------------------------------------------------------------- --- --- This widgets embeds Mozilla's browser engine (Gecko) into a GTK+ widget. --- ---- DOCU ---------------------------------------------------------------------- --- --- Language: Haskell 98 Binding Module --- ---- TODO ---------------------------------------------------------------------- --- - module Graphics.UI.Gtk.MozEmbed ( MozEmbed, MozEmbedClass, |
|
From: Duncan C. <dun...@us...> - 2004-12-18 20:45:29
|
Update of /cvsroot/gtk2hs/gtk2hs/tools/c2hs/toplevel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21072/tools/c2hs/toplevel Modified Files: Main.hs Log Message: remove performance debuging output when processing .chs files. Keep debugging output for generating .precomp files to remind us how slow it is and to bug me to fix it! Index: Main.hs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/c2hs/toplevel/Main.hs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Main.hs 26 Nov 2004 15:08:10 -0000 1.2 +++ Main.hs 18 Dec 2004 20:45:13 -0000 1.3 @@ -626,7 +626,6 @@ cppOpts <- getSwitch cppOptsSB let cmd = unwords [cpp, cppOpts, realHeaderFile, ">" ++ preprocFile] tracePreproc cmd - printElapsedTime "about to run cpp" exitCode <- systemCIO cmd case exitCode of ExitFailure _ -> fatal "Error during preprocessing" @@ -636,7 +635,6 @@ -- load and analyse the C header file -- (cheader, warnmsgs) <- loadAttrC preprocFile - printElapsedTime "about to emit warnings" putStrCIO warnmsgs printElapsedTime "about to serialise header" @@ -653,7 +651,6 @@ unless keep $ removeFileCIO preprocFile - printElapsedTime "finish" return () where tracePreproc cmd = putTraceStr tracePhasesSW $ @@ -661,11 +658,9 @@ processPreComp :: FilePath -> FilePath -> CST s Bool processPreComp preCompFile bndFile = do - printElapsedTime "start" -- load the Haskell binding module -- - printElapsedTime "about to read .chs file" (chsMod , warnmsgs) <- loadCHS bndFile putStrCIO warnmsgs traceCHSDump chsMod @@ -674,33 +669,28 @@ -- inline-C fragments are removed from the .chs tree and conditionals are -- replaced by structured conditionals) -- - printElapsedTime "extracting cpp stuff from .chs file" (header, strippedCHSMod, warnmsgs) <- genHeader chsMod if not (null header) then return True else do putStrCIO warnmsgs -- -- load and analyse the C header file -- - printElapsedTime "about to deserialise header" WithNameSupply cheader <- liftIO $ getBinFileWithDict preCompFile -- -- expand binding hooks into plain Haskell -- - printElapsedTime "about to expand hooks in .chs file" (hsMod, chi, warnmsgs) <- expandHooks cheader strippedCHSMod putStrCIO warnmsgs -- -- output the result -- - printElapsedTime "about to dump .hs and .chi files" outFName <- getSwitch outputSB let hsFile = if null outFName then basename bndFile else outFName dumpCHS hsFile hsMod True dumpCHI hsFile chi -- different suffix will be appended -- CHS file did not contain C declarations, so return False - printElapsedTime "finish" return False where traceCHSDump mod = do |
|
From: Duncan C. <dun...@us...> - 2004-12-17 22:03:07
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20801 Modified Files: ChangeLog Log Message: Added mozembed test program. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.259 retrieving revision 1.260 diff -u -d -r1.259 -r1.260 --- ChangeLog 17 Dec 2004 21:21:35 -0000 1.259 +++ ChangeLog 17 Dec 2004 22:02:54 -0000 1.260 @@ -19,6 +19,9 @@ it is unnecessary and breaks for modules that do not have -I/usr/include/gtk-2.0 in their CPPFLAGS. + * demo/mozembed/TestEmbedMoz.hs, demo/mozembed/Makefile: add mozembed + test program. + 2004-12-14 Duncan Coutts <du...@co...> * mk/common.mk: quoting/escaping fix so that headers are -#include'd |
|
From: Duncan C. <dun...@us...> - 2004-12-17 22:03:04
|
Update of /cvsroot/gtk2hs/gtk2hs/demo/mozembed In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20801/demo/mozembed Added Files: TestEmbedMoz.hs Makefile Log Message: Added mozembed test program. --- NEW FILE: TestEmbedMoz.hs --- -- A Test Program for the Gtk2 Mozilla Widget -- import Gtk import Graphics.UI.Gtk.MozEmbed import System main :: IO () main = do initGUI w <- windowNew onDelete w (const $ return False) onDestroy w mainQuit mozEmbedSetCompPath "/usr/lib/mozilla" moz <- mozEmbedNew widgetShow moz containerAdd w moz windowSetTitle w "TestEmbedMoz" containerSetBorderWidth w 2 widgetSetSizeRequest w 640 480 widgetShowAll w onOpenConnectID <- onOpenURI moz (\ s -> do putStrLn ("onOpenURI: " ++ s) return False) args <- getArgs case args of file@(c:_) : _ -> let (fr,dr) = span ('/' /=) $ reverse file dir = reverse dr in do dir <- if c == '/' then return dir else do pwd <- getEnv "PWD" return (pwd ++ '/' : dir) let dirSlash = case last dir of '/' -> dir _ -> dir ++ "/" baseURI = "file://" ++ dirSlash mozdata <- readFile file mozEmbedRenderData moz mozdata baseURI mimeType mainGUI _ -> do p <- getProgName putStrLn ("Usage: " ++ p ++ " <htmlfile>") mimeType = "text/html" --- NEW FILE: Makefile --- TestEmbedMoz : TestEmbedMoz.hs ghc -package mozembed TestEmbedMoz.hs -o TestEmbedMoz clean: rm TestEmbedMoz TestEmbedMoz.hi TestEmbedMoz.o |
|
From: Duncan C. <dun...@us...> - 2004-12-17 22:01:04
|
Update of /cvsroot/gtk2hs/gtk2hs/demo/mozembed In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20398/demo/mozembed Log Message: Directory /cvsroot/gtk2hs/gtk2hs/demo/mozembed added to the repository |
|
From: Duncan C. <dun...@us...> - 2004-12-17 21:21:57
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12068/mk Modified Files: common.mk Log Message: New bindings to GtkMozEmbed contributed by Wolfram Kahl <ka...@ca...> (with previous work by Scott West and Jonas Svensson). New class and signal added to hierarchy.list and gtkmarshal.list Build support for mozembed package added to configure.ac and Makefile.am Fix to mk/common.mk to not -#include<config.h> when compiling .hs to .o as it is unnecessary and breaks for modules that do not have -I/usr/include/gtk-2.0 in their CPPFLAGS. Index: common.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- common.mk 14 Dec 2004 13:18:01 -0000 1.45 +++ common.mk 17 Dec 2004 21:21:45 -0000 1.46 @@ -20,8 +20,7 @@ $(call getVar,$<,HCFLAGS) -i$(VPATH) \ $(addprefix -package ,$($(NAME)_PACKAGEDEPS)) \ $(addprefix -package-name ,$(notdir $(basename $($(NAME)_PACKAGE)))) \ - $(addprefix '-#include<,$(addsuffix >',$(CONFIG_H) \ - $($(NAME)_HEADER))) \ + $(addprefix '-#include<,$(addsuffix >', $($(NAME)_HEADER))) \ $(AM_CPPFLAGS) $($(NAME)_CPPFLAGS)) .DELETE_ON_ERROR : %.deps |
|
From: Duncan C. <dun...@us...> - 2004-12-17 21:21:56
|
Update of /cvsroot/gtk2hs/gtk2hs/tools/callbackGen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12068/tools/callbackGen Modified Files: gtkmarshal.list Log Message: New bindings to GtkMozEmbed contributed by Wolfram Kahl <ka...@ca...> (with previous work by Scott West and Jonas Svensson). New class and signal added to hierarchy.list and gtkmarshal.list Build support for mozembed package added to configure.ac and Makefile.am Fix to mk/common.mk to not -#include<config.h> when compiling .hs to .o as it is unnecessary and breaks for modules that do not have -I/usr/include/gtk-2.0 in their CPPFLAGS. Index: gtkmarshal.list =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/callbackGen/gtkmarshal.list,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gtkmarshal.list 3 Aug 2004 03:51:42 -0000 1.3 +++ gtkmarshal.list 17 Dec 2004 21:21:45 -0000 1.4 @@ -104,3 +104,5 @@ VOID:POINTER,STRING # This is for the GConfClient value_changed signal VOID:STRING,POINTER +# This is for GtkMozEmbed +BOOLEAN:STRING |
|
From: Duncan C. <dun...@us...> - 2004-12-17 21:21:55
|
Update of /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12068/tools/hierarchyGen Modified Files: hierarchy.list Log Message: New bindings to GtkMozEmbed contributed by Wolfram Kahl <ka...@ca...> (with previous work by Scott West and Jonas Svensson). New class and signal added to hierarchy.list and gtkmarshal.list Build support for mozembed package added to configure.ac and Makefile.am Fix to mk/common.mk to not -#include<config.h> when compiling .hs to .o as it is unnecessary and breaks for modules that do not have -I/usr/include/gtk-2.0 in their CPPFLAGS. Index: hierarchy.list =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen/hierarchy.list,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- hierarchy.list 12 Dec 2004 12:09:53 -0000 1.12 +++ hierarchy.list 17 Dec 2004 21:21:45 -0000 1.13 @@ -85,6 +85,7 @@ GtkToggleToolButton if gtk-2.4 GtkRadioToolButton if gtk-2.4 GtkSeparatorToolItem if gtk-2.4 + GtkMozEmbed if mozembed GtkBox GtkButtonBox GtkHButtonBox |
|
From: Duncan C. <dun...@us...> - 2004-12-17 21:21:54
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12068 Modified Files: ChangeLog configure.ac Makefile.am Log Message: New bindings to GtkMozEmbed contributed by Wolfram Kahl <ka...@ca...> (with previous work by Scott West and Jonas Svensson). New class and signal added to hierarchy.list and gtkmarshal.list Build support for mozembed package added to configure.ac and Makefile.am Fix to mk/common.mk to not -#include<config.h> when compiling .hs to .o as it is unnecessary and breaks for modules that do not have -I/usr/include/gtk-2.0 in their CPPFLAGS. Index: configure.ac =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- configure.ac 12 Dec 2004 14:28:12 -0000 1.12 +++ configure.ac 17 Dec 2004 21:21:38 -0000 1.13 @@ -250,6 +250,12 @@ AC_MSG_RESULT($ENABLE_GNOME) +AC_ARG_ENABLE(mozilla, + [ --disable-mozilla do not generate bindings for the Mozilla display widget], + [ENABLE_MOZEMBED=$enableval],[ENABLE_MOZEMBED=yes]) + +AC_MSG_RESULT($ENABLE_MOZEMBED) + dnl Check for the GTK&Co libraries. Use the special PKG_CHECK_MODULES dnl macro from the pkg-config program. PKG_CHECK_MODULES(GTK,[glib-2.0 >= 2.0.0 gdk-2.0 >= 2.0.0 gtk+-2.0 >= 2.0.0 gdk-pixbuf-2.0 >= 0.12.0]) @@ -263,6 +269,9 @@ PKG_CHECK_MODULES(GCONF,[gconf-2.0 >= 2.0.0]) PKG_CHECK_MODULES(SOURCEVIEW,[gtksourceview-1.0 >= 0.6.0]) fi +if test x$ENABLE_MOZEMBED = xyes; then + PKG_CHECK_MODULES(MOZEMBED,[mozilla-gtkmozembed >= 1.4]) +fi dnl Some APIs only appeared in later versions of libraries. Generate only dnl Haskell types for the available C types. @@ -283,6 +292,8 @@ 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`; +MOZEMBED_CFLAGS=`CFLAGS="$GTK_CFLAGS" tools/checkDirs.sh $MOZEMBED_CFLAGS`; +MOZEMBED_LIBS=`LDFLAGS="$GTK_LIBS" tools/checkDirs.sh $MOZEMBED_LIBS`; dnl Change the representation of these flags to "flag1","flag2". The @@ -320,6 +331,14 @@ AC_SUBST(GCONF_LIBDIR_CQ) AC_SUBST(GCONF_LIBEXTRA_CQ) +GTKHS_REFORMAT_PACKAGE_CFLAGS(MOZEMBED_CFLAGS, MOZEMBED_CFLAGS_CQ) +GTKHS_REFORMAT_PACKAGE_LIBS(MOZEMBED_LIBS, MOZEMBED_LIBS_CQ, + MOZEMBED_LIBDIR_CQ, MOZEMBED_LIBEXTRA_CQ) +AC_SUBST(MOZEMBED_CFLAGS_CQ) +AC_SUBST(MOZEMBED_LIBS_CQ) +AC_SUBST(MOZEMBED_LIBDIR_CQ) +AC_SUBST(MOZEMBED_LIBEXTRA_CQ) + AC_ARG_WITH(hidir, [ --with-hidir=DIR specify install dir for .hi files], [hidir=$withval], @@ -513,7 +532,8 @@ mogul/mogul.pkg glade/glade.pkg gconf/gconf.pkg - sourceview/sourceview.pkg], + sourceview/sourceview.pkg + mozembed/mozembed.pkg], [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.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- Makefile.am 13 Dec 2004 23:57:05 -0000 1.26 +++ Makefile.am 17 Dec 2004 21:21:38 -0000 1.27 @@ -20,7 +20,7 @@ tools/c2hs/base/syntax tools/c2hs/base/sysdep tools/c2hs/c \ tools/c2hs/chs tools/c2hs/gen tools/c2hs/state tools/c2hs/toplevel \ mogul glade gconf gconf/System/Gnome gconf/System/Gnome/GConf \ - sourceview + sourceview mozembed EXTRA_DIST = \ tools/callbackGen/Signal.chs-boot1 \ @@ -43,7 +43,8 @@ libHSmogul.a \ libHSglade.a \ libHSgconf.a \ - libHSsourceview.a + libHSsourceview.a \ + libHSmozembed.a noinst_PROGRAMS = \ tools/hierarchyGen/TypeGenerator \ @@ -631,11 +632,74 @@ -include libHSsourceview_a.deps $(libHSsourceview_a_CHSFILES:.chs=.dep) endif +# +# mozembed package +# +################################################################################ + +libHSmozembed_a_NAME = libHSmozembed.a +$(libHSmozembed_a_NAME) : NAME = libHSmozembed_a + +libHSmozembed_a_PACKAGE = mozembed/mozembed.pkg +libHSmozembed_a_PACKAGEDEPS = +libHSmozembed_a_HEADER = gtkmozembed.h +libHSmozembed_a_PRECOMP = mozembed/mozembed.precomp +libHSmozembed_a_LIBS = $(MOZEMBED_LIBS) +libHSmozembed_a_HCFLAGS = -fffi +libHSmozembed_a_CFLAGS = $(filter-out -I% -D%,$(GTK_CFLAGS) $(MOZEMBED_CFLAGS)) +libHSmozembed_a_CPPFLAGS = $(filter -I% -D%,$(GTK_CFLAGS) $(MOZEMBED_CFLAGS)) + +libHSmozembed_a_SOURCES = \ + mozembed/Graphics/UI/Gtk/MozEmbedType.chs \ + mozembed/Graphics/UI/Gtk/MozEmbed.chs + +mozembed_Graphics_UI_Gtk_MozEmbedType_hs_HCFLAGS = -fglasgow-exts + +libHSmozembed_a_DEPENDENCIES = libHSgtk.a + +mozembed/Graphics/UI/Gtk/MozEmbedType.chs : \ + $(srcdir)/tools/hierarchyGen/hierarchy.list \ + $(srcdir)/tools/hierarchyGen/TypeGenerator + $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(srcdir)/tools/hierarchyGen/hierarchy.list \ + $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \ + $@ --tag=mozembed --parentname=Hierarchy \ + --modname=Graphics.UI.Gtk.MozEmbedType) + +am_libHSmozembed_a_OBJECTS = \ + $(addsuffix .$(OBJEXT),$(basename $(basename $(libHSmozembed_a_SOURCES)))) + +libHSmozembed_a_CHSPPFILES = $(filter %.chs.pp,$(libHSmozembed_a_SOURCES)) +libHSmozembed_a_CHSFILES = \ + $(filter %.chs,$(libHSmozembed_a_SOURCES:.chs.pp=.chs)) +libHSmozembed_a_CHSFILES_HS = $(libHSmozembed_a_CHSFILES:.chs=.hs) +libHSmozembed_a_HSCFILES = $(filter %.hsc, $(libHSmozembed_a_SOURCES)) +libHSmozembed_a_HSCFILES_HS = $(libHSmozembed_a_HSCFILES:.hsc=.hs) +libHSmozembed_a_BUILDSOURCES = \ + $(libHSmozembed_a_CHSPPFILES:.chs.pp=.chs) \ + $(libHSmozembed_a_CHSFILES_HS) \ + $(libHSmozembed_a_HSCFILES_HS) \ + mozembed/Graphics/UI/Gtk/MozEmbedType.chs +libHSmozembed_a_HSFILES = \ + $(filter %.hs,$(libHSmozembed_a_BUILDSOURCES)) \ + $(filter %.hs,$(libHSmozembed_a_SOURCES)) + +MOSTLYCLEANFILES += $(am_libHSmozembed_a_OBJECTS) +MOSTLYCLEANFILES += $(libHSmozembed_a_HSFILES:.hs=.hi) +CLEANFILES += $(libHSmozembed_a_BUILDSOURCES) + +DISTCLEANFILES+= libHSmozembed_a.deps $(libHSmozembed_a_CHSFILES_HS:.hs=.dep) + +ifneq ($(MAKECMDGOALS),clean) +-include libHSmozembed_a.deps $(libHSmozembed_a_CHSFILES:.chs=.dep) + endif + # All generated source files go here. BUILDSOURCES = $(libHSgtk_a_BUILDSOURCES) \ $(libHSglade_a_BUILDSOURCES) \ $(libHSgconf_a_BUILDSOURCES) \ - $(libHSsourceview_a_BUILDSOURCES) + $(libHSsourceview_a_BUILDSOURCES) \ + $(libHSmozembed_a_BUILDSOURCES) include mk/common.mk Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.258 retrieving revision 1.259 diff -u -d -r1.258 -r1.259 --- ChangeLog 14 Dec 2004 13:18:01 -0000 1.258 +++ ChangeLog 17 Dec 2004 21:21:35 -0000 1.259 @@ -1,3 +1,24 @@ +2004-12-17 Duncan Coutts <du...@co...> + + * mozembed/Graphics/UI/Gtk/MozEmbed.chs: new bindings to GtkMozEmbed + contributed by Wolfram Kahl <ka...@ca...> (with previous work + by Scott West and Jonas Svensson). + + * mozembed/mozembed.pkg.in: new package file + + * tools/hierarchyGen/hierarchy.list, + tools/callbackGen/gtkmarshal.list: class definition and extra signal + prototype for GtkMozEmbed. + + * configure.ac: checks for version of mozilla-gtkmozembed and get + CFLAGS etc. + + * Makefile.am: add support for building the mozembed package. + + * mk/common.mk: do not -#include<config.h> when compiling .hs to .o as + it is unnecessary and breaks for modules that do not have + -I/usr/include/gtk-2.0 in their CPPFLAGS. + 2004-12-14 Duncan Coutts <du...@co...> * mk/common.mk: quoting/escaping fix so that headers are -#include'd |
|
From: Duncan C. <dun...@us...> - 2004-12-17 21:21:54
|
Update of /cvsroot/gtk2hs/gtk2hs/mozembed/Graphics/UI/Gtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12068/mozembed/Graphics/UI/Gtk Added Files: MozEmbed.chs Log Message: New bindings to GtkMozEmbed contributed by Wolfram Kahl <ka...@ca...> (with previous work by Scott West and Jonas Svensson). New class and signal added to hierarchy.list and gtkmarshal.list Build support for mozembed package added to configure.ac and Makefile.am Fix to mk/common.mk to not -#include<config.h> when compiling .hs to .o as it is unnecessary and breaks for modules that do not have -I/usr/include/gtk-2.0 in their CPPFLAGS. --- NEW FILE: MozEmbed.chs --- -- |GIMP Toolkit (GTK) Binding for Haskell: widget embedding the -*-haskell-*- -- Mozilla browser engine (Gecko) -- -- Author : Jonas Svensson -- Created: 26 February 2002 -- -- Version $Revision: 1.1 $ from $Date: 2004/12/17 21:21:44 $ -- -- Copyright (c) 2002 Jonas Svensson -- -- This library is free software; you can redistribute it and/or -- modify it under the terms of the GNU Library General Public -- License as published by the Free Software Foundation; either -- version 2 of the License, or (at your option) any later version. -- -- This library 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 -- Library General Public License for more details. -- -- -- Modified 2004 by Scott West for basic use in gtk2hs -- -- Further modified 2004 by Wolfram Kahl: -- * ported to gtk2hs/c2hs -- * added additional interface functions -- * circumvented render_data problem -- -- --- DESCRIPTION --------------------------------------------------------------- -- -- This widgets embeds Mozilla's browser engine (Gecko) into a GTK+ widget. -- --- DOCU ---------------------------------------------------------------------- -- -- Language: Haskell 98 Binding Module -- --- TODO ---------------------------------------------------------------------- -- module Graphics.UI.Gtk.MozEmbed ( MozEmbed, MozEmbedClass, mozEmbedNew, mozEmbedSetCompPath, mozEmbedRenderData, mozEmbedOpenStream, mozEmbedAppendData, mozEmbedCloseStream, onOpenURI, mozEmbedLoadUrl, -- the functions below are untested. onKeyDown, onKeyPress, onKeyUp, onMouseDown, onMouseUp, onMouseClick, onMouseDoubleClick, onMouseOver, onMouseOut, mozEmbedSetProfilePath, mozEmbedStopLoad, mozEmbedGoBack, mozEmbedGoForward, mozEmbedGetLinkMessage, mozEmbedGetJsStatus, mozEmbedGetTitle, mozEmbedGetLocation, mozEmbedCanGoBack, mozEmbedCanGoForward, mozEmbedPushStartup, mozEmbedPopStartup ) where import Monad (liftM) import FFI import ForeignPtr import Foreign.Marshal.Utils (toBool) {#import Object#} (makeNewObject) {#import Signal#} (ConnectId, connect_STRING__BOOL, connect_PTR__INT) {#import Graphics.UI.Gtk.MozEmbedType #} import Widget (Widget) {#context lib="gtkembedmoz" prefix ="gtk"#} -- operations -- ---------- -- | Create a new MozEmbed -- mozEmbedNew :: IO MozEmbed mozEmbedNew = makeNewObject mkMozEmbed $ liftM castPtr {#call moz_embed_new#} mozEmbedSetCompPath :: String -> IO () mozEmbedSetCompPath str = withCString str $ \strPtr -> {#call moz_embed_set_comp_path#} strPtr mozEmbedSetProfilePath :: String -> String -> IO () mozEmbedSetProfilePath dir name = withCString dir $ \dirPtr -> withCString name $ \namePtr -> {#call moz_embed_set_profile_path#} dirPtr namePtr mozEmbedLoadUrl :: MozEmbedClass m => m -> String -> IO () mozEmbedLoadUrl m url = withCString url $ \urlPtr -> {#call moz_embed_load_url#} (toMozEmbed m) urlPtr mozEmbedStopLoad :: MozEmbedClass m => m -> IO () mozEmbedStopLoad m = {#call moz_embed_stop_load#} (toMozEmbed m) mozEmbedGoBack :: MozEmbedClass m => m -> IO () mozEmbedGoBack m = {#call moz_embed_go_back#} (toMozEmbed m) mozEmbedGoForward :: MozEmbedClass m => m -> IO () mozEmbedGoForward m = {#call moz_embed_go_forward#} (toMozEmbed m) mozEmbedGetLinkMessage :: MozEmbedClass m => m -> IO String mozEmbedGetLinkMessage m = do str <- {#call moz_embed_get_link_message#} (toMozEmbed m) peekCString str mozEmbedGetJsStatus :: MozEmbedClass m => m -> IO String mozEmbedGetJsStatus m = do str <- {#call moz_embed_get_js_status#} (toMozEmbed m) peekCString str mozEmbedGetTitle :: MozEmbedClass m => m -> IO String mozEmbedGetTitle m = do str <- {#call moz_embed_get_title#} (toMozEmbed m) peekCString str mozEmbedGetLocation :: MozEmbedClass m => m -> IO String mozEmbedGetLocation m = do str <- {#call moz_embed_get_location#} (toMozEmbed m) peekCString str mozEmbedCanGoBack :: MozEmbedClass m => m -> IO Bool mozEmbedCanGoBack m = liftM toBool $ {#call moz_embed_can_go_back#} (toMozEmbed m) mozEmbedCanGoForward :: MozEmbedClass m => m -> IO Bool mozEmbedCanGoForward m = liftM toBool $ {#call moz_embed_can_go_forward#} (toMozEmbed m) mozEmbedPushStartup :: IO () mozEmbedPushStartup = {#call moz_embed_push_startup#} mozEmbedPopStartup :: IO () mozEmbedPopStartup = {#call moz_embed_pop_startup#} {- void gtk_moz_embed_open_stream (GtkMozEmbed *embed, const char *base_uri, const char *mime_type); void gtk_moz_embed_append_data (GtkMozEmbed *embed, const char *data, guint32 len); void gtk_moz_embed_close_stream (GtkMozEmbed *embed); -} mozEmbedOpenStream :: MozEmbedClass m => m -> String -> String -> IO () mozEmbedOpenStream m baseURI mimeType = withCString baseURI $ \ basePtr -> withCString mimeType $ \ mtPtr -> {#call gtk_moz_embed_open_stream#} (toMozEmbed m) basePtr mtPtr mozEmbedAppendDataInternal :: MozEmbedClass m => m -> String -> IO () mozEmbedAppendDataInternal m contents = -- newCStringLen (toUTF contents) >>= \ (dataPtr,len) -> withUTFStringLen contents $ \ (dataPtr,len) -> -- alloca discouraged? let len' = fromIntegral len in {#call gtk_moz_embed_append_data#} (toMozEmbed m) dataPtr len' -- >> free dataPtr mozEmbedCloseStream :: MozEmbedClass m => m -> IO () mozEmbedCloseStream m = {#call gtk_moz_embed_close_stream#} (toMozEmbed m) mozEmbedAppendData :: MozEmbedClass m => m -> String -> IO () mozEmbedAppendData m contents = mapM_ (mozEmbedAppendDataInternal m) (chunks 32768 contents) mozEmbedRenderData :: MozEmbedClass m => m -> String -> String -> String -> IO () mozEmbedRenderData m contents baseURI mimeType = do mozEmbedOpenStream m baseURI mimeType mozEmbedAppendData m contents mozEmbedCloseStream m chunks :: Int -> [a] -> [[a]] chunks n [] = [] chunks n xs = let (ys, zs) = splitAt n xs in ys : chunks n zs {- void gtk_moz_embed_render_data (GtkMozEmbed *embed, const char *data, guint32 len, const char *base_uri, const char *mime_type) -} -- -- mozEmbedRenderDataInternal does not work for len' > 2^16 mozEmbedRenderDataInternal :: MozEmbedClass m => m -> String -> String -> String -> IO () mozEmbedRenderDataInternal m contents baseURI mimeType = -- newCStringLen (toUTF contents) >>= \ (dataPtr,len) -> withUTFStringLen contents $ \ (dataPtr,len) -> -- alloca discouraged let len' = fromIntegral len in -- hPutStrLn stderr ("mozEmbedRenderData: " ++ shows len' " bytes") >>= \ _ -> withCString baseURI $ \ basePrt -> withCString mimeType $ \ mtPtr -> {#call gtk_moz_embed_render_data#} (toMozEmbed m) dataPtr len' basePrt mtPtr -- >> free dataPtr {- struct _GtkMozEmbedClass { [...] gint (* open_uri) (GtkMozEmbed *embed, const char *aURI); [...] } -} onOpenURI :: MozEmbedClass m => m -> (String -> IO Bool) -> IO (ConnectId m) onOpenURI = connect_STRING__BOOL "open_uri" after where -- Specify if the handler is to run before (False) or after (True) the -- default handler. after = False {- More signals to investigate: gint (* dom_key_down) (GtkMozEmbed *embed, gpointer dom_event); gint (* dom_key_press) (GtkMozEmbed *embed, gpointer dom_event); gint (* dom_key_up) (GtkMozEmbed *embed, gpointer dom_event); gint (* dom_mouse_down) (GtkMozEmbed *embed, gpointer dom_event); gint (* dom_mouse_up) (GtkMozEmbed *embed, gpointer dom_event); gint (* dom_mouse_click) (GtkMozEmbed *embed, gpointer dom_event); gint (* dom_mouse_dbl_click) (GtkMozEmbed *embed, gpointer dom_event); gint (* dom_mouse_over) (GtkMozEmbed *embed, gpointer dom_event); gint (* dom_mouse_out) (GtkMozEmbed *embed, gpointer dom_event); Unfortunateley these are not documented on http://www.mozilla.org/unix/gtk-embedding.html -} onKeyDown, onKeyPress, onKeyUp, onMouseDown, onMouseUp, onMouseClick, onMouseDoubleClick, onMouseOver, onMouseOut :: (Num n, Integral n, MozEmbedClass m) => m -> (Ptr a -> IO n) -> IO (ConnectId m) onKeyDown = connect_PTR__INT "dom_key_down" False onKeyPress = connect_PTR__INT "dom_key_press" False onKeyUp = connect_PTR__INT "dom_key_up" False onMouseDown = connect_PTR__INT "dom_mouse_down" False onMouseUp = connect_PTR__INT "dom_mouse_up" False onMouseClick = connect_PTR__INT "dom_mouse_click" False onMouseDoubleClick = connect_PTR__INT "dom_mouse_dbl_click" False onMouseOver = connect_PTR__INT "dom_mouse_over" False onMouseOut = connect_PTR__INT "dom_mouse_out" False |
|
From: Duncan C. <dun...@us...> - 2004-12-17 21:21:53
|
Update of /cvsroot/gtk2hs/gtk2hs/mozembed In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12068/mozembed Added Files: mozembed.pkg.in Log Message: New bindings to GtkMozEmbed contributed by Wolfram Kahl <ka...@ca...> (with previous work by Scott West and Jonas Svensson). New class and signal added to hierarchy.list and gtkmarshal.list Build support for mozembed package added to configure.ac and Makefile.am Fix to mk/common.mk to not -#include<config.h> when compiling .hs to .o as it is unnecessary and breaks for modules that do not have -I/usr/include/gtk-2.0 in their CPPFLAGS. --- NEW FILE: mozembed.pkg.in --- Package { name = "mozembed", auto = False, import_dirs = ["@hidir@"], source_dirs = [], library_dirs = [@MOZEMBED_LIBDIR_CQ@], hs_libraries = ["HSmozembed"], extra_libraries = [@MOZEMBED_LIBS_CQ@], include_dirs = [@MOZEMBED_CFLAGS_CQ@], c_includes = ["gtkmozembed.h"], package_deps = ["gtk"], extra_ghc_opts = [], extra_cc_opts = [], extra_ld_opts = [@MOZEMBED_LIBEXTRA_CQ@] } |
|
From: Duncan C. <dun...@us...> - 2004-12-17 21:17:14
|
Update of /cvsroot/gtk2hs/gtk2hs/mozembed/Graphics/UI/Gtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11800/mozembed/Graphics/UI/Gtk Log Message: Directory /cvsroot/gtk2hs/gtk2hs/mozembed/Graphics/UI/Gtk added to the repository |
|
From: Duncan C. <dun...@us...> - 2004-12-17 21:16:57
|
Update of /cvsroot/gtk2hs/gtk2hs/mozembed/Graphics/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11748/mozembed/Graphics/UI Log Message: Directory /cvsroot/gtk2hs/gtk2hs/mozembed/Graphics/UI added to the repository |
|
From: Duncan C. <dun...@us...> - 2004-12-17 21:16:41
|
Update of /cvsroot/gtk2hs/gtk2hs/mozembed/Graphics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11673/mozembed/Graphics Log Message: Directory /cvsroot/gtk2hs/gtk2hs/mozembed/Graphics added to the repository |
|
From: Duncan C. <dun...@us...> - 2004-12-17 21:16:04
|
Update of /cvsroot/gtk2hs/gtk2hs/mozembed In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11544/mozembed Log Message: Directory /cvsroot/gtk2hs/gtk2hs/mozembed added to the repository |
|
From: Duncan C. <dun...@us...> - 2004-12-14 13:18:12
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30150/mk Modified Files: common.mk Log Message: Quoting/escaping fix so that headers are -#include'd properly. This allows a build using ./configure --with-hcflags=-fvia-C to get further. I don't think that config.h should be -#include'd but I have not made that change yet. Index: common.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- common.mk 13 Dec 2004 21:31:55 -0000 1.44 +++ common.mk 14 Dec 2004 13:18:01 -0000 1.45 @@ -20,7 +20,7 @@ $(call getVar,$<,HCFLAGS) -i$(VPATH) \ $(addprefix -package ,$($(NAME)_PACKAGEDEPS)) \ $(addprefix -package-name ,$(notdir $(basename $($(NAME)_PACKAGE)))) \ - $(addprefix '-\#include<,$(addsuffix >',$(CONFIG_H) \ + $(addprefix '-#include<,$(addsuffix >',$(CONFIG_H) \ $($(NAME)_HEADER))) \ $(AM_CPPFLAGS) $($(NAME)_CPPFLAGS)) |
|
From: Duncan C. <dun...@us...> - 2004-12-14 13:18:10
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30150 Modified Files: ChangeLog Log Message: Quoting/escaping fix so that headers are -#include'd properly. This allows a build using ./configure --with-hcflags=-fvia-C to get further. I don't think that config.h should be -#include'd but I have not made that change yet. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.257 retrieving revision 1.258 diff -u -d -r1.257 -r1.258 --- ChangeLog 13 Dec 2004 23:02:12 -0000 1.257 +++ ChangeLog 14 Dec 2004 13:18:01 -0000 1.258 @@ -1,3 +1,9 @@ +2004-12-14 Duncan Coutts <du...@co...> + + * mk/common.mk: quoting/escaping fix so that headers are -#include'd + properly. This allows a build using ./configure --with-hcflags=-fvia-C + to get further. + 2004-12-13 Duncan Coutts <du...@co...> * tools/hierarchyGen/TypeGen.hs: make the tool use an external template |
|
From: Duncan C. <dun...@us...> - 2004-12-13 23:57:14
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2061 Modified Files: Makefile.am Log Message: Oops, missed that sourceview/SourceTagStyle.hs needs -fglasgow-exts Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- Makefile.am 13 Dec 2004 23:02:13 -0000 1.25 +++ Makefile.am 13 Dec 2004 23:57:05 -0000 1.26 @@ -591,6 +591,7 @@ sourceview/SourceView.chs sourceview_SourceViewType_hs_HCFLAGS = -fglasgow-exts +sourceview_SourceTagStyle_hs_HCFLAGS = -fglasgow-exts libHSsourceview_a_DEPENDENCIES = libHSgtk.a |
|
From: Duncan C. <dun...@us...> - 2004-12-13 23:02:27
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21194 Modified Files: ChangeLog Makefile.am Log Message: build glade and sourceview with more targeted use of -fglasgow-exts Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- Makefile.am 13 Dec 2004 21:31:55 -0000 1.24 +++ Makefile.am 13 Dec 2004 23:02:13 -0000 1.25 @@ -453,7 +453,7 @@ libHSglade_a_HEADER = glade/glade.h libHSglade_a_PRECOMP = glade/glade.precomp libHSglade_a_LIBS = $(LIBGLADE_LIBS) -libHSglade_a_HCFLAGS = -fglasgow-exts +libHSglade_a_HCFLAGS = -fffi libHSglade_a_CFLAGS = $(filter-out -I% -D%,$(GTK_CFLAGS) $(LIBGLADE_CFLAGS)) libHSglade_a_CPPFLAGS = $(filter -I% -D%,$(GTK_CFLAGS) $(LIBGLADE_CFLAGS)) @@ -461,6 +461,8 @@ glade/GladeType.chs \ glade/Glade.chs +glade_GladeType_hs_HCFLAGS = -fglasgow-exts + libHSglade_a_DEPENDENCIES = libHSgtk.a glade/GladeType.chs : $(srcdir)/tools/hierarchyGen/hierarchy.list \ @@ -571,7 +573,7 @@ libHSsourceview_a_HEADER = sourceview.h libHSsourceview_a_PRECOMP = sourceview/sourceview.precomp libHSsourceview_a_LIBS = $(SOURCEVIEW_LIBS) -libHSsourceview_a_HCFLAGS = -fglasgow-exts +libHSsourceview_a_HCFLAGS = -fffi libHSsourceview_a_CFLAGS = $(filter-out -I% -D%,$(GTK_CFLAGS) $(SOURCEVIEW_CFLAGS)) libHSsourceview_a_CPPFLAGS = $(filter -I% -D%,$(GTK_CFLAGS) $(SOURCEVIEW_CFLAGS)) -Isourceview @@ -588,6 +590,8 @@ sourceview/SourceTagTable.chs \ sourceview/SourceView.chs +sourceview_SourceViewType_hs_HCFLAGS = -fglasgow-exts + libHSsourceview_a_DEPENDENCIES = libHSgtk.a sourceview/SourceViewType.chs : \ Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.256 retrieving revision 1.257 diff -u -d -r1.256 -r1.257 --- ChangeLog 13 Dec 2004 21:45:52 -0000 1.256 +++ ChangeLog 13 Dec 2004 23:02:12 -0000 1.257 @@ -18,6 +18,9 @@ * tools/c2hs/base/sysdep/SysDep.hs: simplify import and re-export. + * Makefile.am: build glade and sourceview with more targeted use of + -fglasgow-exts + 2004-12-12 Duncan Coutts <du...@co...> * gtk/gtk.pkg.in: change package_deps to haskell98 rather than base to |
|
From: Duncan C. <dun...@us...> - 2004-12-13 21:46:02
|
Update of /cvsroot/gtk2hs/gtk2hs/tools/c2hs/base/sysdep In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2539/tools/c2hs/base/sysdep Modified Files: SysDep.hs Log Message: Simplify import and re-export. Index: SysDep.hs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/c2hs/base/sysdep/SysDep.hs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- SysDep.hs 9 Dec 2004 18:26:03 -0000 1.2 +++ SysDep.hs 13 Dec 2004 21:45:52 -0000 1.3 @@ -89,7 +89,7 @@ import Ix (Ix) import Monad (when) -import Control.Monad.Fix (mfix) +import System.IO (fixIO) import System.IO.Unsafe (unsafePerformIO, unsafeInterleaveIO) import Data.IORef (IORef, newIORef, readIORef, writeIORef) import Data.Array.IO (IOArray, newArray, bounds, readArray, writeArray) @@ -101,9 +101,6 @@ -- re-export some things with different names -- -fixIO :: (a -> IO a) -> IO a -fixIO = mfix - newIOArray :: Ix i => (i, i) -> e -> IO (IOArray i e) newIOArray = newArray boundsIOArray :: Ix i => IOArray i e -> (i, i) |
|
From: Duncan C. <dun...@us...> - 2004-12-13 21:46:02
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2539 Modified Files: ChangeLog Log Message: Simplify import and re-export. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.255 retrieving revision 1.256 diff -u -d -r1.255 -r1.256 --- ChangeLog 13 Dec 2004 21:31:55 -0000 1.255 +++ ChangeLog 13 Dec 2004 21:45:52 -0000 1.256 @@ -16,6 +16,8 @@ * Makefile.am: c2hs builds without -fglasgow-exts except for the Parsers and C2HSConfig modules. + * tools/c2hs/base/sysdep/SysDep.hs: simplify import and re-export. + 2004-12-12 Duncan Coutts <du...@co...> * gtk/gtk.pkg.in: change package_deps to haskell98 rather than base to |
|
From: Duncan C. <dun...@us...> - 2004-12-13 21:32:08
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31708/mk Modified Files: common.mk Log Message: Allow per-module HCFLAGS. Use per-module HCFLAGS to get c2hs to build without -fglasgow-exts except for the Parsers and C2HSConfig modules. Index: common.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- common.mk 12 Dec 2004 21:57:32 -0000 1.43 +++ common.mk 13 Dec 2004 21:31:55 -0000 1.44 @@ -16,7 +16,8 @@ .hs.o: $(CONFIG_H) @echo Building for $(NAME) - $(strip $(HC) -c $< -o $@ $(HCFLAGS) $($(NAME)_HCFLAGS) -i$(VPATH) \ + $(strip $(HC) -c $< -o $@ $(HCFLAGS) $($(NAME)_HCFLAGS) \ + $(call getVar,$<,HCFLAGS) -i$(VPATH) \ $(addprefix -package ,$($(NAME)_PACKAGEDEPS)) \ $(addprefix -package-name ,$(notdir $(basename $($(NAME)_PACKAGE)))) \ $(addprefix '-\#include<,$(addsuffix >',$(CONFIG_H) \ |
|
From: Duncan C. <dun...@us...> - 2004-12-13 21:32:06
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31708 Modified Files: ChangeLog Makefile.am Log Message: Allow per-module HCFLAGS. Use per-module HCFLAGS to get c2hs to build without -fglasgow-exts except for the Parsers and C2HSConfig modules. Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- Makefile.am 13 Dec 2004 20:22:17 -0000 1.23 +++ Makefile.am 13 Dec 2004 21:31:55 -0000 1.24 @@ -134,7 +134,7 @@ tools_c2hs_c2hsLocal_MAIN = c2hs/toplevel/Main.hs tools_c2hs_c2hsLocal_PACKAGEDEPS = tools_c2hs_c2hsLocal_HEADER = tools/c2hs/toplevel/c2hs_config.h -tools_c2hs_c2hsLocal_HCFLAGS = -fglasgow-exts -fffi +tools_c2hs_c2hsLocal_HCFLAGS = tools_c2hs_c2hsLocal_SOURCES = \ tools/c2hs/base/admin/BaseVersion.hs \ @@ -186,6 +186,9 @@ tools/c2hs/toplevel/C2HSConfig.hs \ tools/c2hs/toplevel/c2hs_config.c +tools_c2hs_base_syntax_Parsers_hs_HCFLAGS = -fglasgow-exts +tools_c2hs_toplevel_C2HSConfig_hs_HCFLAGS = -fffi + tools_c2hs_c2hsLocal_HSFILES = \ $(filter %.hs,$(tools_c2hs_c2hsLocal_SOURCES)) # Fix automake - the subdir-objects option doesn't work here. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.254 retrieving revision 1.255 diff -u -d -r1.254 -r1.255 --- ChangeLog 13 Dec 2004 20:22:16 -0000 1.254 +++ ChangeLog 13 Dec 2004 21:31:55 -0000 1.255 @@ -11,6 +11,11 @@ * Makefile.am: modify invocation of TypeGenerator to pass template file and pass --parentname=Hierarchy for all packages other than gtk. + * mk/common.mk: allow per-module HCFLAGS + + * Makefile.am: c2hs builds without -fglasgow-exts except for the + Parsers and C2HSConfig modules. + 2004-12-12 Duncan Coutts <du...@co...> * gtk/gtk.pkg.in: change package_deps to haskell98 rather than base to |
|
From: Duncan C. <dun...@us...> - 2004-12-13 20:22:30
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15296 Modified Files: ChangeLog Makefile.am Log Message: make the TypeGenerator tool use an external template file rather than embeding all the module text. Also added a --parentname parameter to allow modules to inherit definitions from other modules - this replaces the 'if fname/="Hierarchy" then' hack. Updated Makefile.am invocations of TypeGenerator correspondingly. Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Makefile.am 12 Dec 2004 21:57:31 -0000 1.22 +++ Makefile.am 13 Dec 2004 20:22:17 -0000 1.23 @@ -77,6 +77,7 @@ $(srcdir)/tools/hierarchyGen/TypeGenerator $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ + $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \ $@ $(addprefix --tag=,$(CREATE_TYPES))) # @@ -463,7 +464,9 @@ $(srcdir)/tools/hierarchyGen/TypeGenerator $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ - $@ --tag=libglade --lib=glade --prefix=glade) + $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \ + $@ --tag=libglade --lib=glade --prefix=glade \ + --parentname=Hierarchy) am_libHSglade_a_OBJECTS = \ $(addsuffix .$(OBJEXT),$(basename $(basename $(libHSglade_a_SOURCES)))) @@ -521,8 +524,9 @@ $(srcdir)/tools/hierarchyGen/TypeGenerator $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ + $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \ $@ --tag=gconf --lib=gconf --prefix=gconf \ - --modname=System.Gnome.GConf.GConfType) + --modname=System.Gnome.GConf.GConfType --parentname=Hierarchy) am_libHSgconf_a_OBJECTS = \ $(addsuffix .$(OBJEXT),$(basename $(basename $(libHSgconf_a_SOURCES)))) @@ -588,7 +592,8 @@ $(srcdir)/tools/hierarchyGen/TypeGenerator $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ - $@ --tag=sourceview) + $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \ + $@ --tag=sourceview --parentname=Hierarchy) am_libHSsourceview_a_OBJECTS = \ $(addsuffix .$(OBJEXT),$(basename $(basename $(libHSsourceview_a_SOURCES)))) Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.253 retrieving revision 1.254 diff -u -d -r1.253 -r1.254 --- ChangeLog 12 Dec 2004 21:57:31 -0000 1.253 +++ ChangeLog 13 Dec 2004 20:22:16 -0000 1.254 @@ -1,3 +1,16 @@ +2004-12-13 Duncan Coutts <du...@co...> + + * tools/hierarchyGen/TypeGen.hs: make the tool use an external template + file rather than embeding all the module text. Also added a + --parentname parameter to allow modules to inherit definitions from + other modules - this replaces the 'if fname/="Hierarchy" then' hack. + + * tools/hierarchyGen/Hierarchy.chs.template: new file. Template for + class hierarchy definition modules. Used by the TypeGenerator program. + + * Makefile.am: modify invocation of TypeGenerator to pass template file + and pass --parentname=Hierarchy for all packages other than gtk. + 2004-12-12 Duncan Coutts <du...@co...> * gtk/gtk.pkg.in: change package_deps to haskell98 rather than base to |
2 messages has been excluded from this view by a project administrator.
