[Xfce4-commits] <midori:master> Build katze, core and panels as one, and allow non-progressive build
Christian Dywan
noreply at xfce.org
Fri Jan 1 18:24:02 CET 2010
Updating branch refs/heads/master
to 15658145b2860bad4a9df40bec753194a8288e7a (commit)
from fc7689f906af62439336f0bd71802585d098594f (commit)
commit 15658145b2860bad4a9df40bec753194a8288e7a
Author: Christian Dywan <christian at twotoasts.de>
Date: Fri Jan 1 18:20:08 2010 +0100
Build katze, core and panels as one, and allow non-progressive build
This simplifies the build and possibly helps with linking problems
on some platforms. The 'progressive' option allows building
without an intermediate static library except for unit tests.
katze/katze-array.c | 2 +-
katze/katze-arrayaction.c | 2 +-
katze/marshal.list | 2 -
katze/wscript_build | 14 -----------
midori/marshal.list | 2 +
midori/wscript_build | 57 +++++++++++++++++++++++---------------------
tests/wscript_build | 2 +-
wscript | 2 +-
8 files changed, 36 insertions(+), 47 deletions(-)
diff --git a/katze/katze-array.c b/katze/katze-array.c
index 93a3f56..1a7cba0 100644
--- a/katze/katze-array.c
+++ b/katze/katze-array.c
@@ -166,7 +166,7 @@ katze_array_class_init (KatzeArrayClass* class)
G_STRUCT_OFFSET (KatzeArrayClass, move_item),
0,
NULL,
- katze_cclosure_marshal_VOID__POINTER_INT,
+ midori_cclosure_marshal_VOID__POINTER_INT,
G_TYPE_NONE, 2,
G_TYPE_POINTER,
G_TYPE_INT);
diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c
index 4186d60..bff1c5f 100644
--- a/katze/katze-arrayaction.c
+++ b/katze/katze-arrayaction.c
@@ -136,7 +136,7 @@ katze_array_action_class_init (KatzeArrayActionClass* class)
0,
0,
NULL,
- katze_cclosure_marshal_BOOLEAN__OBJECT_UINT,
+ midori_cclosure_marshal_BOOLEAN__OBJECT_UINT,
G_TYPE_BOOLEAN, 2,
KATZE_TYPE_ITEM, G_TYPE_UINT);
diff --git a/katze/marshal.list b/katze/marshal.list
deleted file mode 100644
index f2d1b07..0000000
--- a/katze/marshal.list
+++ /dev/null
@@ -1,2 +0,0 @@
-VOID:POINTER,INT
-BOOLEAN:OBJECT,UINT
diff --git a/katze/wscript_build b/katze/wscript_build
deleted file mode 100644
index 572bdd1..0000000
--- a/katze/wscript_build
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /usr/bin/env python
-# WAF build script for midori
-# This file is licensed under the terms of the expat license, see the file EXPAT.
-
-import platform
-
-obj = bld.new_task_gen ('cc', 'staticlib')
-obj.name = 'katze'
-obj.target = 'katze'
-obj.includes = '. ../.'
-obj.find_sources_in_dirs ('.')
-obj.add_marshal_file ('marshal.list', 'katze_cclosure_marshal')
-obj.uselib = 'M GMODULE LIBSOUP GTK HILDON LIBXML WEBKIT'
-obj.install_path = None
diff --git a/midori/marshal.list b/midori/marshal.list
index 8d27c7c..9d0337c 100644
--- a/midori/marshal.list
+++ b/midori/marshal.list
@@ -1,8 +1,10 @@
BOOLEAN:OBJECT
+BOOLEAN:OBJECT,UINT
BOOLEAN:VOID
OBJECT:OBJECT
VOID:BOOLEAN,STRING
VOID:OBJECT,ENUM
+VOID:POINTER,INT
VOID:STRING,BOOLEAN
VOID:STRING,INT,STRING
VOID:STRING,STRING
diff --git a/midori/wscript_build b/midori/wscript_build
index 8948599..addb3b2 100644
--- a/midori/wscript_build
+++ b/midori/wscript_build
@@ -4,32 +4,35 @@
import platform
-obj = bld.new_task_gen ('cc', 'staticlib')
-obj.name = 'midori-core'
-obj.target = 'midori'
-obj.includes = '. ..'
-obj.find_sources_in_dirs ('.', excludes=['main.c'])
-obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal')
-obj.uselib = 'UNIQUE LIBSOUP LIBIDN GIO GTK SQLITE LIBNOTIFY WEBKIT LIBXML ' \
- 'WS2_32 OPENSSL ' \
- 'HILDON HILDON_FM'
-obj.uselib_local = 'katze'
-obj.install_path = None
+progressive = True
+libs = 'M UNIQUE LIBSOUP GMODULE GTHREAD LIBIDN GIO GTK SQLITE ' \
+ 'LIBNOTIFY WEBKIT LIBXML X11 WS2_32 OPENSSL HILDON HILDON_FM'
-obj = bld.new_task_gen ('cc', 'staticlib')
-obj.name = 'panels'
-obj.target = 'panels'
-obj.includes = '. ..'
-obj.find_sources_in_dirs ('../panels')
-obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML X11'
-obj.uselib_local = 'midori-core'
-obj.install_path = None
+if progressive or Options.commands['check']:
+ obj = bld.new_task_gen ('cc', 'staticlib')
+ obj.target = 'midori-core'
+ obj.includes = '.. ../katze .'
+ obj.find_sources_in_dirs ('../katze . ../panels', excludes=['main.c'])
+ obj.uselib = libs
+ obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal')
+ obj.install_path = None
+ bld.add_group ()
-obj = bld.new_task_gen ('cc', 'program')
-obj.target = 'midori'
-obj.includes = '. .. ../panels'
-obj.source = 'main.c'
-if bld.env['WINRC']:
- obj.source += ' ../data/midori.rc'
-obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML'
-obj.uselib_local = 'panels'
+if progressive:
+ obj = bld.new_task_gen ('cc', 'program')
+ obj.target = 'midori'
+ obj.includes = '.. ../katze . ../panels'
+ obj.find_sources_in_dirs ('../katze .')
+ obj.uselib = libs
+ obj.uselib_local = 'midori-core'
+ if bld.env['WINRC']:
+ obj.source += ' ../data/midori.rc'
+else:
+ obj = bld.new_task_gen ('cc', 'program')
+ obj.target = 'midori'
+ obj.includes = '.. ../katze . ../panels'
+ obj.find_sources_in_dirs ('../katze . ../panels')
+ obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal')
+ obj.uselib = libs
+ if bld.env['WINRC']:
+ obj.source += ' ../data/midori.rc'
diff --git a/tests/wscript_build b/tests/wscript_build
index 946ebbb..62ff282 100644
--- a/tests/wscript_build
+++ b/tests/wscript_build
@@ -29,5 +29,5 @@ for test in tests:
obj.cflags = ['-DEXTENSION_PATH="' + os.path.abspath ('_build_/default/extensions') + '"']
obj.source = source
obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML'
- obj.uselib_local = 'panels'
+ obj.uselib_local = 'midori-core'
obj.unit_test = 1
diff --git a/wscript b/wscript
index e1b1b1a..a068237 100644
--- a/wscript
+++ b/wscript
@@ -391,7 +391,7 @@ def build (bld):
bld.add_group ()
- bld.add_subdirs ('katze midori icons')
+ bld.add_subdirs ('midori icons')
if bld.env['addons']:
bld.add_subdirs ('extensions')
More information about the Xfce4-commits
mailing list