gtk2hs-commit — Mailing list for Darcs commit messages.

[Gtk2hs-commit] gtk2hs/tools/hierarchyGen - New directory

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen
In directory sc8-pr-cvs1:/tmp/cvs-serv26264/hierarchyGen

Log Message:
Directory /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen added to the repository

[Gtk2hs-commit] gtk2hs/tools/callbackGen - New directory

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/callbackGen
In directory sc8-pr-cvs1:/tmp/cvs-serv26264/callbackGen

Log Message:
Directory /cvsroot/gtk2hs/gtk2hs/tools/callbackGen added to the repository

[Gtk2hs-commit] gtk2hs/tools/typehier Makefile,1.5,NONE TypeGen.hs,1.1,NONE hierarchy.list,1.5,NONE

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/typehier
In directory sc8-pr-cvs1:/tmp/cvs-serv23886/typehier

Removed Files:
	Makefile TypeGen.hs hierarchy.list 
Log Message:
Remove the stale files. Again.


--- Makefile DELETED ---

--- TypeGen.hs DELETED ---

--- hierarchy.list DELETED ---

[Gtk2hs-commit] gtk2hs/tools/signals HookGenerator.hs,1.5,NONE Makefile,1.6,NONE Signal.chs-boot1,1.5,NONE Signal.chs-boot2,1.5,NONE gtkmarshal.list,1.5,NONE

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/signals
In directory sc8-pr-cvs1:/tmp/cvs-serv23886/signals

Removed Files:
	HookGenerator.hs Makefile Signal.chs-boot1 Signal.chs-boot2 
	gtkmarshal.list 
Log Message:
Remove the stale files. Again.


--- HookGenerator.hs DELETED ---

--- Makefile DELETED ---

--- Signal.chs-boot1 DELETED ---

--- Signal.chs-boot2 DELETED ---

--- gtkmarshal.list DELETED ---

[Gtk2hs-commit] gtk2hs/tools/signals HookGenerator.hs,1.4,1.5 Makefile,1.5,1.6 Signal.chs-boot1,1.4,1.5 Signal.chs-boot2,1.4,1.5 gtkmarshal.list,1.4,1.5

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/signals
In directory sc8-pr-cvs1:/tmp/cvs-serv23328/tools/signals

Added Files:
	HookGenerator.hs Makefile Signal.chs-boot1 Signal.chs-boot2 
	gtkmarshal.list 
Log Message:
Adding and removing wibbles.

[Gtk2hs-commit] gtk2hs/tools/typehier Makefile,1.4,1.5 TypeGen.hs,NONE,1.1 hierarchy.list,1.4,1.5

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/typehier
In directory sc8-pr-cvs1:/tmp/cvs-serv23328/tools/typehier

Added Files:
	Makefile TypeGen.hs hierarchy.list 
Log Message:
Adding and removing wibbles.



--- NEW FILE: TypeGen.hs ---
-- TypeGenerator.hs
-- Takes a hierarchical list of all objects in GTK+ and produces
-- Haskell class that reflect this hierarchy.
module Main(main) where

import Char(showLitChar, isAlpha, isAlphaNum, isSpace, toLower, isUpper)
import List(nub, isPrefixOf)
import Maybe(catMaybes, fromMaybe)
import Monad(when)
import System(getArgs, exitWith, ExitCode(..))

-- The current object and its inheritence relationship is defined by all
-- ancestors and their column position.
type ObjectSpec = [(Int,String)]

-- This is a mapping from a type name to a) the type name in Haskell and
-- b) the GTK blah_get_type function.
type TypeQuery  = Maybe (String, (String, String))

-- A Tag is a string restricting the generation of type entries to
-- those lines that have the appropriate "if <tag>" at the end.
type Tag = String

data ParserState = ParserState {
  line		:: Int,
  col	        :: Int,
  hierObjs	:: ObjectSpec,
  onlyTags	:: [Tag]
  }

freshParserState :: [Tag] -> ParserState
freshParserState = ParserState 1 1 []

-- The parser returns a list of ObjectSpec and possibly a special type query
-- function. Each ObjectSpec describes one object with all its parents.

pFreshLine :: ParserState -> String -> [(ObjectSpec, TypeQuery)]
pFreshLine ps input = pFL ps input
  where
    pFL ps ('#':rem)		= pFL ps (dropWhile ((/=) '\n') rem)
    pFL ps ('\n':rem)	 	= pFL (ps {line = line ps+1, col=1}) rem
    pFL ps (' ':rem)		= pFL (ps {col=col ps+1}) rem
    pFL ps ('\t':rem)		= pFL (ps {col=col ps+8}) rem
    pFL ps ('G':'t':'k':rem) 	= pGetObject ps rem
    pFL ps []			= []
    pFL ps all			= pGetObject ps all

pGetObject :: ParserState -> String -> [(ObjectSpec, TypeQuery)]
pGetObject ps@ParserState { onlyTags=tags } txt = 
  (if readTag `elem` tags then (:) (spec, specialQuery) else id) $
  pFreshLine (ps { hierObjs=spec}) (dropWhile ((/=) '\n') rem'')
  where
    isBlank     c = c==' ' || c=='\t'
    isAlphaNum_ c = isAlphaNum c || c=='_'
    (origName,rem) = span isAlphaNum txt
    (name,specialQuery,rem') = case (dropWhile isBlank rem) of
      ('a':'s':r) ->
        let (tyName,r') = span isAlphaNum_ (dropWhile isBlank r) in
          case (dropWhile isBlank r') of
	    (',':r) ->
	      let (tyQuery,r') = span isAlphaNum_ (dropWhile isBlank r) in
	        (tyName, Just (tyName, (origName, tyQuery)), r')
	    r -> error ("line "++show (line ps)++
		        ": Expected a comma, found:"++take 5 r)
      r -> (origName, Nothing, r)
    parents = dropWhile (\(c,_) -> c>=col ps) (hierObjs ps)
    spec = (col ps,name):parents
    (readTag, rem'') = case (dropWhile isBlank rem) of
      ('i':'f':r) -> span isAlphaNum_ (dropWhile isBlank r)
      r -> ("default",r)


-------------------------------------------------------------------------------
-- Helper functions
-------------------------------------------------------------------------------

ss = showString
sc = showChar

indent :: Int -> ShowS
indent c = ss ("\n"++replicate (2*c) ' ')

-------------------------------------------------------------------------------
-- start of code generation
-------------------------------------------------------------------------------


main = do
  args <- getArgs
  when (length args<2) usage
  let (hierFile: goalFile: rem) = args
  let tags = map (drop 6) (filter ("--tag=" `isPrefixOf`)  rem)
  content <- readFile hierFile
  let (objs, specialQueries) = unzip $
				 pFreshLine (freshParserState tags) content
  let bareFName = reverse . 
		  takeWhile isAlphaNum .
		  drop 1 .
		  dropWhile isAlpha .
		  reverse		     
  writeFile goalFile $
    generate (bareFName goalFile)
      (map (map snd) objs) (catMaybes specialQueries) ""


usage = do
 putStr "\nProgram to generate Gtk's object hierarchy in Haskell. Usage:\n\
	\TypeGenerator <hierFile> <outFile> {--tag=<tag>}\n\
	\where\n\
	\  <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>\n\
	\		   specify `default' for types without tags\n"
 exitWith $ ExitFailure 1



-------------------------------------------------------------------------------
-- generate dynamic fragments
-------------------------------------------------------------------------------

generate :: String -> [[String]] -> [(String, (String, String))] -> ShowS
generate fname objs typeTable = 
  let fillCol str = ss $ replicate 
		    (maximum (map (length.head) objs)-length str) ' ' 
  in
           ss "-- -*-haskell-*-".
  indent 0.ss "-- ******************** automatically generated file - do not edit **********".
  indent 0.ss "--  Object hierarchy for the GIMP Toolkit (GTK) Binding for Haskell".
  indent 0.ss "--".
  indent 0.ss "--  Author : Axel Simon".
  indent 0.ss "--".
  indent 0.ss "--  Copyright (c) 2001-2003 Axel Simon".
  indent 0.ss "--".
  indent 0.ss "--  This file is free software; you can redistribute it and/or modify".
  indent 0.ss "--  it under the terms of the GNU General Public License as published by".
  indent 0.ss "--  the Free Software Foundation; either version 2 of the License, or".
  indent 0.ss "--  (at your option) any later version.".
  indent 0.ss "--".
  indent 0.ss "--  This file is distributed in the hope that it will be useful,".
  indent 0.ss "--  but WITHOUT ANY WARRANTY; without even the implied warranty of".
  indent 0.ss "--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the".
  indent 0.ss "--  GNU General Public License for more details.".
  indent 0.ss "--".
  indent 0.ss "--- @description@ -------------------------------------------------------------".
  indent 0.ss "--".
  indent 0.ss "--  * This file reflects the Gtk object hierarchy in terms of Haskell classes.".
  indent 0.ss "--".
  indent 0.ss "--- @documentation@ -----------------------------------------------------------".
  indent 0.ss "--".
  indent 0.ss "--".
  indent 0.ss "--- @todo@ --------------------------------------------------------------------".
  indent 0.ss "--".
  indent 0.ss "--".
  indent 0.ss "module ".ss fname.sc '('.
--  indent 1.ss "ObjectTag(..)".
  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).
  indent 1.ss ") where".
  indent 0.
  indent 0.ss "import FFI	(ForeignPtr, castForeignPtr, foreignPtrToPtr,".  ss " CULong)".
  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/="Hierarchy" then indent 0.ss "{#import Hierarchy#}" else id).
  indent 0.
  indent 0.ss "{#context lib=\"gtk\" prefix=\"gtk\" #}".
  indent 0.
  indent 0.ss "castToGObject = id".
  indent 0.
  indent 0.ss "-- The usage of foreignPtrToPtr should be safe as the evaluation will only be".
  indent 0.ss "-- forced if the object is used afterwards".
  indent 0.
  foldl (.) id (map (makeUpcast typeTable) objs).
  indent 0.
--  indent 0.ss "data ObjectTag  ".makeTypeTags '=' (map head objs).
--  indent 0.
--  indent 0.ss "instance Ord ObjectTag where".
--  foldl (.) id (map (makeOrd fillCol) objs).
--  indent 1.ss "compare ".ss "_   ".fillCol "_".ss " _   ".fillCol "_".
--    ss " = LT".
--  indent 0.
  indent 0.
  foldl (.) id (map (makeClass typeTable) objs)

makeTypeTags :: Char -> [String] -> ShowS
makeTypeTags c [] = ss "deriving Eq"
makeTypeTags c (obj:ects) = sc c.sc ' '.ss obj.ss "Tag".indent 8.
			    makeTypeTags '|' ects

makeUpcast table [obj]	   = id -- no casting for GObject
makeUpcast table (obj:_:_) = 
  indent 0.ss "castTo".ss obj.ss " :: GObjectClass obj => obj -> ".ss obj.
  indent 0.ss "castTo".ss obj.ss " obj =".
  indent 1.ss "if typeInstanceIsA ((foreignPtrToPtr.castForeignPtr.unGObject.toGObject) obj)".
  indent 2.ss "{#call fun unsafe ".
    ss (maybe ("gtk"++c2u True obj++"_get_type") snd (lookup obj table)).
    ss "#} then".
  indent 3.ss "(fromGObject.toGObject) obj else".
  indent 4.ss "error \"Cannot cast object to ".ss obj.ss ".\"".
  indent 0
  where
    -- case to underscore translation: the boolean arg specifies whether
    -- the first uppercase letter X is to be replaced by _x (True) or by x.
    --
    -- translation:	HButtonBox -> hbutton_box
    c2u :: Bool -> String -> String
    c2u True  (x:xs) | isUpper x = '_':toLower x:c2u False xs
    c2u False (x:xs) | isUpper x = toLower x:c2u True xs
    c2u _     (x:xs) | otherwise = x:c2u True xs
    c2u _     []		 = []

makeOrd fill []          = id
makeOrd fill (obj:preds) = indent 1.ss "compare ".ss obj.ss "Tag ".
			   fill obj.ss obj.ss "Tag".fill obj.
			   ss " = EQ".makeGT obj preds
  where
    makeGT obj []	= id
    makeGT obj (pr:eds) = indent 1.ss "compare ".ss obj.ss "Tag ".
			  fill obj.ss pr.ss "Tag".fill pr.
			  ss " = GT".makeGT obj eds

makeClass :: [(String,(String, String))] -> [String] -> ShowS
makeClass table (name:parents) =
  indent 0.ss "-- ".ss (replicate (75-length name) '*').sc ' '.ss name.
  indent 0.
  indent 0.ss "{#pointer *".
  maybe (ss name) (\s -> ss (fst s).ss " as ".ss name) (lookup name table).
  ss " foreign newtype #}".
  indent 0.
  indent 0.ss "mk".ss name.ss " = ".ss name.
  indent 0.ss "un".ss name.ss " (".ss name.ss " o) = o".
  indent 0.
  indent 0.ss "class ".
    (if not (null parents) then ss (head parents).ss "Class o => " else id).
	   ss name.ss "Class o where".
  indent 1.ss "to".ss name.ss "   :: o -> ".ss name.
  indent 1.ss "from".ss name.ss " :: ".ss name.ss " -> o".
  indent 0.
  indent 0.ss "instance ".ss name.ss "Class ".ss name.ss " where".
  indent 1.ss "to".ss name.ss "   = id".
  indent 1.ss "from".ss name.ss " = id".
  indent 0.
  makeInstance name parents.
  indent 0

makeInstance :: String -> [String] -> ShowS
makeInstance name []         = id
makeInstance name (par:ents) =
  indent 0.ss "instance ".ss par.ss "Class ".ss name.ss " where".
  indent 1.ss "to".ss par.ss "   = mk".ss par.ss ".castForeignPtr.un".ss name.
  indent 1.ss "from".ss par.ss " = mk".ss name.ss ".castForeignPtr.un".ss par.
  indent 0.
  makeInstance name ents

 
  

[Gtk2hs-commit] gtk2hs ChangeLog,1.102,1.103

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv23328

Modified Files:
	ChangeLog 
Log Message:
Adding and removing wibbles.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- ChangeLog	11 Nov 2003 12:26:17 -0000	1.102
+++ ChangeLog	15 Nov 2003 09:17:58 -0000	1.103
@@ -1,3 +1,7 @@
+2003-11-07 Axel Simon <A....@ke...>
+
+	* tools/typehier/TypeGen.hs: Renamed file to sort out CVS problem.
+	
 2003-11-11  Jens Petersen  <pet...@ha...>
 
 	* demo/sourceview: New directory for import of sourceview demo

[Gtk2hs-commit] gtk2hs/tools/typehier Makefile,1.3,NONE hierarchy.list,1.3,NONE

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/typehier
In directory sc8-pr-cvs1:/tmp/cvs-serv592/gtk/typehier

Removed Files:
	Makefile hierarchy.list 
Log Message:
Again, remove the stale tools in gtk.


--- Makefile DELETED ---

--- hierarchy.list DELETED ---

[Gtk2hs-commit] gtk2hs/tools/signals HookGenerator.hs,1.3,NONE Makefile,1.4,NONE Signal.chs-boot1,1.3,NONE Signal.chs-boot2,1.3,NONE gtkmarshal.list,1.3,NONE

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/signals
In directory sc8-pr-cvs1:/tmp/cvs-serv592/gtk/signals

Removed Files:
	HookGenerator.hs Makefile Signal.chs-boot1 Signal.chs-boot2 
	gtkmarshal.list 
Log Message:
Again, remove the stale tools in gtk.


--- HookGenerator.hs DELETED ---

--- Makefile DELETED ---

--- Signal.chs-boot1 DELETED ---

--- Signal.chs-boot2 DELETED ---

--- gtkmarshal.list DELETED ---

[Gtk2hs-commit] gtk2hs ChangeLog,1.101,1.102

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv17246

Modified Files:
	ChangeLog 
Log Message:
demo/sourceview import entries


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- ChangeLog	11 Nov 2003 12:12:38 -0000	1.101
+++ ChangeLog	11 Nov 2003 12:26:17 -0000	1.102
@@ -1,5 +1,16 @@
 2003-11-11  Jens Petersen  <pet...@ha...>
 
+	* demo/sourceview: New directory for import of sourceview demo
+	program by Duncan Coutts <dun...@wo...>.
+
+	* demo/sourceview/haskell.lang: New file giving haskell
+	highlighting syntax for gtksourceview.
+
+	* demo/sourceview/SourceViewTest.hs: New file to demonstrate
+	sourceview.
+
+	* demo/sourceview/Makefile: New file.
+	
 	* sourceview/SourceTag.chs (sourceTagSetStyle): Fix docu typo.
 
 	* sourceview/Makefile (EXTRA_HFILES): Use relative path.
@@ -18,7 +29,7 @@
 	* mk/config.mk.in (SOURCEVIEW_LIBS): Define.
 	(SOURCEVIEW_CFLAGS): Ditto.
 
-	* mk/common.mk: Fixed so that per package INSTALLDIR works:
+	* mk/common.mk: Fixes so that per package INSTALLDIR works:
 	(INSTALLDIROK): Is now a deferred variable.
 	(INST_*): Not passed through SEDPIPE for now.
 
@@ -39,7 +50,7 @@
 	building the internal c2hs on every clean build.
 
 	* Makefile (MAKE_TOOLS): Only add c2hs when BUILT_IN_C2HS is no.
-	(MAKE_DOCS): gendoc doc targets moved here from MAKE_TOOLS since
+	(MAKE_DOCS): gendoc and doc targets moved here from MAKE_TOOLS since
 	doc must be done after gtk.
 	(MAKE_APPS): Add demo/sourceview.
 	(dist): Depend on gtk2hs.spec.

[Gtk2hs-commit] gtk2hs/demo/sourceview .cvsignore,NONE,1.1 Makefile,NONE,1.1 SourceViewTest.hs,NONE,1.1 haskell.lang,NONE,1.1

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/demo/sourceview
In directory sc8-pr-cvs1:/tmp/cvs-serv16934

Added Files:
	.cvsignore Makefile SourceViewTest.hs haskell.lang 
Log Message:
import sourceview demo program by Duncan Coutts


--- NEW FILE: .cvsignore ---
sourceview

--- NEW FILE: Makefile ---
TOP = ../..

include $(TOP)/mk/config.mk

MAIN = SourceViewTest.hs

APPNAME = sourceview

NEEDPACKAGES = lang mogul sourceview

EXTRA_TARFILES += haskell.lang

include $(TOP)/mk/common.mk

--- NEW FILE: SourceViewTest.hs ---
-- Test file for the SourceView widget.
module Main where

import Gtk
import Mogul
import SourceView
import SourceBuffer
import SourceLanguage
import SourceLanguagesManager

main = do
  initGUI
  win <- newWindow
  win `onDestroy` Mogul.mainQuit

  -- create the appropriate language
  lm <- sourceLanguagesManagerNew
  Just lang <- sourceLanguagesManagerGetLanguageFromMimeType lm "text/x-haskell"

  -- create a new SourceBuffer object
  buffer <- sourceBufferNewWithLanguage lang

  -- load up and display a file
  fileContents <- readFile "SourceViewTest.hs"
  textBufferSetText buffer fileContents
  textBufferSetModified buffer False

  sourceBufferSetHighlight buffer True

  -- create a new SourceView Widget
  sv <- sourceViewNewWithBuffer buffer

  -- put it in a scrolled window
  sw <- scrolledWindowNew Nothing Nothing
  sw `containerAdd` sv
  scrolledWindowSetPolicy sw PolicyAutomatic PolicyAutomatic
  sw `scrolledWindowSetShadowType` ShadowIn
  win `containerAdd` sw
  
  -- show the widget and run the main loop
  windowSetDefaultSize win 400 500
  widgetShowAll win
  mainGUI

--- NEW FILE: haskell.lang ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
<language _name="Haskell" version="1.0" _section="Sources" mimetypes="text/x-haskell">

	<escape-char>\</escape-char>

	<line-comment _name = "Line Comment" style= "Comment">
		<start-regex>--</start-regex>
	</line-comment>

	<block-comment _name = "Block Comment" style = "Comment">
		<start-regex>\{-</start-regex>
        	<end-regex>-\}</end-regex>
	</block-comment>

	<pattern-item _name = "Type or Constructor" style = "Data Type">
		<regex>\b[A-Z][0-9a-zA-Z]*&apos;*</regex>
	</pattern-item>
<!--
	<pattern-item _name = "Variable" style = "Variable">
		<regex>\b[a-z][0-9a-zA-Z]*&apos;*</regex>
        </pattern-item>
-->
	<pattern-item _name = "Keysymbols" style = "Data Type">
		<regex>(::|-&gt;|&lt;-|=&gt;|=)</regex>
	</pattern-item>
<!--
        <pattern-item _name = "Operators" style = "Data Type">
		<regex>[:*$+]+</regex>
	</pattern-item>
-->				
	<string _name = "String" style = "String" end-at-line-end = "true">
		<start-regex>&quot;</start-regex>
		<end-regex>&quot;</end-regex>
	</string>

	<string _name = "Character Constant" style = "String" end-at-line-end = "true">
		<start-regex>[^A-Za-z]&apos;</start-regex>
		<end-regex>&apos;</end-regex>
	</string>

	<pattern-item _name = "Decimal" style = "Decimal">
		<regex>\b[0-9]\b</regex>
	</pattern-item>

	<pattern-item _name = "Floating Point Number" style = "Floating Point">
		<regex>\b([0-9]+[Ee][-]?[0-9]+|([0-9]*\.[0-9]+|[0-9]+\.)([Ee][-]?[0-9]+)?)</regex>
	</pattern-item>

	<pattern-item _name = "Hex Number" style = "Base-N Integer">
		<regex>\b0[xX][0-9a-fA-F]+\b</regex>
	</pattern-item>

	<keyword-list _name = "Keywords" style = "Keyword" case-sensitive="true">
		<keyword>type</keyword>
		<keyword>data</keyword>
		<keyword>let</keyword>
		<keyword>in</keyword>
		<keyword>case</keyword>
		<keyword>of</keyword>
		<keyword>module</keyword>
		<keyword>class</keyword>
		<keyword>where</keyword>
		<keyword>instance</keyword>
		<keyword>import</keyword>
		<keyword>qualified</keyword>
		<keyword>as</keyword>
		<keyword>do</keyword>
		<keyword>deriving</keyword>
		<keyword>if</keyword>
		<keyword>then</keyword>
		<keyword>else</keyword>
		<keyword>newtype</keyword>
		<keyword>hiding</keyword>
		<keyword>infix</keyword>
		<keyword>infixl</keyword>
		<keyword>infixr</keyword>
		<keyword>with</keyword>
		<keyword>forall</keyword>
	</keyword-list>

</language>

[Gtk2hs-commit] gtk2hs/demo/sourceview - New directory

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/demo/sourceview
In directory sc8-pr-cvs1:/tmp/cvs-serv15381/sourceview

Log Message:
Directory /cvsroot/gtk2hs/gtk2hs/demo/sourceview added to the repository

[Gtk2hs-commit] gtk2hs ChangeLog,1.100,1.101

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv13120

Modified Files:
	ChangeLog 
Log Message:
Entries for sourceview/SourceTag.chs, sourceview/Makefile, mk/recurse.mk,
mk/library.mk, mk/config.mk.in, mk/common.mk, gtk2hs.spec.in, configure.in,
Makefile.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- ChangeLog	10 Nov 2003 09:48:29 -0000	1.100
+++ ChangeLog	11 Nov 2003 12:12:38 -0000	1.101
@@ -1,3 +1,52 @@
+2003-11-11  Jens Petersen  <pet...@ha...>
+
+	* sourceview/SourceTag.chs (sourceTagSetStyle): Fix docu typo.
+
+	* sourceview/Makefile (EXTRA_HFILES): Use relative path.
+	(EXTRA_TARFILES): Not needed.
+	(EXTRA_CPPFLAGS): Use SOURCEVIEW_CFLAGS instead.
+	(EXTRA_LIBS): Use SOURCEVIEW_LIBS instead.
+
+	* mk/recurse.mk (all): Add MAKE_DOCS.
+	(inplace): Ditto.
+	(noinplace): Ditto.
+	(tarsource): Ditto.
+	(clean): Ditto.
+
+	* mk/library.mk	(installdirs): Reorder directories.
+
+	* mk/config.mk.in (SOURCEVIEW_LIBS): Define.
+	(SOURCEVIEW_CFLAGS): Ditto.
+
+	* mk/common.mk: Fixed so that per package INSTALLDIR works:
+	(INSTALLDIROK): Is now a deferred variable.
+	(INST_*): Not passed through SEDPIPE for now.
+
+	* gtk2hs.spec.in (%build): Instead of "--with c2hs" rpmbuild
+	option, if %c2hs defined then pass it with --with-c2hs= to
+	configure.
+	(%install): Install sourceview haskell.lang file.  Clean demo
+	to prevent binary files in doc dir.
+
+	* configure.in: Only use GTK for gtk2 package check.  Use GTKGLEXT
+	for gtkglext and SOURCEVIEW for gtksourceview, so that sourceview
+	cflags and link options do not appear in ghc gtk2 package.  Drop
+	unused PIXBUF config vars from GTK config vars.  Process
+	SOURCEVIEW config vars in the same way as GTK ones.
+	Search for specific external c2hs in PATH, like c2hs is searched
+	with --with-c2hs=yes.  Treat "c2hs-gtk2hs" as a exceptional external
+	c2hs which supports multiple chs files, allowing one to avoid
+	building the internal c2hs on every clean build.
+
+	* Makefile (MAKE_TOOLS): Only add c2hs when BUILT_IN_C2HS is no.
+	(MAKE_DOCS): gendoc doc targets moved here from MAKE_TOOLS since
+	doc must be done after gtk.
+	(MAKE_APPS): Add demo/sourceview.
+	(dist): Depend on gtk2hs.spec.
+	(rpm): dist now depends on gtk2hs.spec.
+	(srpm): Ditto.
+	Include Makefile.local if present for local build configuration.
+
 2003-11-07 Axel Simon <A....@ke...>
 
 	* tools/signals/HookGenerator.hs, tools/signals/Makefile,
@@ -23,7 +72,7 @@
 	* mk/library.mk (INSTALLDIR): Define default package install dir to
 	be under COMMONINSTALLDIR.
 
-	* gtk/Makefile (INSTALLDIR): Drop local def and use default.
+	* gtk/Makefile (INSTALLDIR): Drop local definition and use default.
 
 	* mogul/Makefile (INSTALLDIR): Ditto.
 	

[Gtk2hs-commit] gtk2hs .cvsignore,1.2,1.3

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv12618

Modified Files:
	.cvsignore 
Log Message:
Add Makefile.local, gtk2hs-0.9.* and i386.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- .cvsignore	8 May 2003 06:36:49 -0000	1.2
+++ .cvsignore	11 Nov 2003 12:10:23 -0000	1.3
@@ -1,6 +1,9 @@
+Makefile.local
 autom4te*.cache
 config.log
 config.status
 configure
 gtk2hs.spec
+gtk2hs-0.9.*
+i386
 localpackage.conf

[Gtk2hs-commit] gtk2hs/sourceview SourceTag.chs,1.2,1.3

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/sourceview
In directory sc8-pr-cvs1:/tmp/cvs-serv12096/sourceview

Modified Files:
	SourceTag.chs 
Log Message:
(sourceTagSetStyle): Fix docu typo.


Index: SourceTag.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/SourceTag.chs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SourceTag.chs	2 Nov 2003 23:57:58 -0000	1.2
+++ SourceTag.chs	11 Nov 2003 12:07:43 -0000	1.3
@@ -133,7 +133,7 @@
   {#call unsafe g_free#} tsPtr
   return ts
 
--- @method sourceTagGetStyle@
+-- @method sourceTagSetStyle@
 -- 
 sourceTagSetStyle :: SourceTag -> SourceTagStyle -> IO ()
 sourceTagSetStyle tag ts = alloca $ \tsPtr -> do

[Gtk2hs-commit] gtk2hs/sourceview Makefile,1.4,1.5

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/sourceview
In directory sc8-pr-cvs1:/tmp/cvs-serv11904/sourceview

Modified Files:
	Makefile 
Log Message:
(EXTRA_HFILES): Use relative path.
(EXTRA_TARFILES): Not needed.
(EXTRA_CPPFLAGS): Use SOURCEVIEW_CFLAGS instead.
(EXTRA_LIBS): Use SOURCEVIEW_LIBS instead.


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	4 Nov 2003 04:05:27 -0000	1.4
+++ Makefile	11 Nov 2003 12:07:16 -0000	1.5
@@ -13,8 +13,8 @@
 HIDIRS = ../gtk/glib ../gtk/abstract ../gtk/general ../gtk/multiline
 
 HEADER = sourceview.h
-EXTRA_HFILES	= $(TOP)/sourceview/sourceview.h
-EXTRA_TARFILES	= sourceview.h
+EXTRA_HFILES	= sourceview.h
+#EXTRA_TARFILES	= sourceview.h
 
 ifneq (x$(MULTIPLE_CHS),xyes)
 SourceIter-HEADER		= gtksourceview/gtksourceiter.h
@@ -31,9 +31,9 @@
 endif
 
 # Further options to the C preprocessor are passed verbatim:
-EXTRA_CPPFLAGS	= $(GTK_CFLAGS)
+EXTRA_CPPFLAGS	= $(SOURCEVIEW_CFLAGS)
 
-EXTRA_LIBS	= $(GTK_LIBS)
+EXTRA_LIBS	= $(SOURCEVIEW_LIBS)
 
 ifeq ($(strip $(NEW_MODULE_SYS)),yes)
 NEEDPACKAGES = gtk2

[Gtk2hs-commit] gtk2hs/mk recurse.mk,1.2,1.3

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1:/tmp/cvs-serv11658/mk

Modified Files:
	recurse.mk 
Log Message:
(all): Add MAKE_DOCS.
(inplace): Ditto.
(noinplace): Ditto.
(tarsource): Ditto.
(clean): Ditto.


Index: recurse.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/recurse.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- recurse.mk	3 Nov 2003 14:15:40 -0000	1.2
+++ recurse.mk	11 Nov 2003 12:06:41 -0000	1.3
@@ -5,19 +5,19 @@
 # to extra directories that are included when cleaning and tarring.
 
 
-all : MAKE_GOALS=$(MAKE_TOOLS) $(MAKE_LIBS) $(MAKE_APPS)
+all : MAKE_GOALS=$(MAKE_TOOLS) $(MAKE_LIBS) $(MAKE_DOCS) $(MAKE_APPS)
 all : make-all
 
-inplace : MAKE_GOALS=$(MAKE_TOOLS) $(MAKE_LIBS)
+inplace : MAKE_GOALS=$(MAKE_TOOLS) $(MAKE_LIBS) $(MAKE_DOCS)
 inplace : make-inplace
 
-noinplace : MAKE_GOALS=$(MAKE_TOOLS) $(MAKE_LIBS)
+noinplace : MAKE_GOALS=$(MAKE_TOOLS) $(MAKE_LIBS) $(MAKE_DOCS)
 noinplace : make-noinplace
 
-tarsource : MAKE_GOALS=$(MAKE_TOOLS) $(MAKE_LIBS) $(MAKE_APPS) $(MAKE_VERB)
+tarsource : MAKE_GOALS=$(MAKE_TOOLS) $(MAKE_LIBS) $(MAKE_DOCS) $(MAKE_APPS) $(MAKE_VERB)
 tarsource : make-tarsource
 
-clean : MAKE_GOALS=$(MAKE_TOOLS) $(MAKE_LIBS) $(MAKE_APPS) $(MAKE_VERB)
+clean : MAKE_GOALS=$(MAKE_TOOLS) $(MAKE_LIBS) $(MAKE_DOCS) $(MAKE_APPS) $(MAKE_VERB)
 clean : make-clean
 
 install : MAKE_GOALS=$(MAKE_LIBS) $(MAKE_APPS)

[Gtk2hs-commit] gtk2hs/mk library.mk,1.19,1.20

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1:/tmp/cvs-serv11435/mk

Modified Files:
	library.mk 
Log Message:
(installdirs): Reorder directories.


Index: library.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/library.mk,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- library.mk	4 Nov 2003 04:04:33 -0000	1.19
+++ library.mk	11 Nov 2003 12:06:00 -0000	1.20
@@ -2,7 +2,7 @@
 
 LIBNAME			?= $(PACKAGENAME)
 
-INSTALLDIR = $(COMMONINSTALLDIR)/$(PACKAGENAME)
+INSTALLDIR 		= $(COMMONINSTALLDIR)/$(PACKAGENAME)
 
 TARGETOK		= $(addprefix $(strip $(LIBPREFIX)),\
 			$(addsuffix $(LIBSUFFIX),$(strip $(LIBNAME))))
@@ -53,7 +53,7 @@
 	fi
 
 installdirs :
-	$(INSTALL) -d $(DESTDIR)$(INST_HIDIR) $(DESTDIR)$(INST_LIBDIR) $(DESTDIR)$(INST_INCLDIR)
+	$(INSTALL) -d $(DESTDIR)$(INST_LIBDIR) $(DESTDIR)$(INST_HIDIR) $(DESTDIR)$(INST_INCLDIR)
 
 install-without-pkg : $(TARGETOK) installdirs installfiles
 

[Gtk2hs-commit] gtk2hs/mk config.mk.in,1.19,1.20

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1:/tmp/cvs-serv10889/mk

Modified Files:
	config.mk.in 
Log Message:
(SOURCEVIEW_LIBS): Define.
(SOURCEVIEW_CFLAGS): Ditto.


Index: config.mk.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/config.mk.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- config.mk.in	4 Nov 2003 04:03:56 -0000	1.19
+++ config.mk.in	11 Nov 2003 12:04:56 -0000	1.20
@@ -140,6 +140,9 @@
 
 BUILT_IN_C2HS	= @BUILT_IN_C2HS@
 
+SOURCEVIEW_LIBS	= @SOURCEVIEW_LIBS@
+SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@
+
 .PHONY: default all install installdirs installfiles installpackage \
 	installcheck uninstall uninstallfiles uninstallpackage \
 	clean distclean maintainerclan mostlyclean \

[Gtk2hs-commit] gtk2hs/mk common.mk,1.25,1.26

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1:/tmp/cvs-serv10778/mk

Modified Files:
	common.mk 
Log Message:
Fixes so that per package INSTALLDIR works:
(INSTALLDIROK): Is now a deferred variable.
(INST_*): Not passed through SEDPIPE for now.


Index: common.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- common.mk	2 Nov 2003 23:57:58 -0000	1.25
+++ common.mk	11 Nov 2003 12:04:26 -0000	1.26
@@ -16,7 +16,7 @@
 SUBDIRSOK		:= $(dir $(addsuffix /,$(SUBDIRS)))
 
 # The user supplied subdirectory where the installed files should go.
-INSTALLDIROK		:= $(strip $(if $(INSTALLDIR),\
+INSTALLDIROK		= $(strip $(if $(INSTALLDIR),\
 			/$(patsubst %/,%,$(dir $(INSTALLDIR)/))))
 
 # directories of installation
@@ -25,10 +25,10 @@
 INST_INCLDIR		?= $(INST_HIDIR)
 INST_BINDIR		?= $(addsuffix $(INSTALLDIROK),$(bindir))
 
-INST_HIDIR		:= $(shell echo $(INST_HIDIR) | $(SEDPIPE))
-INST_LIBDIR		:= $(shell echo $(INST_LIBDIR) | $(SEDPIPE))
-INST_INCLDIR		:= $(shell echo $(INST_INCLDIR) | $(SEDPIPE))
-INST_BINDIR		:= $(shell echo $(INST_BINDIR) | $(SEDPIPE))
+#INST_HIDIR		:= $(shell echo $(INST_HIDIR) | $(SEDPIPE))
+#INST_LIBDIR		:= $(shell echo $(INST_LIBDIR) | $(SEDPIPE))
+#INST_INCLDIR		:= $(shell echo $(INST_INCLDIR) | $(SEDPIPE))
+#INST_BINDIR		:= $(shell echo $(INST_BINDIR) | $(SEDPIPE))
 
 # these values are used for building a library in-place
 INPL_HIDIR		:= $(sort $(patsubst %/.,%,$(patsubst %/,%,\

[Gtk2hs-commit] gtk2hs gtk2hs.spec.in,1.8,1.9

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv10551

Modified Files:
	gtk2hs.spec.in 
Log Message:
(%build): Instead of "--with c2hs" rpmbuild
option, if %c2hs defined then pass it with --with-c2hs= to configure.
(%install): Install sourceview haskell.lang file.  Clean demo
to prevent binary files in doc dir.


Index: gtk2hs.spec.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk2hs.spec.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gtk2hs.spec.in	3 Nov 2003 14:16:26 -0000	1.8
+++ gtk2hs.spec.in	11 Nov 2003 12:03:38 -0000	1.9
@@ -63,13 +63,19 @@
 %setup -q
 
 %build
-./configure %{?_with_c2hs} --with-hc=ghc-%{ghc_version} --with-hcflags="-O" --with-catalog=%{_datadir}/sgml/docbook/xmlcatalog --with-html=%{_datadir}/sgml/docbook/xsl-stylesheets/xhtml/chunk.xsl # --with-fo=%{_datadir}/sgml/docbook/xsl-stylesheets/fo/docbook.xsl
+./configure %{?c2hs: --with-c2hs=%{c2hs}} --with-hc=ghc-%{ghc_version} --with-hcflags="-O" --with-catalog=%{_datadir}/sgml/docbook/xmlcatalog --with-html=%{_datadir}/sgml/docbook/xsl-stylesheets/xhtml/chunk.xsl # --with-fo=%{_datadir}/sgml/docbook/xsl-stylesheets/fo/docbook.xsl
 make prefix=%{_prefix} libdir=%{_libdir}/ghc-%{ghc_version}
 
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} prefix=%{_prefix} libdir=%{_libdir}/ghc-%{ghc_version} install-without-pkg
 
+mkdirhier %{buildroot}%{_datadir}/gtksourceview-1.0/language-specs
+cp -p demo/sourceview/haskell.lang %{buildroot}%{_datadir}/gtksourceview-1.0/language-specs
+
+# hack to avoid demo binaries in docs 
+make clean MAKE_GOALS="demo/concurrent demo/treeList demo/graphic demo/unicode demo/hello demo/sourceview"
+
 %clean
 rm -rf %{buildroot}
 
@@ -93,6 +99,7 @@
 %files ghc%{ghc_version}
 %defattr(-,root,root) 
 %{_prefix}/lib/*
+%{_datadir}/gtksourceview-1.0/language-specs/haskell.lang
 %doc ChangeLog TODO AUTHORS COPYING.LIB
 
 %files doc
@@ -102,6 +109,14 @@
 %doc doc/MOGUL
 
 %changelog
+* Tue Nov 11 2003 Jens Petersen <pet...@ha...>
+- use %%c2hs instead of "--with c2hs" to configure c2hs program
+- clean demo to avoid binary files in docs dir
+
+* Mon Nov  3 2003 Jens Petersen <pet...@ha...>
+- add sourceview package to %%post and %%preun
+- install gtksourceview haskell.lang language-spec
+
 * Thu Jul 31 2003 Jens Petersen <pet...@ha...>
 - build with ghc-6.0.1
 - put demo dir in docs dir rather than individual source files

[Gtk2hs-commit] gtk2hs configure.in,1.27,1.28

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv10146

Modified Files:
	configure.in 
Log Message:
Only use GTK for gtk2 package check.  Use GTKGLEXT
for gtkglext and SOURCEVIEW for gtksourceview, so that sourceview
cflags and link options do not appear in ghc gtk2 package.  Drop
unused PIXBUF config vars from GTK config vars.  Process
SOURCEVIEW config vars in the same way as GTK ones.
Search for specific external c2hs in PATH, like c2hs is searched
with --with-c2hs=yes.  Treat "c2hs-gtk2hs" as a exceptional external
c2hs which supports multiple chs files, allowing one to avoid
building the internal c2hs on every clean build.


Index: configure.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- configure.in	21 Oct 2003 23:42:03 -0000	1.27
+++ configure.in	11 Nov 2003 12:02:04 -0000	1.28
@@ -242,16 +242,16 @@
 dnl macro from the pkg-config program.
 PKG_CHECK_MODULES(GTK,[glib-2.0 >= 2.0.0 gdk-2.0 >= 2.0.0 gtk+-2.0 >= 2.0.0 gdk-pixbuf-2.0 >= 0.12.0])
 if test x$ENABLE_OPENGL = xyes; then
-  PKG_CHECK_MODULES(GTK,[gtkglext-1.0 >= 0.7.1])
+  PKG_CHECK_MODULES(GTKGLEXT,[gtkglext-1.0 >= 0.7.1])
 fi
 if test x$ENABLE_SOURCEVIEW = xyes; then
-  PKG_CHECK_MODULES(GTK,[gtksourceview-1.0 >= 0.6.0])
+  PKG_CHECK_MODULES(SOURCEVIEW,[gtksourceview-1.0 >= 0.6.0])
 fi
 
 dnl The configuration program for GTK is kind of stupid in that it
 dnl lists directories which don't exist. ghc-pkg in ghc 5.04 or greater
 dnl does not like that, so we need to filter out non-existent directories.
-TMPGTK_CFLAGS=$GTK_CFLAGS $PIXBUF_CFLAGS;
+TMPGTK_CFLAGS=$GTK_CFLAGS;
 GTK_CFLAGS=;
 for FLAG in $TMPGTK_CFLAGS; do
   case $FLAG in
@@ -260,7 +260,7 @@
     *) GTK_CFLAGS="$GTK_CFLAGS $FLAG";;
   esac;
 done;
-TMPGTK_LIBS=$GTK_LIBS $PIXBUF_LIBS;
+TMPGTK_LIBS=$GTK_LIBS;
 GTK_LIBS=;
 for FLAG in $TMPGTK_LIBS; do
   case $FLAG in
@@ -270,6 +270,25 @@
   esac;
 done;
 
+TMPSOURCEVIEW_CFLAGS=$SOURCEVIEW_CFLAGS;
+SOURCEVIEW_CFLAGS=;
+for FLAG in $TMPSOURCEVIEW_CFLAGS; do
+  case $FLAG in
+    -I*) DIR=`echo $FLAG | $SED "s/-I//"`;
+	 if test -d $DIR; then SOURCEVIEW_CFLAGS="$SOURCEVIEW_CFLAGS -I$DIR"; fi;;
+    *) SOURCEVIEW_CFLAGS="$SOURCEVIEW_CFLAGS $FLAG";;
+  esac;
+done;
+TMPSOURCEVIEW_LIBS=$SOURCEVIEW_LIBS;
+SOURCEVIEW_LIBS=;
+for FLAG in $TMPSOURCEVIEW_LIBS; do
+  case $FLAG in
+    -L*) DIR=`echo $FLAG | $SED "s/-L//"`;
+	 if test -d $DIR; then SOURCEVIEW_LIBS="$SOURCEVIEW_LIBS -L$DIR"; fi;;
+    *) SOURCEVIEW_LIBS="$SOURCEVIEW_LIBS $FLAG";;
+  esac;
+done;
+
 dnl Have a special marshall list (available in the source tree of Gtk+ under
 dnl gtk/gtkmarshal.list)
 
@@ -311,10 +330,12 @@
 	} ;;
       *) {
 	BUILT_IN_C2HS=no;
-	AC_CHECK_FILE($withval,C2HS=$withval,
-          AC_MSG_ERROR([The specified C->Haskell tool was not found.
+	AC_PATH_PROG(C2HS, $withval, notfound)
+        if test $C2HS = notfound; then
+	  AC_MSG_ERROR([The specified C->Haskell tool was not found.
 	          Try compiling with the built-in c2hs by omitting
-		  --with-c2hs=... when calling ./configure .]))
+		  --with-c2hs=... when calling ./configure .])
+	fi
 	} ;;
     esac
   ],[BUILT_IN_C2HS=yes])
@@ -341,16 +362,22 @@
 
 else
   AC_MSG_RESULT([external])
-  MULTIPLE_CHS=no;
-  dnl Find C->Haskell and check its version.
-  dnl Check the version of c2hs
-  AC_CACHE_CHECK([c2hs version], c2hs_version, [
-    c2hs_version=`$C2HS --version | $SED "s/[[^0-9.]*\([0-9.]*\) .*]/\1/"`;
-  ])
-  GTKHS_PROG_CHECK_VERSION($c2hs_version, -lt, 0.11.6,
-    AC_MSG_ERROR([You need C->Haskell version 0.11.6 upwards!
-      ** Download from \"http://www.cse.unsw.edu.au/~chak/haskell/c2hs/\". **]))
-  dnl C->Haskell configuration.
+  case $C2HS in
+    c2hs-gtk2hs) {
+      MULTIPLE_CHS=yes;
+      } ;;
+    *) {
+      MULTIPLE_CHS=no;
+      dnl Find C->Haskell and check its version.
+      dnl Check the version of c2hs
+      AC_CACHE_CHECK([c2hs version], c2hs_version, [
+        c2hs_version=`$C2HS --version | $SED "s/[[^0-9.]*\([0-9.]*\) .*]/\1/"`;
+      ])
+      GTKHS_PROG_CHECK_VERSION($c2hs_version, -lt, 0.11.6,
+        AC_MSG_ERROR([You need C->Haskell version 0.11.6 upwards!
+          ** Download from \"http://www.cse.unsw.edu.au/~chak/haskell/c2hs/\". **]))
+      dnl C->Haskell configuration.
+      } ;;
 fi
 
 # Read the version file
@@ -473,6 +500,8 @@
 dnl AC_SUBST(GTK_MICRO_VERSION)
 AC_SUBST(ENABLE_OPENGL)
 AC_SUBST(ENABLE_SOURCEVIEW)
+AC_SUBST(SOURCEVIEW_CFLAGS)
+AC_SUBST(SOURCEVIEW_LIBS)
 dnl Documentation
 AC_SUBST(BUILDDOCS)
 AC_SUBST(XSLTTRANS)

[Gtk2hs-commit] gtk2hs Makefile,1.19,1.20

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv9877

Modified Files:
	Makefile 
Log Message:
(MAKE_TOOLS): Only add c2hs when BUILT_IN_C2HS is no.
(MAKE_DOCS): gendoc and doc targets moved here from MAKE_TOOLS since
 doc must be done after gtk.
(MAKE_APPS): Add demo/sourceview.
(dist): Depend on gtk2hs.spec.
(rpm): dist now depends on gtk2hs.spec.
(srpm): Ditto.
Include Makefile.local if present for local build configuration.


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile	3 Nov 2003 14:13:58 -0000	1.19
+++ Makefile	11 Nov 2003 12:01:21 -0000	1.20
@@ -2,18 +2,24 @@
 
 include $(TOP)/mk/config.mk
 
-MAKE_TOOLS = c2hs tools/typehier tools/signals
+MAKE_TOOLS = tools/typehier tools/signals
+
+ifeq ($(strip $(BUILT_IN_C2HS)),no)
+MAKE_VERB  += c2hs
+else
+MAKE_TOOLS += c2hs
+endif
 
 ifeq ($(strip $(BUILDDOCS)),no)
 MAKE_VERB  =  gendoc doc
 else
-MAKE_TOOLS  +=  gendoc doc
+MAKE_DOCS  =  gendoc doc
 endif
 
 MAKE_LIBS  = gtk sourceview mogul
 
 MAKE_APPS  = demo/concurrent demo/treeList demo/graphic demo/unicode \
-	     demo/hello
+	     demo/hello demo/sourceview
 
 EXTRA_TARFILES = $(strip AUTHORS COPYING.LIB ChangeLog INSTALL Makefile \
 			 TODO VERSION aclocal.m4 acinclude.m4 \
@@ -22,7 +28,7 @@
 		 	 mk/library.mk mk/chsDepend.in install-sh \
 			 config.sub config.guess gtk2hs.spec.in gtk2hs.spec )
 
-dist :
+dist : configure gtk2hs.spec
 	$(RM) -r $(TARNAME)
 	$(RM) $(TARNAME).tar $(TARNAME).tar.gz
 	$(LN) . $(TARNAME)
@@ -32,13 +38,17 @@
 	$(GZIP) $(TARNAME).tar
 	$(RM) $(TARNAME)
 
-rpm: gtk2hs.spec dist
-	rpmbuild -ba gtk2hs.spec
+rpm: dist
+	rpmbuild -ba gtk2hs.spec $(RPMOPTS)
 
-srpm: gtk2hs.spec dist
+srpm: dist
 	rpmbuild -bs gtk2hs.spec
 
-gtk2hs.spec: VERSION gtk2hs.spec.in
+%: %.in
 	./configure
 
+gtk2hs.spec: VERSION
+
 include $(TOP)/mk/recurse.mk
+
+-include $(TOP)/Makefile.local

Re: [Gtk2hs-commit] gtk2hs ChangeLog,1.98,1.99

[Jens P. <pet...@re...>]

>>>>> "AS" == Axel Simon <A....@ke...> writes:

    AS> I hope I fixed that now. CVS doesn't cope too well
    AS> with adding and deleting stuff. I hope that the old
    AS> directories under gtk/ are now gone and that the new
    AS> files under tools/ are now ok.

Yep, I think it is fine now.

Thanks, -Jens

Re: [Gtk2hs-commit] gtk2hs ChangeLog,1.98,1.99

[Axel S. <A....@ke...>]

On Mon, Nov 10, 2003 at 05:57:28PM +0900, Jens Petersen wrote:
> Hi Axel,
> 
> 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.

Yes. Gosh I'm stupid. I hope I fixed that now. CVS doesn't cope too well 
with adding and deleting stuff. I hope that the old directories under gtk/ 
are now gone and that the new files under tools/ are now ok.

Thanks for bringing that up,
Axel.