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.
This commit is contained in:
parent
fc7689f906
commit
15658145b2
8 changed files with 36 additions and 47 deletions
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
VOID:POINTER,INT
|
||||
BOOLEAN:OBJECT,UINT
|
|
@ -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
|
|
@ -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
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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
|
||||
|
|
2
wscript
2
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')
|
||||
|
|
Loading…
Reference in a new issue