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: <as...@us...> - 2003-11-10 09:49:49
|
Update of /cvsroot/gtk2hs/gtk2hs/tools/typehier In directory sc8-pr-cvs1:/tmp/cvs-serv10557/tools/typehier Added Files: Makefile hierarchy.list Log Message: Removed the wrong files. |
|
From: <as...@us...> - 2003-11-10 09:49:18
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1:/tmp/cvs-serv10557 Modified Files: ChangeLog Log Message: Removed the wrong files. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- ChangeLog 7 Nov 2003 15:30:40 -0000 1.99 +++ ChangeLog 10 Nov 2003 09:48:29 -0000 1.100 @@ -1,4 +1,12 @@ 2003-11-07 Axel Simon <A....@ke...> + + * tools/signals/HookGenerator.hs, tools/signals/Makefile, + tools/signals/Signal.chs-boot1, tools/signals/Signal.chs-boot2, + tools/signals/gtkmarshal.list, tools/typehier/Makefile, + tools/typehier/hierarchy.list: Dah. Removed the wrong files in the + last commit. Resurrect the right ones. + +2003-11-07 Axel Simon <A....@ke...> * tools/typehier/TypeGenerator.hs: Correct typo that caused Hierarchy.chs to include itself. |
|
From: <as...@us...> - 2003-11-10 09:48:36
|
Update of /cvsroot/gtk2hs/gtk2hs/tools/signals In directory sc8-pr-cvs1:/tmp/cvs-serv10557/tools/signals Added Files: HookGenerator.hs Makefile Signal.chs-boot1 Signal.chs-boot2 gtkmarshal.list Log Message: Removed the wrong files. |
|
From: Jens P. <pet...@re...> - 2003-11-10 08:57:36
|
Hi Axel,
>>>>> "as" == as <as...@us...> writes:
as> --- ChangeLog 4 Nov 2003 04:08:09 -0000 1.98
as> +++ ChangeLog 7 Nov 2003 15:30:40 -0000 1.99
as> @@ -1,3 +1,12 @@ +2003-11-07 Axel Simon
as> <A....@ke...>
as> + * tools/typehier/TypeGenerator.hs: Correct typo
as> that caused
as> + Hierarchy.chs to include itself.
as> +
as> + * gtk/Makefile: Use the signal and type hierarchy
as> generators in
as> + tools/.
as> +
as> + * gtk/typehier, gtk/signals: Remove the stale
as> files.
as> +
I think something went wrong with this commit. You removed
the files in $(TOP)/tools/{typehier,signals} instead of the
ones under $(TOP)/gtk/{typehier,signals} as you intended
AFAICT.
Cheers, Jens
|
|
From: <as...@us...> - 2003-11-07 15:31:49
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1:/tmp/cvs-serv16412 Modified Files: ChangeLog Log Message: Use the moved signal and hierarchy generators. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- ChangeLog 4 Nov 2003 04:08:09 -0000 1.98 +++ ChangeLog 7 Nov 2003 15:30:40 -0000 1.99 @@ -1,3 +1,12 @@ +2003-11-07 Axel Simon <A....@ke...> + * tools/typehier/TypeGenerator.hs: Correct typo that caused + Hierarchy.chs to include itself. + + * gtk/Makefile: Use the signal and type hierarchy generators in + tools/. + + * gtk/typehier, gtk/signals: Remove the stale files. + 2003-11-04 Jens Petersen <pet...@ha...> * mk/config.mk.in (COMMONINSTALLDIR): Define default base package |
|
From: <as...@us...> - 2003-11-07 15:31:19
|
Update of /cvsroot/gtk2hs/gtk2hs/tools/typehier
In directory sc8-pr-cvs1:/tmp/cvs-serv16412/tools/typehier
Modified Files:
TypeGenerator.hs
Log Message:
Use the moved signal and hierarchy generators.
Index: TypeGenerator.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/typehier/Attic/TypeGenerator.hs,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -d -r1.1 -r1.3
--- TypeGenerator.hs 21 Oct 2003 23:42:03 -0000 1.1
+++ TypeGenerator.hs 7 Nov 2003 15:30:41 -0000 1.3
@@ -110,7 +110,7 @@
\ <hierFile> a list of all possible objects, the hierarchy is\n\
\ taken from the indentation\n\
\ <outFile> is the name and path of the output file\n\
- \ <tag> generate entries that have the tag <tag>\
+ \ <tag> generate entries that have the tag <tag>\n\
\ specify `default' for types without tags\n"
exitWith $ ExitFailure 1
@@ -155,7 +155,7 @@
indent 0.ss "--".
indent 0.ss "module ".ss fname.sc '('.
-- indent 1.ss "ObjectTag(..)".
- foldl (.) id (map (\(n:_) -> ss ", ".
+ foldl (\s1 s2 -> s1.ss ", ".s2) id (map (\(n:_) ->
indent 1.ss n.ss "(".ss n.ss "), ".ss n.ss "Class(..),".
indent 1.ss "mk".ss n.ss ", un".ss n.sc ','.
indent 1.ss "castTo".ss n) objs).
@@ -165,7 +165,7 @@
indent 0.ss "import GType (typeInstanceIsA)".
-- this is a very bad hack to get the definition of the ancestors whenever
-- these are not created in this file
- (if fname/="Hierachy" then indent 0.ss "{#import Hierarchy#}" else id).
+ (if fname/="Hierarchy" then indent 0.ss "{#import Hierarchy#}" else id).
indent 0.
indent 0.ss "{#context lib=\"gtk\" prefix=\"gtk\" #}".
indent 0.
|
|
From: <as...@us...> - 2003-11-07 15:31:17
|
Update of /cvsroot/gtk2hs/gtk2hs/tools/typehier In directory sc8-pr-cvs1:/tmp/cvs-serv16412/gtk/typehier Removed Files: Makefile TypeGenerator.hs hierarchy.list Log Message: Use the moved signal and hierarchy generators. --- Makefile DELETED --- --- TypeGenerator.hs DELETED --- --- hierarchy.list DELETED --- |
|
From: <as...@us...> - 2003-11-07 15:31:01
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk In directory sc8-pr-cvs1:/tmp/cvs-serv16412/gtk Modified Files: Makefile Log Message: Use the moved signal and hierarchy generators. Index: Makefile =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Makefile,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- Makefile 4 Nov 2003 04:05:27 -0000 1.23 +++ Makefile 7 Nov 2003 15:30:40 -0000 1.24 @@ -198,39 +198,22 @@ ENABLEBROKEN = endif -general/Signal.chs : signals/HookGenerator $(MARSHALLDEFS)\ - signals/Signal.chs-boot1 signals/Signal.chs-boot2 - $(strip signals/HookGenerator $(MARSHALLDEFS) signals/ \ - general/Signal.chs $(ENABLEBROKEN)) - -EXTRA_CLEANFILES += signals/HookGenerator signal/HookGenerator.o signal/Main.hi - -EXTRA_TARFILES += signals/HookGenerator.hs signals/Makefile \ - signals/gtkmarshal.list signals/Signal.chs-boot1 \ - signals/Signal.chs-boot2 - -signals/HookGenerator : signals/HookGenerator.hs - $(MAKE) -C signals +general/Signal.chs : $(TOP)/tools/signals/Signal.chs-boot1 \ + $(TOP)/tools/signals/Signal.chs-boot2 + $(strip $(TOP)/tools/signals/HookGenerator $(MARSHALLDEFS) \ + $(TOP)/tools/signals/ general/Signal.chs $(ENABLEBROKEN)) EXTRA_CHSFILES += general/Hierarchy.chs ifeq ($(WIN32),yes) -IGNORE_TYPES = Plug Socket +CREATE_TYPES = default else -IGNORE_TYPES = +CREATE_TYPES = plugNsocket default endif -general/Hierarchy.chs : typehier/TypeGenerator typehier/hierarchy.list - $(strip typehier/TypeGenerator typehier/hierarchy.list \ - general/Hierarchy.chs $(IGNORE_TYPES)) - -EXTRA_CLEANFILES += typehier/TypeGenerator typehier/TypeGenerator.o \ - typehier/Main.hi - -EXTRA_TARFILES += typehier/TypeGenerator.hs typehier/Makefile \ - typehier/hierarchy.list - -typehier/TypeGenerator : typehier/TypeGenerator.hs - $(MAKE) -C typehier +general/Hierarchy.chs : $(TOP)/tools/typehier/hierarchy.list + $(strip $(TOP)/tools/typehier/TypeGenerator \ + $(TOP)/tools/typehier/hierarchy.list \ + general/Hierarchy.chs $(addprefix --tag=,$(CREATE_TYPES))) include $(TOP)/mk/common.mk |
|
From: <as...@us...> - 2003-11-07 15:30:47
|
Update of /cvsroot/gtk2hs/gtk2hs/tools/signals In directory sc8-pr-cvs1:/tmp/cvs-serv16412/gtk/signals Removed Files: HookGenerator.hs Makefile Signal.chs-boot1 Signal.chs-boot2 gtkmarshal.list Log Message: Use the moved signal and hierarchy generators. --- HookGenerator.hs DELETED --- --- Makefile DELETED --- --- Signal.chs-boot1 DELETED --- --- Signal.chs-boot2 DELETED --- --- gtkmarshal.list DELETED --- |
|
From: <ju...@us...> - 2003-11-04 04:08:11
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1:/tmp/cvs-serv14241 Modified Files: ChangeLog Log Message: Define INSTALLDIR for packages in library.mk now, not individual package Makefile's. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.97 retrieving revision 1.98 diff -u -d -r1.97 -r1.98 --- ChangeLog 3 Nov 2003 14:23:32 -0000 1.97 +++ ChangeLog 4 Nov 2003 04:08:09 -0000 1.98 @@ -1,3 +1,17 @@ +2003-11-04 Jens Petersen <pet...@ha...> + + * mk/config.mk.in (COMMONINSTALLDIR): Define default base package + directory name. + + * mk/library.mk (INSTALLDIR): Define default package install dir to + be under COMMONINSTALLDIR. + + * gtk/Makefile (INSTALLDIR): Drop local def and use default. + + * mogul/Makefile (INSTALLDIR): Ditto. + + * sourceview/Makefile (INSTALLDIR): Ditto. + 2003-11-03 Jens Petersen <pet...@ha...> * gtk2hs.spec.in (BuildRequires): Require gtksourceview-devel. |
|
From: <ju...@us...> - 2003-11-04 04:05:42
|
Update of /cvsroot/gtk2hs/gtk2hs/mogul In directory sc8-pr-cvs1:/tmp/cvs-serv14006/mogul Modified Files: Makefile Log Message: (INSTALLDIR): Drop local definition and use default. Index: Makefile =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mogul/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 3 Jul 2003 05:26:30 -0000 1.4 +++ Makefile 4 Nov 2003 04:05:27 -0000 1.5 @@ -4,8 +4,6 @@ PACKAGENAME = mogul -INSTALLDIR = mogul - MAIN = Mogul.hs ifeq ($(strip $(NEW_MODULE_SYS)),yes) |
|
From: <ju...@us...> - 2003-11-04 04:05:42
|
Update of /cvsroot/gtk2hs/gtk2hs/sourceview In directory sc8-pr-cvs1:/tmp/cvs-serv14006/sourceview Modified Files: Makefile Log Message: (INSTALLDIR): Drop local definition and use default. Index: Makefile =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 2 Nov 2003 23:57:58 -0000 1.3 +++ Makefile 4 Nov 2003 04:05:27 -0000 1.4 @@ -4,8 +4,6 @@ PACKAGENAME = sourceview -INSTALLDIR = gtk2hs/sourceview - MAIN = SourceView.hs # In order for ghc and c2hs to find .chi and .hi files in ../gtk/* we |
|
From: <ju...@us...> - 2003-11-04 04:05:42
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk In directory sc8-pr-cvs1:/tmp/cvs-serv14006/gtk Modified Files: Makefile Log Message: (INSTALLDIR): Drop local definition and use default. Index: Makefile =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Makefile,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Makefile 18 Jul 2003 12:33:01 -0000 1.22 +++ Makefile 4 Nov 2003 04:05:27 -0000 1.23 @@ -22,8 +22,6 @@ PACKAGENAME = gtk2 LIBNAME = gtk2hs -INSTALLDIR = gtk2hs - MAIN = general/Gtk.hs HEADER = gtk/gtk.h |
|
From: <ju...@us...> - 2003-11-04 04:04:36
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1:/tmp/cvs-serv13892/mk Modified Files: library.mk Log Message: (INSTALLDIR): Define default package install dir to be under COMMONINSTALLDIR. Index: library.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/library.mk,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- library.mk 15 Jul 2003 08:47:18 -0000 1.18 +++ library.mk 4 Nov 2003 04:04:33 -0000 1.19 @@ -2,6 +2,8 @@ LIBNAME ?= $(PACKAGENAME) +INSTALLDIR = $(COMMONINSTALLDIR)/$(PACKAGENAME) + TARGETOK = $(addprefix $(strip $(LIBPREFIX)),\ $(addsuffix $(LIBSUFFIX),$(strip $(LIBNAME)))) |
|
From: <ju...@us...> - 2003-11-04 04:03:59
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1:/tmp/cvs-serv13744/mk Modified Files: config.mk.in Log Message: (COMMONINSTALLDIR): Define default base package directory name. Index: config.mk.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/config.mk.in,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- config.mk.in 21 Oct 2003 23:42:03 -0000 1.18 +++ config.mk.in 4 Nov 2003 04:03:56 -0000 1.19 @@ -151,6 +151,8 @@ TARNAME = gtk2hs-$(VERSION) +COMMONINSTALLDIR = gtk2hs + # Documentation BUILDDOCS = @BUILDDOCS@ |
|
From: <ju...@us...> - 2003-11-03 14:23:35
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1:/tmp/cvs-serv11368 Modified Files: ChangeLog Log Message: gtk2hs.spec.in entry. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.96 retrieving revision 1.97 diff -u -d -r1.96 -r1.97 --- ChangeLog 3 Nov 2003 14:19:07 -0000 1.96 +++ ChangeLog 3 Nov 2003 14:23:32 -0000 1.97 @@ -1,5 +1,10 @@ 2003-11-03 Jens Petersen <pet...@ha...> + * gtk2hs.spec.in (BuildRequires): Require gtksourceview-devel. + (Requires): Require gtksourceview. + (%post): Install sourceview package. + (%preun): Remove sourceview package. + * mk/recurse.mk (install-without-pkg): New target. * mk/application.mk ($(TARGETOK)): Depend on inplaceinit to make |
|
From: <ju...@us...> - 2003-11-03 14:21:57
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/multiline
In directory sc8-pr-cvs1:/tmp/cvs-serv10746/gtk/multiline
Modified Files:
TextIter.chs
Log Message:
Emacs file variables only work on the first line.
Index: TextIter.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/multiline/TextIter.chs,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- TextIter.chs 21 Oct 2003 21:28:53 -0000 1.10
+++ TextIter.chs 3 Nov 2003 14:21:54 -0000 1.11
@@ -1,5 +1,4 @@
-{-# OPTIONS -cpp #-}
--- -*-haskell-*-
+{-# OPTIONS -cpp #-} -- -*-haskell-*-
-- GIMP Toolkit (GTK) @entry TextIter TextBuffer@
--
-- Author : Axel Simon
|
|
From: <ju...@us...> - 2003-11-03 14:19:11
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1:/tmp/cvs-serv10392 Modified Files: ChangeLog Log Message: Entries for Makefile, c2hs/c/CLexer.hs, mk/application.mk, mk/recurse.mk and gtk2hs.spec.in. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 --- ChangeLog 2 Nov 2003 23:57:58 -0000 1.95 +++ ChangeLog 3 Nov 2003 14:19:07 -0000 1.96 @@ -1,3 +1,16 @@ +2003-11-03 Jens Petersen <pet...@ha...> + + * mk/recurse.mk (install-without-pkg): New target. + + * mk/application.mk ($(TARGETOK)): Depend on inplaceinit to make + sure required localpackage.conf file exists. + (install-without-pkg): Alias to install. + + * c2hs/c/CLexer.hs (linedir): Fix parsing for latest cpp #line + extensions. [upstream patch from Manuel M T Chakravarty] + + * Makefile (EXTRA_TARFILES): Add mk/recurse.mk. + 2003-10-02 Axel Simon <A....@ke...> * mk/common.mk: Change comments for "targets" help output. |
|
From: <ju...@us...> - 2003-11-03 14:16:29
|
Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv9973
Modified Files:
gtk2hs.spec.in
Log Message:
(BuildRequires): Require gtksourceview-devel.
(Requires): Require gtksourceview.
(%post): Install sourceview package.
(%preun): Remove sourceview package.
Index: gtk2hs.spec.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk2hs.spec.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gtk2hs.spec.in 31 Jul 2003 10:30:38 -0000 1.7
+++ gtk2hs.spec.in 3 Nov 2003 14:16:26 -0000 1.8
@@ -26,9 +26,9 @@
%package ghc%{ghc_version}
Summary: Haskell binding for the GIMP Toolkit (GTK2), a GUI library
Group: Development/Languages/Haskell
-BuildRequires: ghc = %{ghc_version}, gtk2-devel, %{?_with_c2hs: c2hs >= 0.10.6}, %{_bindir}/hsc2hs
+BuildRequires: ghc = %{ghc_version}, gtk2-devel, gtksourceview-devel, %{?_with_c2hs: c2hs >= 0.10.6}, %{_bindir}/hsc2hs
Requires: ghc = %{ghc_version}
-Requires: gtk2
+Requires: gtk2, gtksourceview
Requires(post,preun): %{_bindir}/ghc-pkg-%{ghc_version}
%description ghc%{ghc_version}
@@ -78,13 +78,15 @@
# perl -pi -e "s|%{buildroot}||" \
# %{_libdir}/ghc-%{ghc_version}/{%{name}/gtk2.conf,mogul.conf}
-ghc-pkg-%{ghc_version} -u -g -i %{_libdir}/ghc-%{ghc_version}/%{name}/gtk2.conf
-ghc-pkg-%{ghc_version} -u -g -i %{_libdir}/ghc-%{ghc_version}/mogul/mogul.conf
+ghc-pkg-%{ghc_version} -u -g -i %{_libdir}/ghc-%{ghc_version}/%{name}/gtk2/gtk2.conf
+ghc-pkg-%{ghc_version} -u -g -i %{_libdir}/ghc-%{ghc_version}/%{name}/sourceview/sourceview.conf
+ghc-pkg-%{ghc_version} -u -g -i %{_libdir}/ghc-%{ghc_version}/%{name}/mogul/mogul.conf
%preun ghc%{ghc_version}
if [ "$1" = 0 ]; then
- rm -f %{_libdir}/ghc-%{ghc_version}/{%{name}/gtk2hs.o,mogul.o}
+ rm -f %{_libdir}/ghc-%{ghc_version}/%{name}/{gtk2/gtk2hs.o,mogul/mogul.o,spirceview/sourceview.o}
ghc-pkg-%{ghc_version} -r mogul || :
+ ghc-pkg-%{ghc_version} -r sourceview || :
ghc-pkg-%{ghc_version} -r gtk2 || :
fi
|
|
From: <ju...@us...> - 2003-11-03 14:15:45
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1:/tmp/cvs-serv9863/mk Modified Files: recurse.mk Log Message: (install-without-pkg): New target. Index: recurse.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/recurse.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- recurse.mk 26 Oct 2003 22:11:42 -0000 1.1 +++ recurse.mk 3 Nov 2003 14:15:40 -0000 1.2 @@ -23,6 +23,9 @@ install : MAKE_GOALS=$(MAKE_LIBS) $(MAKE_APPS) install : make-install +install-without-pkg : MAKE_GOALS=$(MAKE_LIBS) $(MAKE_APPS) +install-without-pkg : make-install-without-pkg + uninstall : MAKE_GOALS=$(MAKE_LIBS) $(MAKE_APPS) uninstall : make-uninstall |
|
From: <ju...@us...> - 2003-11-03 14:15:18
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1:/tmp/cvs-serv9790/mk Modified Files: application.mk Log Message: ($(TARGETOK)): Depend on inplaceinit to make sure required localpackage.conf file exists. (install-without-pkg): Alias to install. Index: application.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/application.mk,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- application.mk 21 Oct 2003 23:42:03 -0000 1.4 +++ application.mk 3 Nov 2003 14:15:15 -0000 1.5 @@ -1,6 +1,6 @@ TARGETOK = $(addsuffix $(APPSUFFIX),$(strip $(APPNAME))) -$(TARGETOK) : $(ALLHSFILES) $(EXTRA_CFILES:.c=.o) +$(TARGETOK) : inplaceinit $(ALLHSFILES) $(EXTRA_CFILES:.c=.o) $(RM) $@ $(strip $(HC) --make $(MAINOK) -o $@ $(HCINCLUDES) \ -package-conf $(LOCALPKGCONF) \ @@ -11,3 +11,4 @@ EXTRA_CLEANFILES += Main.hi $(TARGETOK) +install-without-pkg: install |
|
From: <ju...@us...> - 2003-11-03 14:14:41
|
Update of /cvsroot/gtk2hs/gtk2hs/c2hs/c In directory sc8-pr-cvs1:/tmp/cvs-serv9614/c2hs/c Modified Files: CLexer.hs Log Message: (linedir): Fix parsing for latest cpp #line extensions. [upstream patch from Manuel M T Chakravarty] Index: CLexer.hs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/c2hs/c/CLexer.hs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CLexer.hs 1 Oct 2002 15:17:05 -0000 1.2 +++ CLexer.hs 3 Nov 2003 14:14:39 -0000 1.3 @@ -461,7 +461,7 @@ -- linedir :: CLexer linedir = char '#' +> ppwhite +> int +> ppwhite +> (fname +> ppwhite)`quest` - ((int +> ppwhite +> (int +> ppwhite)`quest`epsilon)`quest` + ((int +> ppwhite)`star` char '\n') `lexmeta` \str pos ns -> (Nothing, adjustPos str pos, ns, Nothing) where |
|
From: <ju...@us...> - 2003-11-03 14:14:01
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1:/tmp/cvs-serv9465 Modified Files: Makefile Log Message: (EXTRA_TARFILES): Add mk/recurse.mk. Index: Makefile =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Makefile 26 Oct 2003 22:11:41 -0000 1.18 +++ Makefile 3 Nov 2003 14:13:58 -0000 1.19 @@ -17,7 +17,7 @@ EXTRA_TARFILES = $(strip AUTHORS COPYING.LIB ChangeLog INSTALL Makefile \ TODO VERSION aclocal.m4 acinclude.m4 \ - configure.in configure \ + configure.in configure mk/recurse.mk \ mk/config.mk.in mk/common.mk mk/application.mk \ mk/library.mk mk/chsDepend.in install-sh \ config.sub config.guess gtk2hs.spec.in gtk2hs.spec ) @@ -41,4 +41,4 @@ gtk2hs.spec: VERSION gtk2hs.spec.in ./configure -include $(TOP)/mk/recurse.mk \ No newline at end of file +include $(TOP)/mk/recurse.mk |
|
From: <as...@us...> - 2003-11-02 23:58:04
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1:/tmp/cvs-serv30318/mk Modified Files: common.mk Log Message: Make the sourceview modules more complete after GList.chs has been augmented. Index: common.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- common.mk 26 Oct 2003 22:11:42 -0000 1.24 +++ common.mk 2 Nov 2003 23:57:58 -0000 1.25 @@ -250,7 +250,7 @@ targets : @echo all in subdirs: builds libraries/applications - @echo in toplevel: equivalent to "inplace" in all subdirs + @echo in toplevel: equivalent to "make all" in all subdirs @echo inplace "all" in all subdirs and entry to local package file @echo noinplace removes the entry from the local package file @echo install "all", installs files, add entry to GHC's package file |
|
From: <as...@us...> - 2003-11-02 23:58:02
|
Update of /cvsroot/gtk2hs/gtk2hs/sourceview
In directory sc8-pr-cvs1:/tmp/cvs-serv30318/sourceview
Modified Files:
Makefile SourceLanguagesManager.chs SourceTag.chs
SourceTagTable.chs
Log Message:
Make the sourceview modules more complete after GList.chs has been augmented.
Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 26 Oct 2003 22:29:51 -0000 1.2
+++ Makefile 2 Nov 2003 23:57:58 -0000 1.3
@@ -19,14 +19,17 @@
EXTRA_TARFILES = sourceview.h
ifneq (x$(MULTIPLE_CHS),xyes)
-# glib modules
-SourceViewType-HEADER = sourceview.h
-SourceBuffer-HEADER = gtksourceview/gtksourceview.h
-SourceLanguage-HEADER = gtksourceview/gtksourceview.h
-SourceLanguagesManager-HEADER = gtksourceview/gtksourceviewlanguagesmanager.h
+SourceIter-HEADER = gtksourceview/gtksourceiter.h
+SourceBuffer-HEADER = gtksourceview/gtksourcebuffer.h
+SourceMarker-HEADER = gtksourceview/gtksourcemarker.h
+SourceView-HEADER = gtksourceview/gtksourceview.h
+SourceLanguage-HEADER = gtksourceview/gtksourcelanguage.h
+SourceLanguagesManager-HEADER = gtksourceview/gtksourcelanguagesmanager.h
+SourceStyleScheme-HEADER = gtksourceview/gtksourcestylescheme.h
SourceTag-HEADER = gtksourceview/gtksourcetag.h
-SourceTagTable-HEADER = gtksourceview/gtktagtable.h
-SourceStyleScheme-HEADER = gtksourceview/gtkstlyescheme.h
+SourceTagTable-HEADER = gtksourceview/gtksourcetagtable.h
+SourceTagStyle-HEADER = gtksourceview/gtksourcetagstyle.h
+SourcePringJob-HEADER = gtksourceview/gtksourceprintjob.h
endif
# Further options to the C preprocessor are passed verbatim:
Index: SourceLanguagesManager.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/SourceLanguagesManager.chs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SourceLanguagesManager.chs 26 Oct 2003 22:29:51 -0000 1.2
+++ SourceLanguagesManager.chs 2 Nov 2003 23:57:58 -0000 1.3
@@ -45,7 +45,8 @@
-- methods
--- @constructor sourceLanguagesManagerNew@ Create a new @ref type SourceLanguagesManager@
+-- @constructor sourceLanguagesManagerNew@ Create a new
+-- @ref type SourceLanguagesManager@
--
sourceLanguagesManagerNew :: IO SourceLanguagesManager
sourceLanguagesManagerNew = makeNewGObject mkSourceLanguagesManager
@@ -53,7 +54,8 @@
-- @method sourceLanguagesManagerGetAvailableLanguages@
--
-sourceLanguagesManagerGetAvailableLanguages :: SourceLanguagesManager -> IO [SourceLanguage]
+sourceLanguagesManagerGetAvailableLanguages :: SourceLanguagesManager ->
+ IO [SourceLanguage]
sourceLanguagesManagerGetAvailableLanguages lm = do
gList <- {#call source_languages_manager_get_available_languages#} lm
wList <- readGSList gList
Index: SourceTag.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/SourceTag.chs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SourceTag.chs 26 Oct 2003 22:29:51 -0000 1.1
+++ SourceTag.chs 2 Nov 2003 23:57:58 -0000 1.2
@@ -29,13 +29,13 @@
SourceTag,
syntaxTagNew,
patternTagNew,
--- keywordListTagNew,
+ keywordListTagNew,
blockCommentTagNew,
lineCommentTagNew,
stringTagNew,
sourceTagGetStyle,
sourceTagSetStyle
-) where
+ ) where
import Monad (liftM)
import FFI
@@ -43,6 +43,7 @@
{#import Hierarchy#}
{#import SourceViewType#}
import SourceTagStyle
+import GList (toGSList, fromGSList)
{# context lib="gtk" prefix="gtk" #}
@@ -69,27 +70,32 @@
withCString pattern $ \strPtr3 ->
{#call unsafe pattern_tag_new#} strPtr1 strPtr2 strPtr3
-{-
--- @constructor keywordListTagNew@ Create a new @ref type SourceTag@
+
+-- @constructor keywordListTagNew@ Create a new @ref type SourceTag@.
--
-keywordListTagNew :: String -> String -> [String] -> Bool -> Bool -> Bool -> String -> String -> IO SourceTag
-keywordListTagNew = id name keywords
- caseSensitive
- matchEmptyStringAtBeginning
- matchEmptyStringAtEnd
- beginningRegex
- endRegex
- makeNewGObject mkSourceTag $ liftM castPtr $
- withCString id $ \strPtr1 ->
- withCString name $ \strPtr2 ->
- withCString beginningRegex $ \strPtr3 ->
- withCString endRegex $ \strPtr4 ->
- {#call unsafe keyword_list_tag_new#} strPtr1 strPtr2 {- makeGSList of strings from keywords -}
- (fromBool caseSensitive)
- (fromBool matchEmptyStringAtBeginning)
- (fromBool matchEmptyStringAtEnd)
- strPtr3 strPtr4
--}
+keywordListTagNew :: String -> String -> [String] -> Bool -> Bool -> Bool ->
+ String -> String -> IO SourceTag
+keywordListTagNew id name keywords
+ caseSensitive
+ matchEmptyStringAtBeginning
+ matchEmptyStringAtEnd
+ beginningRegex
+ endRegex = do
+ keywordPtrs <- mapM newUTFString keywords
+ keywordList <- toGSList keywordPtrs
+ obj <- makeNewGObject mkSourceTag $ liftM castPtr $
+ withCString id $ \strPtr1 ->
+ withCString name $ \strPtr2 ->
+ withCString beginningRegex $ \strPtr3 ->
+ withCString endRegex $ \strPtr4 -> {#call unsafe keyword_list_tag_new#}
+ strPtr1 strPtr2 keywordList (fromBool caseSensitive)
+ (fromBool matchEmptyStringAtBeginning) (fromBool matchEmptyStringAtEnd)
+ strPtr3 strPtr4
+ -- destory the list
+ fromGSList keywordList
+ -- destory the elements
+ mapM_ free keywordPtrs
+ return obj
-- @constructor blockCommentTagNew@ Create a new @ref type SourceTag@
--
Index: SourceTagTable.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/SourceTagTable.chs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SourceTagTable.chs 26 Oct 2003 22:29:51 -0000 1.1
+++ SourceTagTable.chs 2 Nov 2003 23:57:58 -0000 1.2
@@ -29,7 +29,7 @@
SourceTagTable,
SourceTagTableClass,
sourceTagTableNew,
--- sourceTagTableAddTags, --requires toGSList
+ sourceTagTableAddTags,
sourceTagTableRemoveSourceTags
) where
@@ -39,8 +39,8 @@
{#import Hierarchy#}
{#import SourceViewType#}
{#import Signal#}
-{#import SourceTag#}
-import GList (readGSList)
+import SourceTag
+import GList (fromGSList, toGSList)
{# context lib="gtk" prefix="gtk" #}
@@ -52,16 +52,32 @@
sourceTagTableNew = makeNewGObject mkSourceTagTable
{#call unsafe source_tag_table_new#}
-{-
--- @method sourceTagTableAddTags@
+
+-- @method sourceTagTableAddTags@ Add a list of tag to the table.
+--
+-- * The added tags are assigned the highest priority in the table. If a tag is
+-- already present in table or has the same name as an already-added tag, then
+-- it is not added to the table.
--
sourceTagTableAddTags :: SourceTagTable -> [SourceTag] -> IO ()
-sourceTagTableAddTags tt tags =
- {#call source_tag_table_add_tags#} tt {- make GSList of SourceTag from tags -}
--}
+sourceTagTableAddTags tt tags = do
+ let tagForeignPtrs = map (unSourceTag . toSourceTag) tags
+ tagList <- toGSList (map foreignPtrToPtr tagForeignPtrs)
+ {#call source_tag_table_add_tags#} tt tagList
+ -- destroy the list
+ fromGSList tagList
+ -- make sure the ForeignPtrs are not gc'd while we are still using the Ptrs
+ mapM_ touchForeignPtr tagForeignPtrs
-- @method sourceTagTableRemoveSourceTags@
--
sourceTagTableRemoveSourceTags :: SourceTagTable -> IO ()
sourceTagTableRemoveSourceTags tt =
{#call source_tag_table_remove_source_tags#} tt
+
+-- @signal onTagChanged@ The source tag table has changed.
+--
+onTagChanged, afterTagChanged ::
+ SourceTagTableClass stt => stt -> IO () -> IO (ConnectId stt)
+onTagChanged = connect_NONE__NONE "changed" False
+afterTagChanged = connect_NONE__NONE "changed" True
|
2 messages has been excluded from this view by a project administrator.
