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-09 18:45:16
|
Update of /cvsroot/gtk2hs/gtk2hs/mogul In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31883/mogul Modified Files: mogul.pkg.in Log Message: Rename package libs to libHS{pkg}.a, ie follow ghc convention and prefix them with HS so we do not get name clashes with system libraries. Rename the gtk2hs package to be just gtk. Get the flags to put into the *pkg.in files to work properly for packages other than the main gtk pacakge by adding a couple macros to aclocal.m4 and changing all the *.pkg.in files appropriately. Eliminate use of compat/* modules and lang & data pacakges in Makefile.am. Small fix to install-data-hook target in mk/common.mk. Index: mogul.pkg.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mogul/mogul.pkg.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mogul.pkg.in 8 Dec 2004 13:01:12 -0000 1.1 +++ mogul.pkg.in 9 Dec 2004 18:44:59 -0000 1.2 @@ -4,11 +4,11 @@ import_dirs = ["@hidir@"], source_dirs = [], library_dirs = [], - hs_libraries = ["mogul"], + hs_libraries = ["HSmogul"], extra_libraries = [], include_dirs = [], c_includes = [], - package_deps = ["gtk2hs"], + package_deps = ["gtk"], extra_ghc_opts = [], extra_cc_opts = [], extra_ld_opts = [] |
|
From: Duncan C. <dun...@us...> - 2004-12-09 18:45:14
|
Update of /cvsroot/gtk2hs/gtk2hs/sourceview In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31883/sourceview Modified Files: sourceview.pkg.in Log Message: Rename package libs to libHS{pkg}.a, ie follow ghc convention and prefix them with HS so we do not get name clashes with system libraries. Rename the gtk2hs package to be just gtk. Get the flags to put into the *pkg.in files to work properly for packages other than the main gtk pacakge by adding a couple macros to aclocal.m4 and changing all the *.pkg.in files appropriately. Eliminate use of compat/* modules and lang & data pacakges in Makefile.am. Small fix to install-data-hook target in mk/common.mk. Index: sourceview.pkg.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/sourceview.pkg.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- sourceview.pkg.in 8 Dec 2004 13:01:13 -0000 1.1 +++ sourceview.pkg.in 9 Dec 2004 18:45:00 -0000 1.2 @@ -3,18 +3,18 @@ auto = False, import_dirs = ["@hidir@"], source_dirs = [], - library_dirs = [], - hs_libraries = ["sourceview"], - extra_libraries = [@GCONF_LIBS@], - include_dirs = [@GCONF_CFLAGS@], + library_dirs = [@SOURCEVIEW_LIBDIR_CQ@], + hs_libraries = ["HSsourceview"], + extra_libraries = [@SOURCEVIEW_LIBS_CQ@], + include_dirs = [@SOURCEVIEW_CFLAGS_CQ@], c_includes = ["gtksourceview/gtksourceview.h", "gtksourceview/gtksourcemarker.h", "gtksourceview/gtksourcelanguagesmanager.h", "gtksourceview/gtksourcetag.h", "gtksourceview/gtksourcemarker.h", "gtksourceview/gtksourceiter.h"] - package_deps = ["gtk2hs"], + package_deps = ["gtk"], extra_ghc_opts = [], extra_cc_opts = [], - extra_ld_opts = [] + extra_ld_opts = [@SOURCEVIEW_LIBEXTRA_CQ@] } |
|
From: Duncan C. <dun...@us...> - 2004-12-09 18:45:10
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31883 Modified Files: ChangeLog acinclude.m4 configure.ac Makefile.am Log Message: Rename package libs to libHS{pkg}.a, ie follow ghc convention and prefix them with HS so we do not get name clashes with system libraries. Rename the gtk2hs package to be just gtk. Get the flags to put into the *pkg.in files to work properly for packages other than the main gtk pacakge by adding a couple macros to aclocal.m4 and changing all the *.pkg.in files appropriately. Eliminate use of compat/* modules and lang & data pacakges in Makefile.am. Small fix to install-data-hook target in mk/common.mk. Index: acinclude.m4 =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/acinclude.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- acinclude.m4 8 Dec 2004 13:01:11 -0000 1.2 +++ acinclude.m4 9 Dec 2004 18:44:58 -0000 1.3 @@ -1,4 +1,4 @@ -dnl Gtk+HS - Additional macros for `autoconf' +dnl gtk2hs - Additional macros for `autoconf' dnl -- Pinched from FPTOOLS/GHC dnl @@ -86,7 +86,42 @@ ifelse([$5],,, [else $5]) -fi])])dnl - +fi])dnl +dnl GTKHS_REFORMAT_PACKAGE_CFLAGS(CFLAGS, CFLAGS_CQ) +dnl +dnl for ghc package.conf files, we need to convert from +dnl CFLAGS = -DFOO -I/usr/include/bar -I/usr/include/baz +dnl to +dnl CFLAGS_CQ = "/usr/include/bar","/usr/include/baz" +dnl +AC_DEFUN([GTKHS_REFORMAT_PACKAGE_CFLAGS], +[ +C=; [$2]=; +for FLAG in [$][$1]; do + case [$]FLAG in + -I*) [$2]="[$][$2][$]C\"[$]{FLAG#-I}\""; C=",";; + esac; +done; +])dnl +dnl GTKHS_REFORMAT_PACKAGE_LIBS(LIBS, LIBS_CQ, LIBDIR_CQ, LIBEXTRA_CQ) +dnl +dnl for ghc package.conf files, we need to convert from +dnl LIBS = -Wl,--export-dynamic -lfoo -lbar -I/usr/lib/foo -I/usr/lib/bar +dnl to +dnl LIBS_CQ = "foo", "bar" +dnl LIBDIR_CQ = "/usr/lib/bar","/usr/lib/bar" +dnl LIBEXTRA_CQ = "-Wl,--export-dynamic" +dnl +AC_DEFUN([GTKHS_REFORMAT_PACKAGE_LIBS], +[ +C_LIBS=; [$2]=; C_LDIR=; [$3]=; C_XTRA=; [$4]=; +for FLAG in [$][$1]; do + case [$]FLAG in + -l*) [$2]="[$][$2][$]C_LIBS\"[$]{FLAG#-l}\""; C_LIBS=",";; + -L*) [$3]="[$][$3][$]C_LDIR\"[$]{FLAG#-I}\""; C_LDIR=",";; + *) [$4]="[$][$4][$]C_XTRA\"[$]FLAG\""; C_XTRA=",";; + esac; +done; +])dnl Index: configure.ac =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- configure.ac 8 Dec 2004 13:01:11 -0000 1.10 +++ configure.ac 9 Dec 2004 18:44:58 -0000 1.11 @@ -293,26 +293,37 @@ 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*) TMP=${FLAG#-I}; - GTK_CFLAGS_CQ="$GTK_CFLAGS_CQ$C\"$TMP\""; C=",";; - esac; -done; +GTKHS_REFORMAT_PACKAGE_CFLAGS(GTK_CFLAGS, GTK_CFLAGS_CQ) +GTKHS_REFORMAT_PACKAGE_LIBS(GTK_LIBS, GTK_LIBS_CQ, GTK_LIBDIR_CQ, GTK_LIBEXTRA_CQ) 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*) 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) +GTKHS_REFORMAT_PACKAGE_CFLAGS(SOURCEVIEW_CFLAGS, SOURCEVIEW_CFLAGS_CQ) +GTKHS_REFORMAT_PACKAGE_LIBS(SOURCEVIEW_LIBS, SOURCEVIEW_LIBS_CQ, + SOURCEVIEW_LIBDIR_CQ, SOURCEVIEW_LIBEXTRA_CQ) +AC_SUBST(SOURCEVIEW_CFLAGS_CQ) +AC_SUBST(SOURCEVIEW_LIBS_CQ) +AC_SUBST(SOURCEVIEW_LIBDIR_CQ) +AC_SUBST(SOURCEVIEW_LIBEXTRA_CQ) + +GTKHS_REFORMAT_PACKAGE_CFLAGS(LIBGLADE_CFLAGS, LIBGLADE_CFLAGS_CQ) +GTKHS_REFORMAT_PACKAGE_LIBS(LIBGLADE_LIBS, LIBGLADE_LIBS_CQ, + LIBGLADE_LIBDIR_CQ, LIBGLADE_LIBEXTRA_CQ) +AC_SUBST(LIBGLADE_CFLAGS_CQ) +AC_SUBST(LIBGLADE_LIBS_CQ) +AC_SUBST(LIBGLADE_LIBDIR_CQ) +AC_SUBST(LIBGLADE_LIBEXTRA_CQ) + +GTKHS_REFORMAT_PACKAGE_CFLAGS(GCONF_CFLAGS, GCONF_CFLAGS_CQ) +GTKHS_REFORMAT_PACKAGE_LIBS(GCONF_LIBS, GCONF_LIBS_CQ, GCONF_LIBDIR_CQ, + GCONF_LIBEXTRA_CQ) +AC_SUBST(GCONF_CFLAGS_CQ) +AC_SUBST(GCONF_LIBS_CQ) +AC_SUBST(GCONF_LIBDIR_CQ) +AC_SUBST(GCONF_LIBEXTRA_CQ) + AC_ARG_WITH(hidir, [ --with-hidir=DIR specify install dir for .hi files], [hidir=$withval], @@ -502,7 +513,7 @@ tools/c2hs/toplevel/C2HSConfig.hs gtk2hs.spec mk/chsDepend - gtk/gtk2hs.pkg + gtk/gtk.pkg mogul/mogul.pkg glade/glade.pkg gconf/gconf.pkg Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Makefile.am 8 Dec 2004 13:01:11 -0000 1.16 +++ Makefile.am 9 Dec 2004 18:44:58 -0000 1.17 @@ -12,15 +12,15 @@ SOURCEDIRS = gtk/general gtk/glib gtk/pango gtk/treeList gtk/multiline \ gtk/gdk gtk/abstract gtk/display gtk/entry gtk/misc gtk/multiline \ gtk/ornaments gtk/scrolling gtk/treeList gtk/selectors gtk/embedding \ - compat gtk/layout gtk/menuComboToolbar gtk/buttons gtk/windows \ + gtk/layout gtk/menuComboToolbar gtk/buttons gtk/windows \ tools/hierarchyGen tools/callbackGen tools/apicoverage \ tools/c2hs/base/admin tools/c2hs/base/errors \ 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/state tools/c2hs/toplevel \ - mogul glade gconf gconf/System/Gnome gconf/System/Gnome/GConf \ - sourceview + mogul glade gconf gconf/System/Gnome gconf/System/Gnome/GConf \ + sourceview EXTRA_DIST = \ tools/callbackGen/Signal.chs-boot1 \ @@ -39,11 +39,11 @@ # all packages and applications lib_LIBRARIES = \ - libgtk2hs.a \ - libmogul.a \ - libglade.a \ - libgconf.a \ - libsourceview.a + libHSgtk.a \ + libHSmogul.a \ + libHSglade.a \ + libHSgconf.a \ + libHSsourceview.a noinst_PROGRAMS = \ tools/hierarchyGen/TypeGenerator \ @@ -51,7 +51,10 @@ tools/apicoverage/Exclude \ tools/c2hs/c2hsLocal -# TypeGenerator +# +# TypeGenerator Tool +# +################################################################################ # While building the program <name>, set the variable NAME to <name> so # we can access program-specific variables like <name>_PACKAGEDEPS. The @@ -62,7 +65,7 @@ tools_hierarchyGen_TypeGenerator_MAIN = \ $(tools_hierarchyGen_TypeGenerator_SOURCES) -tools_hierarchyGen_TypeGenerator_PACKAGEDEPS = data +tools_hierarchyGen_TypeGenerator_PACKAGEDEPS = tools_hierarchyGen_TypeGenerator_SOURCES = \ tools/hierarchyGen/TypeGen.hs # Fix automake - the subdir-objects option doesn't work here. @@ -76,13 +79,17 @@ $(srcdir)/tools/hierarchyGen/hierarchy.list \ $@ $(addprefix --tag=,$(CREATE_TYPES))) -# HookGenerator +# +# HookGenerator Tool +# +################################################################################ + HookGenerator_NAME = tools/callbackGen/HookGenerator $(HookGenerator_NAME) : NAME = tools_callbackGen_HookGenerator tools_callbackGen_HookGenerator_MAIN = \ $(tools_callbackGen_HookGenerator_SOURCES) -tools_callbackGen_HookGenerator_PACKAGEDEPS = data +tools_callbackGen_HookGenerator_PACKAGEDEPS = tools_callbackGen_HookGenerator_SOURCES = \ tools/callbackGen/HookGenerator.hs am_tools_callbackGen_HookGenerator_OBJECTS = $(addsuffix .$(OBJEXT),\ @@ -98,25 +105,33 @@ $(srcdir)/tools/callbackGen/ gtk/general/Signal.chs \ $(if $(subst yes,,$(BROKENCB)),--broken)) -# API Coverage Tool +# +# API Coverage Tool +# +################################################################################ + Exclude_NAME = tools/apicoverage/Exclude $(Exclude_NAME) : NAME = tools_apicoverage_Exclude tools_apicoverage_Exclude_MAIN = \ $(tools_apicoverage_Exclude_SOURCES) -tools_apicoverage_Exclude_PACKAGEDEPS = data +tools_apicoverage_Exclude_PACKAGEDEPS = tools_apicoverage_Exclude_SOURCES = \ tools/apicoverage/Exclude.hs am_tools_apicoverage_Exclude_OBJECTS = $(addsuffix .$(OBJEXT),\ $(basename $(tools_apicoverage_Exclude_SOURCES))) MOSTLYCLEANFILES+= $(am_tools_apicoverage_Exclude_OBJECTS) -# c2hs interface generator +# +# c2hs interface generator +# +################################################################################ + tools_c2hs_c2hsLocal_NAME = tools/c2hs/c2hsLocal $(tools_c2hs_c2hsLocal_NAME) : NAME = tools_c2hs_c2hsLocal tools_c2hs_c2hsLocal_MAIN = c2hs/toplevel/Main.hs -tools_c2hs_c2hsLocal_PACKAGEDEPS = lang +tools_c2hs_c2hsLocal_PACKAGEDEPS = tools_c2hs_c2hsLocal_HEADER = tools/c2hs/toplevel/c2hs_config.h tools_c2hs_c2hsLocal_HCFLAGS = -fglasgow-exts -fffi @@ -181,20 +196,24 @@ DISTCLEANFILES+= tools_c2hs_c2hsLocal.deps -include tools_c2hs_c2hsLocal.deps -# gtk2hs GUI library -libgtk2hs_a_NAME = libgtk2hs.a -$(libgtk2hs_a_NAME) : NAME = libgtk2hs_a +# +# gtk package +# +################################################################################ -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% -D%,$(GTK_CFLAGS)) -libgtk2hs_a_CPPFLAGS = $(filter -I% -D%,$(GTK_CFLAGS)) +libHSgtk_a_NAME = libHSgtk.a +$(libHSgtk_a_NAME) : NAME = libHSgtk_a -libgtk2hs_a_SOURCES = \ +libHSgtk_a_PACKAGE = gtk/gtk.pkg +libHSgtk_a_PACKAGEDEPS = +libHSgtk_a_HEADER = gtk/gtk.h +libHSgtk_a_PRECOMP = gtk/gtk.precomp +libHSgtk_a_LIBS = @GTK_LIBS@ +libHSgtk_a_HCFLAGS = -fglasgow-exts +libHSgtk_a_CFLAGS = $(filter-out -I% -D%,$(GTK_CFLAGS)) +libHSgtk_a_CPPFLAGS = $(filter -I% -D%,$(GTK_CFLAGS)) + +libHSgtk_a_SOURCES = \ gtk/general/Hierarchy.chs \ gtk/general/Signal.chs \ gtk/glib/GValue.chs \ @@ -324,11 +343,9 @@ gtk/general/Gtk.hs \ gtk/treeList/CellRenderer.hs \ gtk/gdk/DrawWindow.hs \ - gtk/pango/Markup.hs \ - compat/LocalControl.hs \ - compat/LocalData.hs + gtk/pango/Markup.hs -libgtk2hs_a_LIBADD = \ +libHSgtk_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 \ @@ -347,46 +364,49 @@ $(CC) -c -o $@ $(@:.o=.c) -am_libgtk2hs_a_OBJECTS = \ - $(addsuffix .$(OBJEXT),$(basename $(basename $(libgtk2hs_a_SOURCES)))) +am_libHSgtk_a_OBJECTS = \ + $(addsuffix .$(OBJEXT),$(basename $(basename $(libHSgtk_a_SOURCES)))) -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)) +libHSgtk_a_CHSPPFILES = $(filter %.chs.pp,$(libHSgtk_a_SOURCES)) +libHSgtk_a_CHSFILES = \ + $(filter %.chs,$(libHSgtk_a_SOURCES:.chs.pp=.chs)) +libHSgtk_a_CHSFILES_HS = $(libHSgtk_a_CHSFILES:.chs=.hs) +libHSgtk_a_HSCFILES = $(filter %.hsc, $(libHSgtk_a_SOURCES)) +libHSgtk_a_HSCFILES_HS = $(libHSgtk_a_HSCFILES:.hsc=.hs) +libHSgtk_a_BUILDSOURCES = \ + $(libHSgtk_a_CHSPPFILES:.chs.pp=.chs) \ + $(libHSgtk_a_CHSFILES_HS) \ + $(libHSgtk_a_HSCFILES_HS) +libHSgtk_a_HSFILES = \ + $(filter %.hs,$(libHSgtk_a_BUILDSOURCES)) \ + $(filter %.hs,$(libHSgtk_a_SOURCES)) # add prefix nobase_ when changing to hierarchical module namespace -hi_SCRIPTS = $(libgtk2hs_a_HSFILES:.hs=.hi) +hi_SCRIPTS = $(libHSgtk_a_HSFILES:.hs=.hi) -MOSTLYCLEANFILES+ = $(am_libgtk2hs_a_OBJECTS) -MOSTLYCLEANFILES+ = $(libgtk2hs_a_HSFILES:.hs=.hi) -CLEANFILES+= $(libgtk2hs_a_BUILDSOURCES) +MOSTLYCLEANFILES+ = $(am_libHSgtk_a_OBJECTS) +MOSTLYCLEANFILES+ = $(libHSgtk_a_HSFILES:.hs=.hi) +CLEANFILES+= $(libHSgtk_a_BUILDSOURCES) -DISTCLEANFILES+= libgtk2hs_a.deps $(libgtk2hs_a_CHSFILES_HS:.hs=.dep) --include libgtk2hs_a.deps $(libgtk2hs_a_CHSFILES_HS:.hs=.dep) +DISTCLEANFILES+= libHSgtk_a.deps $(libHSgtk_a_CHSFILES_HS:.hs=.dep) +-include libHSgtk_a.deps $(libHSgtk_a_CHSFILES_HS:.hs=.dep) +# +# mogul package +# +################################################################################ -# mogul package -libmogul_a_NAME = libmogul.a -$(libmogul_a_NAME) : NAME = libmogul_a +libHSmogul_a_NAME = libHSmogul.a +$(libHSmogul_a_NAME) : NAME = libHSmogul_a -libmogul_a_PACKAGE = mogul/mogul.pkg -libmogul_a_PACKAGEDEPS = -libmogul_a_LIBS = -libmogul_a_HCFLAGS = -libmogul_a_CFLAGS = -libmogul_a_CPPFLAGS = $(CPPFLAGS) +libHSmogul_a_PACKAGE = mogul/mogul.pkg +libHSmogul_a_PACKAGEDEPS = +libHSmogul_a_LIBS = +libHSmogul_a_HCFLAGS = +libHSmogul_a_CFLAGS = +libHSmogul_a_CPPFLAGS = $(CPPFLAGS) -libmogul_a_SOURCES = \ +libHSmogul_a_SOURCES = \ mogul/GetWidget.hs \ mogul/MDialog.hs \ mogul/Mogul.hs \ @@ -394,38 +414,42 @@ mogul/TreeList.hs \ mogul/WidgetTable.hs -libmogul_a_LIBADD = libgtk2hs.a +libHSmogul_a_LIBADD = libHSgtk.a -am_libmogul_a_OBJECTS = \ - $(addsuffix .$(OBJEXT),$(basename $(basename $(libmogul_a_SOURCES)))) +am_libHSmogul_a_OBJECTS = \ + $(addsuffix .$(OBJEXT),$(basename $(basename $(libHSmogul_a_SOURCES)))) -libmogul_a_HSFILES = $(libmogul_a_SOURCES) -.PRECIOUS: $(libmogul_a_HSFILES:.hs=hi) +libHSmogul_a_HSFILES = $(libHSmogul_a_SOURCES) +.PRECIOUS: $(libHSmogul_a_HSFILES:.hs=hi) -MOSTLYCLEANFILES+ = $(am_libmogul_a_OBJECTS) -MOSTLYCLEANFILES+ = $(libmogul_a_HSFILES:.hs=.hi) +MOSTLYCLEANFILES+ = $(am_libHSmogul_a_OBJECTS) +MOSTLYCLEANFILES+ = $(libHSmogul_a_HSFILES:.hs=.hi) -DISTCLEANFILES+= libmogul_a.deps --include libmogul_a.deps +DISTCLEANFILES+= libHSmogul_a.deps +-include libHSmogul_a.deps -# glade package -libglade_a_NAME = libglade.a -$(libglade_a_NAME) : NAME = libglade_a +# +# glade package +# +################################################################################ -libglade_a_PACKAGE = glade/glade.pkg -libglade_a_PACKAGEDEPS = -libglade_a_HEADER = glade/glade.h -libglade_a_PRECOMP = glade/glade.precomp -libglade_a_LIBS = $(LIBGLADE_LIBS) -libglade_a_HCFLAGS = -fglasgow-exts -libglade_a_CFLAGS = $(filter-out -I% -D%,$(GTK_CFLAGS) $(LIBGLADE_CFLAGS)) -libglade_a_CPPFLAGS = $(filter -I% -D%,$(GTK_CFLAGS) $(LIBGLADE_CFLAGS)) +libHSglade_a_NAME = libHSglade.a +$(libHSglade_a_NAME) : NAME = libHSglade_a -libglade_a_SOURCES = \ +libHSglade_a_PACKAGE = glade/glade.pkg +libHSglade_a_PACKAGEDEPS = +libHSglade_a_HEADER = glade/glade.h +libHSglade_a_PRECOMP = glade/glade.precomp +libHSglade_a_LIBS = $(LIBGLADE_LIBS) +libHSglade_a_HCFLAGS = -fglasgow-exts +libHSglade_a_CFLAGS = $(filter-out -I% -D%,$(GTK_CFLAGS) $(LIBGLADE_CFLAGS)) +libHSglade_a_CPPFLAGS = $(filter -I% -D%,$(GTK_CFLAGS) $(LIBGLADE_CFLAGS)) + +libHSglade_a_SOURCES = \ glade/GladeType.chs \ glade/Glade.chs -libglade_a_LIBADD = libgtk2hs.a +libHSglade_a_LIBADD = libHSgtk.a glade/GladeType.chs : $(srcdir)/tools/hierarchyGen/hierarchy.list \ $(srcdir)/tools/hierarchyGen/TypeGenerator @@ -433,50 +457,54 @@ $(srcdir)/tools/hierarchyGen/hierarchy.list \ $@ --tag=libglade --lib=glade --prefix=glade) -am_libglade_a_OBJECTS = \ - $(addsuffix .$(OBJEXT),$(basename $(basename $(libglade_a_SOURCES)))) +am_libHSglade_a_OBJECTS = \ + $(addsuffix .$(OBJEXT),$(basename $(basename $(libHSglade_a_SOURCES)))) -libglade_a_CHSPPFILES = $(filter %.chs.pp,$(libglade_a_SOURCES)) -libglade_a_CHSFILES = \ - $(filter %.chs,$(libglade_a_SOURCES:.chs.pp=.chs)) -libglade_a_CHSFILES_HS = $(libglade_a_CHSFILES:.chs=.hs) -libglade_a_HSCFILES = $(filter %.hsc, $(libglade_a_SOURCES)) -libglade_a_HSCFILES_HS = $(libglade_a_HSCFILES:.hsc=.hs) -libglade_a_BUILDSOURCES = \ - $(libglade_a_CHSPPFILES:.chs.pp=.chs) \ - $(libglade_a_CHSFILES_HS) \ +libHSglade_a_CHSPPFILES = $(filter %.chs.pp,$(libHSglade_a_SOURCES)) +libHSglade_a_CHSFILES = \ + $(filter %.chs,$(libHSglade_a_SOURCES:.chs.pp=.chs)) +libHSglade_a_CHSFILES_HS = $(libHSglade_a_CHSFILES:.chs=.hs) +libHSglade_a_HSCFILES = $(filter %.hsc, $(libHSglade_a_SOURCES)) +libHSglade_a_HSCFILES_HS = $(libHSglade_a_HSCFILES:.hsc=.hs) +libHSglade_a_BUILDSOURCES = \ + $(libHSglade_a_CHSPPFILES:.chs.pp=.chs) \ + $(libHSglade_a_CHSFILES_HS) \ glade/GladeType.chs -libglade_a_HSFILES = \ - $(filter %.hs,$(libglade_a_BUILDSOURCES)) \ - $(filter %.hs,$(libglade_a_SOURCES)) +libHSglade_a_HSFILES = \ + $(filter %.hs,$(libHSglade_a_BUILDSOURCES)) \ + $(filter %.hs,$(libHSglade_a_SOURCES)) -MOSTLYCLEANFILES += $(am_libglade_a_OBJECTS) -MOSTLYCLEANFILES += $(libglade_a_HSFILES:.hs=.hi) -CLEANFILES += $(libglade_a_BUILDSOURCES) +MOSTLYCLEANFILES += $(am_libHSglade_a_OBJECTS) +MOSTLYCLEANFILES += $(libHSglade_a_HSFILES:.hs=.hi) +CLEANFILES += $(libHSglade_a_BUILDSOURCES) -DISTCLEANFILES+= libglade_a.deps $(libglade_a_CHSFILES_HS:.hs=.dep) --include libglade_a.deps $(libglade_a_CHSFILES:.chs=.dep) +DISTCLEANFILES+= libHSglade_a.deps $(libHSglade_a_CHSFILES_HS:.hs=.dep) +-include libHSglade_a.deps $(libHSglade_a_CHSFILES:.chs=.dep) -# gconf package -libgconf_a_NAME = libgconf.a -$(libgconf_a_NAME) : NAME = libgconf_a +# +# gconf package +# +################################################################################ -libgconf_a_PACKAGE = gconf/gconf.pkg -libgconf_a_PACKAGEDEPS = -libgconf_a_HEADER = gconf/gconf-client.h -libgconf_a_PRECOMP = gconf/gconf.precomp -libgconf_a_LIBS = $(GCONF_LIBS) -libgconf_a_HCFLAGS = -fglasgow-exts -fallow-overlapping-instances -libgconf_a_CFLAGS = $(filter-out -I% -D%,$(GTK_CFLAGS) $(GCONF_CFLAGS)) -libgconf_a_CPPFLAGS = $(filter -I% -D%,$(GTK_CFLAGS) $(GCONF_CFLAGS)) +libHSgconf_a_NAME = libHSgconf.a +$(libHSgconf_a_NAME) : NAME = libHSgconf_a -libgconf_a_SOURCES = \ +libHSgconf_a_PACKAGE = gconf/gconf.pkg +libHSgconf_a_PACKAGEDEPS = +libHSgconf_a_HEADER = gconf/gconf-client.h +libHSgconf_a_PRECOMP = gconf/gconf.precomp +libHSgconf_a_LIBS = $(GCONF_LIBS) +libHSgconf_a_HCFLAGS = -fglasgow-exts -fallow-overlapping-instances +libHSgconf_a_CFLAGS = $(filter-out -I% -D%,$(GTK_CFLAGS) $(GCONF_CFLAGS)) +libHSgconf_a_CPPFLAGS = $(filter -I% -D%,$(GTK_CFLAGS) $(GCONF_CFLAGS)) + +libHSgconf_a_SOURCES = \ gconf/System/Gnome/GConf/GConfType.chs \ gconf/System/Gnome/GConf/GConfValue.chs \ gconf/System/Gnome/GConf/GConfClient.chs \ gconf/System/Gnome/GConf.hs -libgconf_a_LIBADD = libgtk2hs.a +libHSgconf_a_LIBADD = libHSgtk.a gconf/System/Gnome/GConf/GConfType.chs : \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ @@ -486,45 +514,48 @@ $@ --tag=gconf --lib=gconf --prefix=gconf \ --modname=System.Gnome.GConf.GConfType) -am_libgconf_a_OBJECTS = \ - $(addsuffix .$(OBJEXT),$(basename $(basename $(libgconf_a_SOURCES)))) +am_libHSgconf_a_OBJECTS = \ + $(addsuffix .$(OBJEXT),$(basename $(basename $(libHSgconf_a_SOURCES)))) -libgconf_a_CHSPPFILES = $(filter %.chs.pp,$(libgconf_a_SOURCES)) -libgconf_a_CHSFILES = \ - $(filter %.chs,$(libgconf_a_SOURCES:.chs.pp=.chs)) -libgconf_a_CHSFILES_HS = $(libgconf_a_CHSFILES:.chs=.hs) -libgconf_a_HSCFILES = $(filter %.hsc, $(libgconf_a_SOURCES)) -libgconf_a_HSCFILES_HS = $(libgconf_a_HSCFILES:.hsc=.hs) -libgconf_a_BUILDSOURCES = \ - $(libgconf_a_CHSPPFILES:.chs.pp=.chs) \ - $(libgconf_a_CHSFILES_HS) \ +libHSgconf_a_CHSPPFILES = $(filter %.chs.pp,$(libHSgconf_a_SOURCES)) +libHSgconf_a_CHSFILES = \ + $(filter %.chs,$(libHSgconf_a_SOURCES:.chs.pp=.chs)) +libHSgconf_a_CHSFILES_HS = $(libHSgconf_a_CHSFILES:.chs=.hs) +libHSgconf_a_HSCFILES = $(filter %.hsc, $(libHSgconf_a_SOURCES)) +libHSgconf_a_HSCFILES_HS = $(libHSgconf_a_HSCFILES:.hsc=.hs) +libHSgconf_a_BUILDSOURCES = \ + $(libHSgconf_a_CHSPPFILES:.chs.pp=.chs) \ + $(libHSgconf_a_CHSFILES_HS) \ gconf/System/Gnome/GConf/GConfType.chs -libgconf_a_HSFILES = \ - $(filter %.hs,$(libgconf_a_BUILDSOURCES)) \ - $(filter %.hs,$(libgconf_a_SOURCES)) +libHSgconf_a_HSFILES = \ + $(filter %.hs,$(libHSgconf_a_BUILDSOURCES)) \ + $(filter %.hs,$(libHSgconf_a_SOURCES)) -MOSTLYCLEANFILES += $(am_libgconf_a_OBJECTS) -MOSTLYCLEANFILES += $(libgconf_a_HSFILES:.hs=.hi) -CLEANFILES += $(libgconf_a_BUILDSOURCES) +MOSTLYCLEANFILES += $(am_libHSgconf_a_OBJECTS) +MOSTLYCLEANFILES += $(libHSgconf_a_HSFILES:.hs=.hi) +CLEANFILES += $(libHSgconf_a_BUILDSOURCES) -DISTCLEANFILES+= libgconf_a.deps $(libgconf_a_CHSFILES_HS:.hs=.dep) --include libgconf_a.deps $(libgconf_a_CHSFILES:.chs=.dep) +DISTCLEANFILES+= libHSgconf_a.deps $(libHSgconf_a_CHSFILES_HS:.hs=.dep) +-include libHSgconf_a.deps $(libHSgconf_a_CHSFILES:.chs=.dep) +# +# sourceview package +# +################################################################################ -# sourceview package -libsourceview_a_NAME = libsourceview.a -$(libsourceview_a_NAME) : NAME = libsourceview_a +libHSsourceview_a_NAME = libHSsourceview.a +$(libHSsourceview_a_NAME) : NAME = libHSsourceview_a -libsourceview_a_PACKAGE = sourceview/sourceview.pkg -libsourceview_a_PACKAGEDEPS = data -libsourceview_a_HEADER = sourceview.h -libsourceview_a_PRECOMP = sourceview/sourceview.precomp -libsourceview_a_LIBS = $(SOURCEVIEW_LIBS) -libsourceview_a_HCFLAGS = -fglasgow-exts -libsourceview_a_CFLAGS = $(filter-out -I% -D%,$(GTK_CFLAGS) $(SOURCEVIEW_CFLAGS)) -libsourceview_a_CPPFLAGS = $(filter -I% -D%,$(GTK_CFLAGS) $(SOURCEVIEW_CFLAGS)) -Isourceview +libHSsourceview_a_PACKAGE = sourceview/sourceview.pkg +libHSsourceview_a_PACKAGEDEPS = +libHSsourceview_a_HEADER = sourceview.h +libHSsourceview_a_PRECOMP = sourceview/sourceview.precomp +libHSsourceview_a_LIBS = $(SOURCEVIEW_LIBS) +libHSsourceview_a_HCFLAGS = -fglasgow-exts +libHSsourceview_a_CFLAGS = $(filter-out -I% -D%,$(GTK_CFLAGS) $(SOURCEVIEW_CFLAGS)) +libHSsourceview_a_CPPFLAGS = $(filter -I% -D%,$(GTK_CFLAGS) $(SOURCEVIEW_CFLAGS)) -Isourceview -libsourceview_a_SOURCES = \ +libHSsourceview_a_SOURCES = \ sourceview/SourceViewType.chs \ sourceview/SourceBuffer.chs \ sourceview/SourceIter.chs \ @@ -537,7 +568,7 @@ sourceview/SourceTagTable.chs \ sourceview/SourceView.chs -libsourceview_a_LIBADD = libgtk2hs.a +libHSsourceview_a_LIBADD = libHSgtk.a sourceview/SourceViewType.chs : \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ @@ -546,36 +577,36 @@ $(srcdir)/tools/hierarchyGen/hierarchy.list \ $@ --tag=sourceview) -am_libsourceview_a_OBJECTS = \ - $(addsuffix .$(OBJEXT),$(basename $(basename $(libsourceview_a_SOURCES)))) +am_libHSsourceview_a_OBJECTS = \ + $(addsuffix .$(OBJEXT),$(basename $(basename $(libHSsourceview_a_SOURCES)))) -libsourceview_a_CHSPPFILES = $(filter %.chs.pp,$(libsourceview_a_SOURCES)) -libsourceview_a_CHSFILES = \ - $(filter %.chs,$(libsourceview_a_SOURCES:.chs.pp=.chs)) -libsourceview_a_CHSFILES_HS = $(libsourceview_a_CHSFILES:.chs=.hs) -libsourceview_a_HSCFILES = $(filter %.hsc, $(libsourceview_a_SOURCES)) -libsourceview_a_HSCFILES_HS = $(libsourceview_a_HSCFILES:.hsc=.hs) -libsourceview_a_BUILDSOURCES = \ - $(libsourceview_a_CHSPPFILES:.chs.pp=.chs) \ - $(libsourceview_a_CHSFILES_HS) \ - $(libsourceview_a_HSCFILES_HS) \ +libHSsourceview_a_CHSPPFILES = $(filter %.chs.pp,$(libHSsourceview_a_SOURCES)) +libHSsourceview_a_CHSFILES = \ + $(filter %.chs,$(libHSsourceview_a_SOURCES:.chs.pp=.chs)) +libHSsourceview_a_CHSFILES_HS = $(libHSsourceview_a_CHSFILES:.chs=.hs) +libHSsourceview_a_HSCFILES = $(filter %.hsc, $(libHSsourceview_a_SOURCES)) +libHSsourceview_a_HSCFILES_HS = $(libHSsourceview_a_HSCFILES:.hsc=.hs) +libHSsourceview_a_BUILDSOURCES = \ + $(libHSsourceview_a_CHSPPFILES:.chs.pp=.chs) \ + $(libHSsourceview_a_CHSFILES_HS) \ + $(libHSsourceview_a_HSCFILES_HS) \ sourceview/SourceViewType.chs -libsourceview_a_HSFILES = \ - $(filter %.hs,$(libsourceview_a_BUILDSOURCES)) \ - $(filter %.hs,$(libsourceview_a_SOURCES)) +libHSsourceview_a_HSFILES = \ + $(filter %.hs,$(libHSsourceview_a_BUILDSOURCES)) \ + $(filter %.hs,$(libHSsourceview_a_SOURCES)) -MOSTLYCLEANFILES += $(am_libsourceview_a_OBJECTS) -MOSTLYCLEANFILES += $(libsourceview_a_HSFILES:.hs=.hi) -CLEANFILES += $(libsourceview_a_BUILDSOURCES) +MOSTLYCLEANFILES += $(am_libHSsourceview_a_OBJECTS) +MOSTLYCLEANFILES += $(libHSsourceview_a_HSFILES:.hs=.hi) +CLEANFILES += $(libHSsourceview_a_BUILDSOURCES) -DISTCLEANFILES+= libsourceview_a.deps $(libsourceview_a_CHSFILES_HS:.hs=.dep) --include libsourceview_a.deps $(libsourceview_a_CHSFILES:.chs=.dep) +DISTCLEANFILES+= libHSsourceview_a.deps $(libHSsourceview_a_CHSFILES_HS:.hs=.dep) +-include libHSsourceview_a.deps $(libHSsourceview_a_CHSFILES:.chs=.dep) # All generated source files go here. -BUILDSOURCES = $(libgtk2hs_a_BUILDSOURCES) \ - $(libglade_a_BUILDSOURCES) \ - $(libgconf_a_BUILDSOURCES) \ - $(libsourceview_a_BUILDSOURCES) +BUILDSOURCES = $(libHSgtk_a_BUILDSOURCES) \ + $(libHSglade_a_BUILDSOURCES) \ + $(libHSgconf_a_BUILDSOURCES) \ + $(libHSsourceview_a_BUILDSOURCES) include mk/common.mk Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.246 retrieving revision 1.247 diff -u -d -r1.246 -r1.247 --- ChangeLog 9 Dec 2004 18:25:44 -0000 1.246 +++ ChangeLog 9 Dec 2004 18:44:58 -0000 1.247 @@ -13,6 +13,23 @@ packages. This should still work all the way back to ghc 5.04.x, though this needs testing. + * mk/common.mk: make install-data-hook more likely to work by adding a + ';' after each command to execute. Also limit tools memory hunger. + + * acinclude.m4, configure.ac: add two new macros for changing the + representation of the *_CFLAGS so they can be stuck into the *.pkg + files. The macros do exactly the same thing as the existing code in + configure.ac but we now want to do it for all the packages. + + * gtk/gtk.pkg.in, mogul/mogul.pkg.in, sourceview/sourceview.pkg.in, + glade/glade.pkg.in, gconf/gconf.pkg.in: update these to use the new + variables set by the above macros. Also change the name of the gtk2hs + package to be just gtk and prefix all package lib names with HS. + + * Makefile.am: make package library names start with HS, ie libHSgtk.a + Also eliminate the compat/* modules and package deps on the data and + lang packages as they are all no longer needed. + 2004-12-8 Duncan Coutts <du...@co...> * acinclude.m4: fix an automake warning about underquoted definitions |
|
From: Duncan C. <dun...@us...> - 2004-12-09 18:45:10
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31883/mk Modified Files: common.mk Log Message: Rename package libs to libHS{pkg}.a, ie follow ghc convention and prefix them with HS so we do not get name clashes with system libraries. Rename the gtk2hs package to be just gtk. Get the flags to put into the *pkg.in files to work properly for packages other than the main gtk pacakge by adding a couple macros to aclocal.m4 and changing all the *.pkg.in files appropriately. Eliminate use of compat/* modules and lang & data pacakges in Makefile.am. Small fix to install-data-hook target in mk/common.mk. Index: common.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- common.mk 8 Dec 2004 00:08:13 -0000 1.40 +++ common.mk 9 Dec 2004 18:45:01 -0000 1.41 @@ -59,7 +59,7 @@ # Same for .chi .PRECIOUS: %.chi -HSTOOLFLAGS = -H500m +HSTOOLFLAGS = -H500m -M650m .PHONY: debug debug : @@ -116,7 +116,7 @@ $(foreach pkgname,$(lib_LIBRARIES), \ $(GHCPKG) $(addprefix -f ,$(PKGCONF)) -a -g \ -Dprefix=$(prefix) -Dexec_prefix=$(exec_prefix) \ - -i $(call getVar,$(pkgname),PACKAGE)) + -i $(call getVar,$(pkgname),PACKAGE);) uninstall-hook : $(foreach pkgname,$(lib_LIBRARIES), \ |
|
From: Duncan C. <dun...@us...> - 2004-12-09 18:45:10
|
Update of /cvsroot/gtk2hs/gtk2hs/gconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31883/gconf Modified Files: gconf.pkg.in Log Message: Rename package libs to libHS{pkg}.a, ie follow ghc convention and prefix them with HS so we do not get name clashes with system libraries. Rename the gtk2hs package to be just gtk. Get the flags to put into the *pkg.in files to work properly for packages other than the main gtk pacakge by adding a couple macros to aclocal.m4 and changing all the *.pkg.in files appropriately. Eliminate use of compat/* modules and lang & data pacakges in Makefile.am. Small fix to install-data-hook target in mk/common.mk. Index: gconf.pkg.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gconf/gconf.pkg.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gconf.pkg.in 8 Dec 2004 13:01:13 -0000 1.1 +++ gconf.pkg.in 9 Dec 2004 18:44:59 -0000 1.2 @@ -1,15 +1,15 @@ Package { name = "gconf", - auto = True, + auto = False, import_dirs = ["@hidir@"], source_dirs = [], - library_dirs = [], - hs_libraries = ["gconf"], - extra_libraries = [@GCONF_LIBS@], - include_dirs = [@GCONF_CFLAGS@], + library_dirs = [@GCONF_LIBDIR_CQ@], + hs_libraries = ["HSgconf"], + extra_libraries = [@GCONF_LIBS_CQ@], + include_dirs = [@GCONF_CFLAGS_CQ@], c_includes = ["gconf/gconf-client.h"], - package_deps = ["gtk2hs"], + package_deps = ["gtk"], extra_ghc_opts = [], extra_cc_opts = [], - extra_ld_opts = [] + extra_ld_opts = [@GCONF_LIBEXTRA_CQ@] } |
|
From: Duncan C. <dun...@us...> - 2004-12-09 18:45:08
|
Update of /cvsroot/gtk2hs/gtk2hs/glade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31883/glade Modified Files: glade.pkg.in Log Message: Rename package libs to libHS{pkg}.a, ie follow ghc convention and prefix them with HS so we do not get name clashes with system libraries. Rename the gtk2hs package to be just gtk. Get the flags to put into the *pkg.in files to work properly for packages other than the main gtk pacakge by adding a couple macros to aclocal.m4 and changing all the *.pkg.in files appropriately. Eliminate use of compat/* modules and lang & data pacakges in Makefile.am. Small fix to install-data-hook target in mk/common.mk. Index: glade.pkg.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/glade/glade.pkg.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- glade.pkg.in 8 Dec 2004 13:01:13 -0000 1.1 +++ glade.pkg.in 9 Dec 2004 18:44:59 -0000 1.2 @@ -3,13 +3,13 @@ auto = False, import_dirs = ["@hidir@"], source_dirs = [], - library_dirs = [], - hs_libraries = ["glade"], - extra_libraries = [@LIBGLADE_LIBS@], - include_dirs = [@LIBGLADE_CFLAGS@], + library_dirs = [@LIBGLADE_LIBDIR_CQ@], + hs_libraries = ["HSglade"], + extra_libraries = [@LIBGLADE_LIBS_CQ@], + include_dirs = [@LIBGLADE_CFLAGS_CQ@], c_includes = ["glade/glade.h"], - package_deps = ["gtk2hs"], + package_deps = ["gtk"], extra_ghc_opts = [], extra_cc_opts = [], - extra_ld_opts = [] + extra_ld_opts = [@LIBGLADE_LIBEXTRA_CQ@] } |
|
From: Duncan C. <dun...@us...> - 2004-12-09 18:26:53
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/general In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28179/gtk/general Modified Files: FFI.hs General.chs StockItems.hsc Structs.hsc Log Message: Change some import modules to use modern hierarchical modules so we no longer need the LocalData or LocalControl modules, nor the data or lang packages. This should still work all the way back to ghc 5.04.x, though it needs testing. Index: StockItems.hsc =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/general/StockItems.hsc,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- StockItems.hsc 23 May 2004 15:58:48 -0000 1.10 +++ StockItems.hsc 9 Dec 2004 18:26:01 -0000 1.11 @@ -124,7 +124,7 @@ import Monad (liftM) import FFI -import LocalData(unsafePerformIO) -- to read CStrings lazyly +import Foreign (unsafePerformIO) -- to read CStrings lazyly import GList (GSList, fromGSListRev) import Events (Modifier) Index: Structs.hsc =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/general/Structs.hsc,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- Structs.hsc 8 Aug 2004 19:34:14 -0000 1.27 +++ Structs.hsc 9 Dec 2004 18:26:01 -0000 1.28 @@ -95,14 +95,14 @@ import Monad (liftM) import FFI -import LocalData (testBit) +import Data.Bits (testBit) import Object (makeNewObject) import GObject (makeNewGObject) import Hierarchy import GdkEnums (Function, Fill, SubwindowMode, LineStyle, CapStyle, JoinStyle) import Enums (StateType) -import IORef -import Exception +import Data.IORef +import Control.Exception #include <gtk/gtk.h> Index: FFI.hs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/general/FFI.hs,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- FFI.hs 10 Aug 2004 14:51:46 -0000 1.5 +++ FFI.hs 9 Dec 2004 18:26:01 -0000 1.6 @@ -46,7 +46,7 @@ import Monad (liftM) import Char -import LocalData(unsafePerformIO) +import Foreign (unsafePerformIO) import Data.Bits import Foreign.C Index: General.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/general/General.chs,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- General.chs 10 Aug 2004 14:51:46 -0000 1.14 +++ General.chs 9 Dec 2004 18:26:01 -0000 1.15 @@ -57,8 +57,8 @@ import Monad (liftM, mapM) import FFI -import LocalData(newIORef, readIORef, writeIORef) -import Exception (ioError, Exception(ErrorCall)) +import Data.IORef (newIORef, readIORef, writeIORef) +import Control.Exception (ioError, Exception(ErrorCall)) import Object (makeNewObject) {#import Hierarchy#} {#import Signal#} |
|
From: Duncan C. <dun...@us...> - 2004-12-09 18:26:42
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/gdk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28179/gtk/gdk Modified Files: Events.hsc GC.chs GdkEnums.chs Keys.chs Pixbuf.chs Log Message: Change some import modules to use modern hierarchical modules so we no longer need the LocalData or LocalControl modules, nor the data or lang packages. This should still work all the way back to ghc 5.04.x, though it needs testing. Index: GdkEnums.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/gdk/GdkEnums.chs,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- GdkEnums.chs 23 May 2004 15:55:36 -0000 1.7 +++ GdkEnums.chs 9 Dec 2004 18:26:01 -0000 1.8 @@ -47,7 +47,7 @@ Flags(fromFlags,toFlags) ) where -import LocalData((.|.)) +import Data.Bits ((.|.)) class (Enum a, Bounded a) => Flags a where fromFlags :: [a] -> Int Index: Pixbuf.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/gdk/Pixbuf.chs,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Pixbuf.chs 16 Jul 2004 15:13:00 -0000 1.8 +++ Pixbuf.chs 9 Dec 2004 18:26:01 -0000 1.9 @@ -89,9 +89,9 @@ import Structs (Rectangle(..)) import GError (GError(..), GErrorClass(..), GErrorDomain, checkGError, checkGErrorWithCont) -import LocalData (unsafePerformIO) -import Exception (bracket) -import LocalData ((.|.), shiftL) +import Foreign (unsafePerformIO) +import Control.Exception(bracket) +import Data.Bits ((.|.), shiftL) {#context prefix="gdk" #} Index: GC.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/gdk/GC.chs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- GC.chs 23 May 2004 15:55:36 -0000 1.4 +++ GC.chs 9 Dec 2004 18:26:01 -0000 1.5 @@ -65,7 +65,7 @@ import Monad (liftM, when) import Maybe (fromJust, isJust) -import Exception(handle) +import Control.Exception (handle) import FFI import GObject (makeNewGObject) Index: Keys.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/gdk/Keys.chs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Keys.chs 23 May 2004 15:55:36 -0000 1.3 +++ Keys.chs 9 Dec 2004 18:26:01 -0000 1.4 @@ -33,7 +33,7 @@ import FFI -import LocalData(unsafePerformIO) +import Foreign (unsafePerformIO) {#context lib="libgdk" prefix ="gdk"#} Index: Events.hsc =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/gdk/Events.hsc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Events.hsc 23 May 2004 15:55:36 -0000 1.6 +++ Events.hsc 9 Dec 2004 18:25:45 -0000 1.7 @@ -74,7 +74,7 @@ import FFI -import LocalData((.&.)) +import Data.Bits ((.&.)) import GdkEnums (VisibilityState(..), CrossingMode(..), NotifyType(..), |
|
From: Duncan C. <dun...@us...> - 2004-12-09 18:26:35
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28179 Modified Files: ChangeLog Log Message: Change some import modules to use modern hierarchical modules so we no longer need the LocalData or LocalControl modules, nor the data or lang packages. This should still work all the way back to ghc 5.04.x, though it needs testing. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.245 retrieving revision 1.246 diff -u -d -r1.245 -r1.246 --- ChangeLog 8 Dec 2004 14:51:20 -0000 1.245 +++ ChangeLog 9 Dec 2004 18:25:44 -0000 1.246 @@ -1,3 +1,18 @@ +2004-12-9 Duncan Coutts <du...@co...> + + * gtk/embedding/Embedding.hsc, gtk/entry/EntryCompletion.chs.pp, + gtk/gdk/Events.hsc, gtk/gdk/GC.chs, gtk/gdk/GdkEnums.chs, + gtk/gdk/Keys.chs, gtk/gdk/Pixbuf.chs, gtk/general/FFI.hs, + gtk/general/General.chs, gtk/general/StockItems.hsc, + gtk/general/Structs.hsc, gtk/glib/GObject.chs.pp, gtk/glib/GType.chs + gtk/treeList/StoreValue.hsc, gtk/treeList/TreeSelection.chs, + gtk/treeList/TreeView.chs.pp, mogul/TreeList.hs, mogul/WidgetTable.hs, + tools/callbackGen/Signal.chs-boot2, tools/c2hs/base/sysdep/SysDep.hs: + change some import modules to use modern hierarchical modules so we no + longer need the LocalData or LocalControl modules, nor the data or lang + packages. This should still work all the way back to ghc 5.04.x, though + this needs testing. + 2004-12-8 Duncan Coutts <du...@co...> * acinclude.m4: fix an automake warning about underquoted definitions |
|
From: Duncan C. <dun...@us...> - 2004-12-09 18:26:27
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/embedding In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28179/gtk/embedding Modified Files: Embedding.hsc Log Message: Change some import modules to use modern hierarchical modules so we no longer need the LocalData or LocalControl modules, nor the data or lang packages. This should still work all the way back to ghc 5.04.x, though it needs testing. Index: Embedding.hsc =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/embedding/Embedding.hsc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Embedding.hsc 23 May 2004 17:04:07 -0000 1.3 +++ Embedding.hsc 9 Dec 2004 18:25:45 -0000 1.4 @@ -34,7 +34,7 @@ import FFI import Hierarchy -import Exception +import Control.Exception #include<gtk/gtk.h> |
|
From: Duncan C. <dun...@us...> - 2004-12-09 18:26:25
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/entry In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28179/gtk/entry Modified Files: EntryCompletion.chs.pp Log Message: Change some import modules to use modern hierarchical modules so we no longer need the LocalData or LocalControl modules, nor the data or lang packages. This should still work all the way back to ghc 5.04.x, though it needs testing. Index: EntryCompletion.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/entry/EntryCompletion.chs.pp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- EntryCompletion.chs.pp 21 Nov 2004 15:06:13 -0000 1.1 +++ EntryCompletion.chs.pp 9 Dec 2004 18:25:45 -0000 1.2 @@ -45,7 +45,7 @@ import Monad (liftM) import FFI -import LocalData (newIORef, readIORef, writeIORef) +import Data.IORef (newIORef, readIORef, writeIORef) import GObject (makeNewGObject) import Object (makeNewObject) |
|
From: Duncan C. <dun...@us...> - 2004-12-09 18:26:25
|
Update of /cvsroot/gtk2hs/gtk2hs/tools/c2hs/base/sysdep In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28179/tools/c2hs/base/sysdep Modified Files: SysDep.hs Log Message: Change some import modules to use modern hierarchical modules so we no longer need the LocalData or LocalControl modules, nor the data or lang packages. This should still work all the way back to ghc 5.04.x, though it needs testing. Index: SysDep.hs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/c2hs/base/sysdep/SysDep.hs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SysDep.hs 28 Nov 2004 21:19:52 -0000 1.1 +++ SysDep.hs 9 Dec 2004 18:26:03 -0000 1.2 @@ -89,16 +89,29 @@ import Ix (Ix) import Monad (when) -import IOExts (fixIO, unsafePerformIO, - IORef, newIORef, readIORef, writeIORef, - IOArray, newIOArray, boundsIOArray, readIOArray, - writeIOArray, - trace) +import Control.Monad.Fix (mfix) +import System.IO.Unsafe (unsafePerformIO, unsafeInterleaveIO) +import Data.IORef (IORef, newIORef, readIORef, writeIORef) +import Data.Array.IO (IOArray, newArray, bounds, readArray, writeArray) +import Debug.Trace (trace) -- other system-dependent components -- import SysDepPosix +-- 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) +boundsIOArray = bounds +readIOArray :: Ix i => IOArray i e -> i -> IO e +readIOArray = readArray +writeIOArray :: Ix i => IOArray i e -> i -> e -> IO () +writeIOArray = writeArray -- UNSAFE mutable variables -- ------------------------ |
|
From: Duncan C. <dun...@us...> - 2004-12-09 18:26:23
|
Update of /cvsroot/gtk2hs/gtk2hs/mogul In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28179/mogul Modified Files: TreeList.hs WidgetTable.hs Log Message: Change some import modules to use modern hierarchical modules so we no longer need the LocalData or LocalControl modules, nor the data or lang packages. This should still work all the way back to ghc 5.04.x, though it needs testing. Index: WidgetTable.hs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mogul/WidgetTable.hs,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- WidgetTable.hs 25 May 2004 00:33:35 -0000 1.6 +++ WidgetTable.hs 9 Dec 2004 18:26:03 -0000 1.7 @@ -36,9 +36,10 @@ import Monad (liftM) import Foreign import FFI (foreignPtrToPtr) -import LocalControl (MVar, newMVar, takeMVar, putMVar, readMVar) -import LocalData (unsafePerformIO, FiniteMap, emptyFM, addToFM, delFromFM, - lookupFM, elemFM) +import Control.Concurrent.MVar (MVar, newMVar, takeMVar, putMVar, readMVar) +import System.IO.Unsafe (unsafePerformIO) +import Data.FiniteMap (FiniteMap, emptyFM, addToFM, delFromFM, + lookupFM, elemFM) import Object (makeNewObject) import Hierarchy import Widget (widgetSetName, onUnrealize) Index: TreeList.hs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mogul/TreeList.hs,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- TreeList.hs 25 May 2004 00:33:35 -0000 1.10 +++ TreeList.hs 9 Dec 2004 18:26:03 -0000 1.11 @@ -128,8 +128,8 @@ -- TreeView treeViewGetPathAtPos) import qualified Gtk -import LocalData (IORef(..), newIORef, readIORef, writeIORef) -import LocalControl (throw, Exception(AssertionFailed)) +import Data.IORef (IORef(..), newIORef, readIORef, writeIORef) +import Control.Exception (throw, Exception(AssertionFailed)) -- | A skeleton of a 'ListStore' database. -- |
|
From: Duncan C. <dun...@us...> - 2004-12-09 18:26:23
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/glib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28179/gtk/glib Modified Files: GObject.chs.pp GType.chs Log Message: Change some import modules to use modern hierarchical modules so we no longer need the LocalData or LocalControl modules, nor the data or lang packages. This should still work all the way back to ghc 5.04.x, though it needs testing. Index: GType.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/glib/GType.chs,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- GType.chs 23 May 2004 16:00:53 -0000 1.5 +++ GType.chs 9 Dec 2004 18:26:01 -0000 1.6 @@ -31,7 +31,7 @@ import Monad (liftM) import FFI -import LocalData (unsafePerformIO) +import Foreign (unsafePerformIO) {# context lib="glib" prefix="g" #} Index: GObject.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/glib/GObject.chs.pp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- GObject.chs.pp 21 Nov 2004 15:06:14 -0000 1.1 +++ GObject.chs.pp 9 Dec 2004 18:26:01 -0000 1.2 @@ -37,7 +37,7 @@ import Monad (liftM) import FFI -import LocalData (newIORef, readIORef, writeIORef) +import Data.IORef (newIORef, readIORef, writeIORef) import Hierarchy (GObjectClass, GObject(..), mkGObject, toGObject, unGObject) import GValue (GValue) |
|
From: Duncan C. <dun...@us...> - 2004-12-09 18:26:13
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/treeList In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28179/gtk/treeList Modified Files: StoreValue.hsc TreeSelection.chs TreeView.chs.pp Log Message: Change some import modules to use modern hierarchical modules so we no longer need the LocalData or LocalControl modules, nor the data or lang packages. This should still work all the way back to ghc 5.04.x, though it needs testing. Index: TreeSelection.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/treeList/TreeSelection.chs,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- TreeSelection.chs 10 Aug 2004 14:51:48 -0000 1.11 +++ TreeSelection.chs 9 Dec 2004 18:26:02 -0000 1.12 @@ -59,7 +59,7 @@ ) where import Monad (liftM) -import LocalData(newIORef, readIORef, writeIORef) +import Data.IORef (newIORef, readIORef, writeIORef) import FFI import Object (makeNewObject) Index: StoreValue.hsc =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/treeList/StoreValue.hsc,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- StoreValue.hsc 23 May 2004 16:16:43 -0000 1.7 +++ StoreValue.hsc 9 Dec 2004 18:26:02 -0000 1.8 @@ -34,7 +34,7 @@ import GValue (GValue, GenericValue(..), valueInit) import GValueTypes import GType (GType) -import LocalControl (throw, Exception(AssertionFailed)) +import Control.Exception (throw, Exception(AssertionFailed)) #include <glib-object.h> Index: TreeView.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/treeList/TreeView.chs.pp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TreeView.chs.pp 21 Nov 2004 15:06:16 -0000 1.1 +++ TreeView.chs.pp 9 Dec 2004 18:26:02 -0000 1.2 @@ -144,7 +144,7 @@ import Monad (liftM, mapM) import Maybe (fromMaybe) -import LocalData(newIORef, readIORef, writeIORef) +import Data.IORef (newIORef, readIORef, writeIORef) import FFI import General (mkDestructor) |
|
From: Duncan C. <dun...@us...> - 2004-12-09 18:26:12
|
Update of /cvsroot/gtk2hs/gtk2hs/tools/callbackGen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28179/tools/callbackGen Modified Files: Signal.chs-boot2 Log Message: Change some import modules to use modern hierarchical modules so we no longer need the LocalData or LocalControl modules, nor the data or lang packages. This should still work all the way back to ghc 5.04.x, though it needs testing. Index: Signal.chs-boot2 =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/callbackGen/Signal.chs-boot2,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Signal.chs-boot2 10 Aug 2004 14:51:48 -0000 1.3 +++ Signal.chs-boot2 9 Dec 2004 18:26:03 -0000 1.4 @@ -6,7 +6,7 @@ import Monad (liftM) import FFI -import LocalData +import Data.IORef import GObject (objectRef, objectUnref) import GError (failOnGError) {#import Hierarchy#} |
|
From: Duncan C. <dun...@us...> - 2004-12-08 14:51:32
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv949 Modified Files: ChangeLog TODO Log Message: record a couple issues with the build so we don't forget Index: TODO =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/TODO,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- TODO 24 Oct 2004 17:19:18 -0000 1.6 +++ TODO 8 Dec 2004 14:51:20 -0000 1.7 @@ -1,8 +1,42 @@ TODO for gtk2hs + +8/12/2004 Duncan Coutts <du...@co...> + + * automake issues, building targets that are pulled in by the + -include *.deps .depend lines somtimes seem to happen with the + wrong $(NAME), so the CFLAGS or other $(NAME)-dependant variables + come from the wrong package. To reproduce this problem set + libmogul_a_CPPFLAGS = #nothing + + * there sould be a rule to rebuild .chi files even if the corresponding + .hs file still exists. Otherwise the build can stick and you have to + delete the .hs file to unstick it. Each .chs file should depend on the + .hs file and (or perhaps instead of) the .chi file. + 24/10/2004 Axel Simon <A....@ke...> * Hierarchy.chs: c2hs 0.13.1 produces a with<Object> functions for every newtype definition. Import withForeignPtr for this. +28/07/2004 Duncan Coutts <du...@co...> + + * new gtk 2.2 & 2.4 APIs that need to be bound: + action based manu API + GtkUIManager + GtkActionGroup + GtkAction + GtkToggleAction + GtkRadioAction + GtkToolItem + GtkToolButton + GtkSeparatorToolItem + GtkToggleToolButton + GtkRadioToolButton + file selector stuff + GtkFileFilter + GtkPlug new stuff in gtk 2.2 + gtk_plug_construct_for_display (maybe) + gtk_plug_new_for_display + 21/01/2003 Axel Simon <A....@uk...> * treeList/TreeStore.chs and treeList/ListStore.chs now use the preprocessor. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.244 retrieving revision 1.245 diff -u -d -r1.244 -r1.245 --- ChangeLog 8 Dec 2004 13:01:10 -0000 1.244 +++ ChangeLog 8 Dec 2004 14:51:20 -0000 1.245 @@ -9,6 +9,8 @@ * mogul/mogul.pkg, glade/glade.pkg, gconf/gconf.pkg, sourceview/sourceview.pkg: add new pkg files + * TODO: record a couple issues with the build + 2004-12-7 Duncan Coutts <du...@co...> * mk/common.mk: tiny tidyup |
|
From: Duncan C. <dun...@us...> - 2004-12-08 13:01:26
|
Update of /cvsroot/gtk2hs/gtk2hs/sourceview In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8972/sourceview Added Files: sourceview.pkg.in Log Message: add support to build build glade, gconf, sourceview & mogul packages also small quoting fix to acinclude.m4 .pkg.in files do not have the right flags format yet, will fix soon --- NEW FILE: sourceview.pkg.in --- Package { name = "sourceview", auto = False, import_dirs = ["@hidir@"], source_dirs = [], library_dirs = [], hs_libraries = ["sourceview"], extra_libraries = [@GCONF_LIBS@], include_dirs = [@GCONF_CFLAGS@], c_includes = ["gtksourceview/gtksourceview.h", "gtksourceview/gtksourcemarker.h", "gtksourceview/gtksourcelanguagesmanager.h", "gtksourceview/gtksourcetag.h", "gtksourceview/gtksourcemarker.h", "gtksourceview/gtksourceiter.h"] package_deps = ["gtk2hs"], extra_ghc_opts = [], extra_cc_opts = [], extra_ld_opts = [] } |
|
From: Duncan C. <dun...@us...> - 2004-12-08 13:01:26
|
Update of /cvsroot/gtk2hs/gtk2hs/gconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8972/gconf Added Files: gconf.pkg.in Log Message: add support to build build glade, gconf, sourceview & mogul packages also small quoting fix to acinclude.m4 .pkg.in files do not have the right flags format yet, will fix soon --- NEW FILE: gconf.pkg.in --- Package { name = "gconf", auto = True, import_dirs = ["@hidir@"], source_dirs = [], library_dirs = [], hs_libraries = ["gconf"], extra_libraries = [@GCONF_LIBS@], include_dirs = [@GCONF_CFLAGS@], c_includes = ["gconf/gconf-client.h"], package_deps = ["gtk2hs"], extra_ghc_opts = [], extra_cc_opts = [], extra_ld_opts = [] } |
|
From: Duncan C. <dun...@us...> - 2004-12-08 13:01:26
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8972 Modified Files: ChangeLog acinclude.m4 Makefile.am configure.ac Log Message: add support to build build glade, gconf, sourceview & mogul packages also small quoting fix to acinclude.m4 .pkg.in files do not have the right flags format yet, will fix soon Index: acinclude.m4 =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/acinclude.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- acinclude.m4 21 Jan 2003 15:53:07 -0000 1.1 +++ acinclude.m4 8 Dec 2004 13:01:11 -0000 1.2 @@ -12,7 +12,7 @@ dnl NB: Don't use `+' in sed regexps; Jonas Svensson reports problems with it dnl on Solaris 8. dnl -AC_DEFUN(GTKHS_GHC_VERSION, +AC_DEFUN([GTKHS_GHC_VERSION], [define([GTKHS_CV_GHC_VERSION], [gtkhs_cv_ghc_version])dnl AC_CACHE_CHECK([version of ghc], GTKHS_CV_GHC_VERSION, [dnl ${GHC-ghc} --version > conftestghc 2>&1 @@ -69,7 +69,7 @@ dnl NOTE: the loop could be unrolled within autoconf, but the dnl macro code would be a) longer and b) harder to debug... ;) dnl -AC_DEFUN(GTKHS_PROG_CHECK_VERSION, +AC_DEFUN([GTKHS_PROG_CHECK_VERSION], [if ( IFS="."; a="[$1]"; b="[$3]"; while test -n "$a$b" Index: configure.ac =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- configure.ac 1 Dec 2004 15:57:39 -0000 1.9 +++ configure.ac 8 Dec 2004 13:01:11 -0000 1.10 @@ -502,7 +502,11 @@ tools/c2hs/toplevel/C2HSConfig.hs gtk2hs.spec mk/chsDepend - gtk/gtk2hs.pkg], + gtk/gtk2hs.pkg + mogul/mogul.pkg + glade/glade.pkg + gconf/gconf.pkg + sourceview/sourceview.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.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Makefile.am 1 Dec 2004 16:20:34 -0000 1.15 +++ Makefile.am 8 Dec 2004 13:01:11 -0000 1.16 @@ -3,8 +3,9 @@ MOSTLYCLEANFILES = CLEANFILES = DISTCLEANFILES = *.precomp -CPPFLAGS+= $(GTK_CFLAGS) $(SOURCEVIEW_CFLAGS) $(LIBGLADE_CFLAGS) \ - $(GCONF_CFLAGS) +CPPFLAGS += $(filter -I% -D%, \ + $(GTK_CFLAGS) $(SOURCEVIEW_CFLAGS) \ + $(LIBGLADE_CFLAGS) $(GCONF_CFLAGS)) # Build c2hs before anything else. @@ -17,7 +18,9 @@ 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/state tools/c2hs/toplevel + tools/c2hs/chs tools/c2hs/gen tools/c2hs/state tools/c2hs/toplevel \ + mogul glade gconf gconf/System/Gnome gconf/System/Gnome/GConf \ + sourceview EXTRA_DIST = \ tools/callbackGen/Signal.chs-boot1 \ @@ -35,7 +38,13 @@ HSC = hsc2hs # all packages and applications -lib_LIBRARIES = libgtk2hs.a +lib_LIBRARIES = \ + libgtk2hs.a \ + libmogul.a \ + libglade.a \ + libgconf.a \ + libsourceview.a + noinst_PROGRAMS = \ tools/hierarchyGen/TypeGenerator \ tools/callbackGen/HookGenerator \ @@ -182,8 +191,8 @@ 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)) +libgtk2hs_a_CFLAGS = $(filter-out -I% -D%,$(GTK_CFLAGS)) +libgtk2hs_a_CPPFLAGS = $(filter -I% -D%,$(GTK_CFLAGS)) libgtk2hs_a_SOURCES = \ gtk/general/Hierarchy.chs \ @@ -366,7 +375,207 @@ -include libgtk2hs_a.deps $(libgtk2hs_a_CHSFILES_HS:.hs=.dep) +# mogul package +libmogul_a_NAME = libmogul.a +$(libmogul_a_NAME) : NAME = libmogul_a + +libmogul_a_PACKAGE = mogul/mogul.pkg +libmogul_a_PACKAGEDEPS = +libmogul_a_LIBS = +libmogul_a_HCFLAGS = +libmogul_a_CFLAGS = +libmogul_a_CPPFLAGS = $(CPPFLAGS) + +libmogul_a_SOURCES = \ + mogul/GetWidget.hs \ + mogul/MDialog.hs \ + mogul/Mogul.hs \ + mogul/NewWidget.hs \ + mogul/TreeList.hs \ + mogul/WidgetTable.hs + +libmogul_a_LIBADD = libgtk2hs.a + +am_libmogul_a_OBJECTS = \ + $(addsuffix .$(OBJEXT),$(basename $(basename $(libmogul_a_SOURCES)))) + +libmogul_a_HSFILES = $(libmogul_a_SOURCES) +.PRECIOUS: $(libmogul_a_HSFILES:.hs=hi) + +MOSTLYCLEANFILES+ = $(am_libmogul_a_OBJECTS) +MOSTLYCLEANFILES+ = $(libmogul_a_HSFILES:.hs=.hi) + +DISTCLEANFILES+= libmogul_a.deps +-include libmogul_a.deps + +# glade package +libglade_a_NAME = libglade.a +$(libglade_a_NAME) : NAME = libglade_a + +libglade_a_PACKAGE = glade/glade.pkg +libglade_a_PACKAGEDEPS = +libglade_a_HEADER = glade/glade.h +libglade_a_PRECOMP = glade/glade.precomp +libglade_a_LIBS = $(LIBGLADE_LIBS) +libglade_a_HCFLAGS = -fglasgow-exts +libglade_a_CFLAGS = $(filter-out -I% -D%,$(GTK_CFLAGS) $(LIBGLADE_CFLAGS)) +libglade_a_CPPFLAGS = $(filter -I% -D%,$(GTK_CFLAGS) $(LIBGLADE_CFLAGS)) + +libglade_a_SOURCES = \ + glade/GladeType.chs \ + glade/Glade.chs + +libglade_a_LIBADD = libgtk2hs.a + +glade/GladeType.chs : $(srcdir)/tools/hierarchyGen/hierarchy.list \ + $(srcdir)/tools/hierarchyGen/TypeGenerator + $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(srcdir)/tools/hierarchyGen/hierarchy.list \ + $@ --tag=libglade --lib=glade --prefix=glade) + +am_libglade_a_OBJECTS = \ + $(addsuffix .$(OBJEXT),$(basename $(basename $(libglade_a_SOURCES)))) + +libglade_a_CHSPPFILES = $(filter %.chs.pp,$(libglade_a_SOURCES)) +libglade_a_CHSFILES = \ + $(filter %.chs,$(libglade_a_SOURCES:.chs.pp=.chs)) +libglade_a_CHSFILES_HS = $(libglade_a_CHSFILES:.chs=.hs) +libglade_a_HSCFILES = $(filter %.hsc, $(libglade_a_SOURCES)) +libglade_a_HSCFILES_HS = $(libglade_a_HSCFILES:.hsc=.hs) +libglade_a_BUILDSOURCES = \ + $(libglade_a_CHSPPFILES:.chs.pp=.chs) \ + $(libglade_a_CHSFILES_HS) \ + glade/GladeType.chs +libglade_a_HSFILES = \ + $(filter %.hs,$(libglade_a_BUILDSOURCES)) \ + $(filter %.hs,$(libglade_a_SOURCES)) + +MOSTLYCLEANFILES += $(am_libglade_a_OBJECTS) +MOSTLYCLEANFILES += $(libglade_a_HSFILES:.hs=.hi) +CLEANFILES += $(libglade_a_BUILDSOURCES) + +DISTCLEANFILES+= libglade_a.deps $(libglade_a_CHSFILES_HS:.hs=.dep) +-include libglade_a.deps $(libglade_a_CHSFILES:.chs=.dep) + +# gconf package +libgconf_a_NAME = libgconf.a +$(libgconf_a_NAME) : NAME = libgconf_a + +libgconf_a_PACKAGE = gconf/gconf.pkg +libgconf_a_PACKAGEDEPS = +libgconf_a_HEADER = gconf/gconf-client.h +libgconf_a_PRECOMP = gconf/gconf.precomp +libgconf_a_LIBS = $(GCONF_LIBS) +libgconf_a_HCFLAGS = -fglasgow-exts -fallow-overlapping-instances +libgconf_a_CFLAGS = $(filter-out -I% -D%,$(GTK_CFLAGS) $(GCONF_CFLAGS)) +libgconf_a_CPPFLAGS = $(filter -I% -D%,$(GTK_CFLAGS) $(GCONF_CFLAGS)) + +libgconf_a_SOURCES = \ + gconf/System/Gnome/GConf/GConfType.chs \ + gconf/System/Gnome/GConf/GConfValue.chs \ + gconf/System/Gnome/GConf/GConfClient.chs \ + gconf/System/Gnome/GConf.hs + +libgconf_a_LIBADD = libgtk2hs.a + +gconf/System/Gnome/GConf/GConfType.chs : \ + $(srcdir)/tools/hierarchyGen/hierarchy.list \ + $(srcdir)/tools/hierarchyGen/TypeGenerator + $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(srcdir)/tools/hierarchyGen/hierarchy.list \ + $@ --tag=gconf --lib=gconf --prefix=gconf \ + --modname=System.Gnome.GConf.GConfType) + +am_libgconf_a_OBJECTS = \ + $(addsuffix .$(OBJEXT),$(basename $(basename $(libgconf_a_SOURCES)))) + +libgconf_a_CHSPPFILES = $(filter %.chs.pp,$(libgconf_a_SOURCES)) +libgconf_a_CHSFILES = \ + $(filter %.chs,$(libgconf_a_SOURCES:.chs.pp=.chs)) +libgconf_a_CHSFILES_HS = $(libgconf_a_CHSFILES:.chs=.hs) +libgconf_a_HSCFILES = $(filter %.hsc, $(libgconf_a_SOURCES)) +libgconf_a_HSCFILES_HS = $(libgconf_a_HSCFILES:.hsc=.hs) +libgconf_a_BUILDSOURCES = \ + $(libgconf_a_CHSPPFILES:.chs.pp=.chs) \ + $(libgconf_a_CHSFILES_HS) \ + gconf/System/Gnome/GConf/GConfType.chs +libgconf_a_HSFILES = \ + $(filter %.hs,$(libgconf_a_BUILDSOURCES)) \ + $(filter %.hs,$(libgconf_a_SOURCES)) + +MOSTLYCLEANFILES += $(am_libgconf_a_OBJECTS) +MOSTLYCLEANFILES += $(libgconf_a_HSFILES:.hs=.hi) +CLEANFILES += $(libgconf_a_BUILDSOURCES) + +DISTCLEANFILES+= libgconf_a.deps $(libgconf_a_CHSFILES_HS:.hs=.dep) +-include libgconf_a.deps $(libgconf_a_CHSFILES:.chs=.dep) + + +# sourceview package +libsourceview_a_NAME = libsourceview.a +$(libsourceview_a_NAME) : NAME = libsourceview_a + +libsourceview_a_PACKAGE = sourceview/sourceview.pkg +libsourceview_a_PACKAGEDEPS = data +libsourceview_a_HEADER = sourceview.h +libsourceview_a_PRECOMP = sourceview/sourceview.precomp +libsourceview_a_LIBS = $(SOURCEVIEW_LIBS) +libsourceview_a_HCFLAGS = -fglasgow-exts +libsourceview_a_CFLAGS = $(filter-out -I% -D%,$(GTK_CFLAGS) $(SOURCEVIEW_CFLAGS)) +libsourceview_a_CPPFLAGS = $(filter -I% -D%,$(GTK_CFLAGS) $(SOURCEVIEW_CFLAGS)) -Isourceview + +libsourceview_a_SOURCES = \ + sourceview/SourceViewType.chs \ + sourceview/SourceBuffer.chs \ + sourceview/SourceIter.chs \ + sourceview/SourceLanguage.chs \ + sourceview/SourceLanguagesManager.chs \ + sourceview/SourceMarker.chs \ + sourceview/SourceStyleScheme.chs \ + sourceview/SourceTag.chs \ + sourceview/SourceTagStyle.hsc \ + sourceview/SourceTagTable.chs \ + sourceview/SourceView.chs + +libsourceview_a_LIBADD = libgtk2hs.a + +sourceview/SourceViewType.chs : \ + $(srcdir)/tools/hierarchyGen/hierarchy.list \ + $(srcdir)/tools/hierarchyGen/TypeGenerator + $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(srcdir)/tools/hierarchyGen/hierarchy.list \ + $@ --tag=sourceview) + +am_libsourceview_a_OBJECTS = \ + $(addsuffix .$(OBJEXT),$(basename $(basename $(libsourceview_a_SOURCES)))) + +libsourceview_a_CHSPPFILES = $(filter %.chs.pp,$(libsourceview_a_SOURCES)) +libsourceview_a_CHSFILES = \ + $(filter %.chs,$(libsourceview_a_SOURCES:.chs.pp=.chs)) +libsourceview_a_CHSFILES_HS = $(libsourceview_a_CHSFILES:.chs=.hs) +libsourceview_a_HSCFILES = $(filter %.hsc, $(libsourceview_a_SOURCES)) +libsourceview_a_HSCFILES_HS = $(libsourceview_a_HSCFILES:.hsc=.hs) +libsourceview_a_BUILDSOURCES = \ + $(libsourceview_a_CHSPPFILES:.chs.pp=.chs) \ + $(libsourceview_a_CHSFILES_HS) \ + $(libsourceview_a_HSCFILES_HS) \ + sourceview/SourceViewType.chs +libsourceview_a_HSFILES = \ + $(filter %.hs,$(libsourceview_a_BUILDSOURCES)) \ + $(filter %.hs,$(libsourceview_a_SOURCES)) + +MOSTLYCLEANFILES += $(am_libsourceview_a_OBJECTS) +MOSTLYCLEANFILES += $(libsourceview_a_HSFILES:.hs=.hi) +CLEANFILES += $(libsourceview_a_BUILDSOURCES) + +DISTCLEANFILES+= libsourceview_a.deps $(libsourceview_a_CHSFILES_HS:.hs=.dep) +-include libsourceview_a.deps $(libsourceview_a_CHSFILES:.chs=.dep) + + # All generated source files go here. -BUILDSOURCES = $(libgtk2hs_a_BUILDSOURCES) +BUILDSOURCES = $(libgtk2hs_a_BUILDSOURCES) \ + $(libglade_a_BUILDSOURCES) \ + $(libgconf_a_BUILDSOURCES) \ + $(libsourceview_a_BUILDSOURCES) include mk/common.mk Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.243 retrieving revision 1.244 diff -u -d -r1.243 -r1.244 --- ChangeLog 8 Dec 2004 00:08:12 -0000 1.243 +++ ChangeLog 8 Dec 2004 13:01:10 -0000 1.244 @@ -1,3 +1,14 @@ +2004-12-8 Duncan Coutts <du...@co...> + + * acinclude.m4: fix an automake warning about underquoted definitions + + * Makefile.am: build glade, gconf, sourceview & mogul packages + + * configure.ac: add new .pkg files to AC_OUTPUT list + + * mogul/mogul.pkg, glade/glade.pkg, gconf/gconf.pkg, + sourceview/sourceview.pkg: add new pkg files + 2004-12-7 Duncan Coutts <du...@co...> * mk/common.mk: tiny tidyup |
|
From: Duncan C. <dun...@us...> - 2004-12-08 13:01:26
|
Update of /cvsroot/gtk2hs/gtk2hs/glade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8972/glade Added Files: glade.pkg.in Log Message: add support to build build glade, gconf, sourceview & mogul packages also small quoting fix to acinclude.m4 .pkg.in files do not have the right flags format yet, will fix soon --- NEW FILE: glade.pkg.in --- Package { name = "glade", auto = False, import_dirs = ["@hidir@"], source_dirs = [], library_dirs = [], hs_libraries = ["glade"], extra_libraries = [@LIBGLADE_LIBS@], include_dirs = [@LIBGLADE_CFLAGS@], c_includes = ["glade/glade.h"], package_deps = ["gtk2hs"], extra_ghc_opts = [], extra_cc_opts = [], extra_ld_opts = [] } |
|
From: Duncan C. <dun...@us...> - 2004-12-08 13:01:26
|
Update of /cvsroot/gtk2hs/gtk2hs/mogul In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8972/mogul Added Files: mogul.pkg.in Log Message: add support to build build glade, gconf, sourceview & mogul packages also small quoting fix to acinclude.m4 .pkg.in files do not have the right flags format yet, will fix soon --- NEW FILE: mogul.pkg.in --- Package { name = "mogul", auto = False, import_dirs = ["@hidir@"], source_dirs = [], library_dirs = [], hs_libraries = ["mogul"], extra_libraries = [], include_dirs = [], c_includes = [], package_deps = ["gtk2hs"], extra_ghc_opts = [], extra_cc_opts = [], extra_ld_opts = [] } |
|
From: Duncan C. <dun...@us...> - 2004-12-08 00:08:52
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16252 Modified Files: ChangeLog 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: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.242 retrieving revision 1.243 diff -u -d -r1.242 -r1.243 --- ChangeLog 1 Dec 2004 16:20:33 -0000 1.242 +++ ChangeLog 8 Dec 2004 00:08:12 -0000 1.243 @@ -1,3 +1,18 @@ +2004-12-7 Duncan Coutts <du...@co...> + + * mk/common.mk: tiny tidyup + + * tools/c2hs/chs/CHS.hs: apply old patch to our new c2hs, makes c2hs + deal with hierarchical module names. + + * tools/c2hs/gen/GenBind.hs: apply old patch to our new c2hs, fix + handling of typedef'ed C types. Needed for SourceMarker.chs. + + * gconf/System/Gnome/GConf/GConfClient.chs, + gconf/System/Gnome/GConf/GConfValue.chs: make these work with our + current version of c2hs. It's not entirely obvious to me if this is + an improvement in c2hs or a regression. Could do with investigating. + 2004-12-02 Jens Petersen <pet...@ha...> * configure.ac: Use modern invocation of AC_INIT with name and |
|
From: Duncan C. <dun...@us...> - 2004-12-08 00:08:47
|
Update of /cvsroot/gtk2hs/gtk2hs/tools/c2hs/gen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16252/tools/c2hs/gen Modified Files: GenBind.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: GenBind.hs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/c2hs/gen/GenBind.hs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- GenBind.hs 21 Nov 2004 21:05:41 -0000 1.1 +++ GenBind.hs 8 Dec 2004 00:08:20 -0000 1.2 @@ -140,7 +140,7 @@ findTypeObj, applyPrefixToNameSpaces, isTypedef, simplifyDecl, declrFromDecl, declrNamed, structMembers, structName, tagName, declaredName , structFromDecl, - funResultAndArgs, chaseDecl, findAndChaseDecl, + funResultAndArgs, chaseDecl, findAndChaseDecl, findObjShadow, checkForAlias, checkForOneAliasName, lookupEnum, lookupStructUnion, lookupDeclOrTag, isPtrDeclr, dropPtrDeclr, isPtrDecl, getDeclOf, isFunDeclr, @@ -507,7 +507,8 @@ -- allow `... -> fun HSTYPE' to explicitly mark function -- types if this ever becomes important traceInfoHsType hsName hsType - pointerDef isStar cNameFull hsName ptrKind isNewtype hsType isFun + realCName <- liftM (maybe cName snd) $ findObjShadow cName + pointerDef isStar realCName hsName ptrKind isNewtype hsType isFun Right tag -> do -- found a tag definition let cNameFull = tagName tag traceInfoCName "tag definition" cNameFull |
|
From: Duncan C. <dun...@us...> - 2004-12-08 00:08:46
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16252/mk Modified Files: common.mk 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: common.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- common.mk 1 Dec 2004 13:19:28 -0000 1.39 +++ common.mk 8 Dec 2004 00:08:13 -0000 1.40 @@ -11,8 +11,8 @@ $(SOURCEDIRS)))) LINK = $(strip $(HC) -o $@ $($(NAME)_HCFLAGS) \ - $(addprefix -package ,$($(NAME)_PACKAGEDEPS)) \ - $(AM_LDFLAGS) $($(NAME)_LDFLAGS)) + $(addprefix -package ,$($(NAME)_PACKAGEDEPS)) \ + $(AM_LDFLAGS) $($(NAME)_LDFLAGS)) .hs.o: $(CONFIG_H) @echo Building for $(NAME) @@ -75,7 +75,7 @@ --precomp=$($(NAME)_PRECOMP) $($(NAME)_HEADER)) .chs.pp.chs: $(CONFIG_H) - echo Preprocessing for $(NAME) + @echo Preprocessing for $(NAME) $(strip $(HSCPP) $(AM_CPPFLAGS) \ $(if $(NAME),$($(NAME)_CPPFLAGS) $($(NAME)_CFLAGS),$(CPPFLAGS)) \ $(addprefix -include ,$(CONFIG_H)) \ |
2 messages has been excluded from this view by a project administrator.
