[packagekit] packagekit: Branch 'master' - 3 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Fri Nov 23 15:39:21 PST 2007
TODO | 10 ++++++----
backends/yum/Makefile.am | 3 +++
client/Makefile.am | 5 +++++
client/wscript_build | 2 ++
contrib/wscript_build | 18 ++++++++++++++++++
contrib/yum-packagekit/wscript_build | 17 +++++++++++++++++
data/wscript_build | 7 +++++--
docs/wscript_build | 7 ++++---
libgbus/Makefile.am | 7 ++++++-
libpackagekit/Makefile.am | 7 ++++++-
libpackagekit/wscript_build | 4 +++-
libselftest/Makefile.am | 4 ++++
policy/wscript_build | 5 ++++-
src/Makefile.am | 6 +++++-
src/wscript_build | 4 +++-
wscript | 14 +++++++-------
16 files changed, 98 insertions(+), 22 deletions(-)
New commits:
commit e8dd8ca73de0789201a13d05148110b78afe8e8c
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Nov 23 23:35:30 2007 +0000
fix the waf build
diff --git a/client/wscript_build b/client/wscript_build
index da03f91..6a6231b 100644
--- a/client/wscript_build
+++ b/client/wscript_build
@@ -9,6 +9,8 @@
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
+env = bld.env()
+
obj = bld.create_obj('cc', 'program')
obj.source = 'pk-console.c'
obj.includes = '. ../libpackagekit'
diff --git a/contrib/wscript_build b/contrib/wscript_build
new file mode 100644
index 0000000..4515c4d
--- /dev/null
+++ b/contrib/wscript_build
@@ -0,0 +1,18 @@
+#! /usr/bin/env python
+# encoding: utf-8
+#
+# Copyright (C) 2007 Richard Hughes <richard at hughsie.com>
+#
+# Licensed under the GNU General Public License Version 2
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+import Common
+
+bld.add_subdirs('yum-packagekit')
+
+#install the data files
+Common.install_files('PREFIX', os.path.join('etc', 'bash_completion.d'), 'pk-completion.bash')
+
diff --git a/contrib/yum-packagekit/wscript_build b/contrib/yum-packagekit/wscript_build
new file mode 100644
index 0000000..d0a4f30
--- /dev/null
+++ b/contrib/yum-packagekit/wscript_build
@@ -0,0 +1,17 @@
+#! /usr/bin/env python
+# encoding: utf-8
+#
+# Copyright (C) 2007 Richard Hughes <richard at hughsie.com>
+#
+# Licensed under the GNU General Public License Version 2
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+import Common
+
+#install the data files
+Common.install_files('PREFIX', os.path.join('etc', 'yum', 'pluginconf.d'), 'refresh-packagekit.conf')
+Common.install_files('PREFIX', os.path.join('usr', 'lib', 'yum-plugins'), 'refresh-packagekit.py')
+
diff --git a/data/wscript_build b/data/wscript_build
index d63433f..6ae4d41 100644
--- a/data/wscript_build
+++ b/data/wscript_build
@@ -9,6 +9,9 @@
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
+import misc
+import Common
+
#only install if we are testing
if Params.g_options.tests:
bld.add_subdirs('tests')
@@ -23,6 +26,6 @@ obj.install_var = 'PREFIX'
obj.install_subdir = 'usr/share/dbus-1/system-services'
#install the data files
-install_files('PREFIX', 'var/run/PackageKit', 'job_count.dat')
-install_files('PREFIX', 'var/lib/PackageKit', 'transactions.db')
+Common.install_files('PREFIX', os.path.join('var', 'run', 'PackageKit'), 'job_count.dat')
+Common.install_files('PREFIX', os.path.join('var', 'lib', 'PackageKit'), 'transactions.db')
diff --git a/docs/wscript_build b/docs/wscript_build
index 4e4629f..73fcc3c 100644
--- a/docs/wscript_build
+++ b/docs/wscript_build
@@ -10,12 +10,13 @@
# (at your option) any later version.
import Utils
+import Common
#install to a versioned doc folder
doc_subdir = os.path.join('doc', Utils.g_module.APPNAME+'-'+Utils.g_module.VERSION)
-install_files('DATADIR', doc_subdir, 'pk-reference.html')
-install_files('DATADIR', doc_subdir, 'pk-structure.png')
-install_files('DATADIR', doc_subdir, 'docbook.css')
+Common.install_files('DATADIR', doc_subdir, 'pk-reference.html')
+Common.install_files('DATADIR', doc_subdir, 'pk-structure.png')
+Common.install_files('DATADIR', doc_subdir, 'docbook.css')
# xmlto html-nochunks -m config.xsl pk-reference.xml
env = bld.env()
diff --git a/libpackagekit/wscript_build b/libpackagekit/wscript_build
index f7003e2..59dd423 100644
--- a/libpackagekit/wscript_build
+++ b/libpackagekit/wscript_build
@@ -9,6 +9,8 @@
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
+import Common
+
obj = bld.create_obj('gnome', 'objects')
obj.includes = '. ../libgbus ../libselftest'
obj.target = 'libpkgkit_common_source'
@@ -55,7 +57,7 @@ obj.target = 'packagekit'
obj.name = 'libpackagekit'
# install headers to /usr/include/packagekit/
-install_files('PREFIX', 'include/packagekit', """
+Common.install_files('PREFIX', os.path.join('include', 'packagekit'), """
pk-debug.h
pk-connection.h
pk-network.h
diff --git a/policy/wscript_build b/policy/wscript_build
index d1fe681..3533dfb 100644
--- a/policy/wscript_build
+++ b/policy/wscript_build
@@ -9,5 +9,8 @@
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
+import Common
+
#install the packagekit.policy file to /usr/share/PolicyKit/policy
-install_files('DATADIR', 'PolicyKit', 'packagekit.policy')
+Common.install_files('DATADIR', 'PolicyKit', 'packagekit.policy')
+
diff --git a/src/wscript_build b/src/wscript_build
index 630cd53..aa514a9 100644
--- a/src/wscript_build
+++ b/src/wscript_build
@@ -9,6 +9,8 @@
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
+import Common
+
env = bld.env()
# Build the objects that are to be a part of both packagekitd and the testsuite
@@ -57,7 +59,7 @@ if env['HAVE_NETWORKMANAGER']:
obj.uselib += ' NM_GLIB'
# Install backend headers to /usr/include/packagekit-backends/
-install_files('PREFIX', 'include/packagekit-backends', """
+Common.install_files('PREFIX', os.path.join('include', 'packagekit-backends'), """
pk-backend.h
pk-backend-python.h
""")
diff --git a/wscript b/wscript
index f36ff1a..bdb10f7 100644
--- a/wscript
+++ b/wscript
@@ -80,17 +80,17 @@ def configure(conf):
#do we build the self tests?
if Params.g_options.tests:
- conf.add_define('PK_BUILD_TESTS', 1)
+ conf.define('PK_BUILD_TESTS', 1)
conf.env['HAVE_TESTS'] = True
- conf.add_define('VERSION', VERSION)
- conf.add_define('GETTEXT_PACKAGE', 'PackageKit')
- conf.add_define('PACKAGE', 'PackageKit')
+ conf.define('VERSION', VERSION)
+ conf.define('GETTEXT_PACKAGE', 'PackageKit')
+ conf.define('PACKAGE', 'PackageKit')
assert conf.env['SYSCONFDIR'], "You have too old WAF; please update to trunk"
- conf.add_define('PK_DB_DIR', os.path.join(conf.env['DATADIR'], 'lib', 'PackageKit'))
- conf.add_define('PK_PLUGIN_DIR', os.path.join(conf.env['LIBDIR'], 'packagekit-backend'))
+ conf.define('PK_DB_DIR', os.path.join(conf.env['DATADIR'], 'lib', 'PackageKit'))
+ conf.define('PK_PLUGIN_DIR', os.path.join(conf.env['LIBDIR'], 'packagekit-backend'))
conf.env['CCDEFINES'] += ['HAVE_CONFIG_H']
conf.write_config_header('config.h')
@@ -114,7 +114,7 @@ def build(bld):
# process subfolders from here
# Pending dirs:
# man python
- bld.add_subdirs('libpackagekit backends client libgbus libselftest etc policy po data src docs')
+ bld.add_subdirs('libpackagekit backends client libgbus libselftest etc policy po data src docs contrib')
#set the user in packagekit.pc.in and install
obj=bld.create_obj('subst')
commit b3b6dfa8122e3d3504ba321663ffeb2c847cf29d
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Nov 23 22:52:00 2007 +0000
add some more files to clean up
diff --git a/TODO b/TODO
index 3f3628d..6275c0c 100644
--- a/TODO
+++ b/TODO
@@ -24,3 +24,9 @@ display a cryptic message when already installed
- Return update when we search for something that is installed, but an
update exists for
+*** FIX WAF:
+ - build errors
+ - build enum.py
+ - install the bash completion script
+ - install the yum module
+
diff --git a/backends/yum/Makefile.am b/backends/yum/Makefile.am
index 4bd6469..8f5dd24 100644
--- a/backends/yum/Makefile.am
+++ b/backends/yum/Makefile.am
@@ -6,3 +6,6 @@ libpk_backend_yum_la_LIBADD = @PK_PLUGIN_LIBS@
libpk_backend_yum_la_LDFLAGS = -module -avoid-version
libpk_backend_yum_la_CFLAGS = @PK_PLUGIN_CFLAGS@
+clean-local:
+ rm -f *.gcno
+
diff --git a/client/Makefile.am b/client/Makefile.am
index c1b95a0..1c10ec3 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -54,6 +54,11 @@ pkmon_LDADD = \
clean-local:
rm -f *~
+ rm -f *.out
+ rm -f *.gcno
+ rm -f *.gcda
+ rm -f gcov.txt
+ rm -f gprof.txt
CLEANFILES = $(BUILT_SOURCES)
diff --git a/libgbus/Makefile.am b/libgbus/Makefile.am
index bd29d01..f0444b6 100644
--- a/libgbus/Makefile.am
+++ b/libgbus/Makefile.am
@@ -31,7 +31,12 @@ libgbus-marshal.h: libgbus-marshal.list
clean-local:
rm -f *~
- rm -f libgbus-marshal.c libgbus-marshal.h
+ rm -f *.out
+ rm -f *.gcno
+ rm -f *.gcda
+ rm -f gcov.txt
+ rm -f gprof.txt
+ rm -f $(BUILT_SOURCES)
CLEANFILES = $(BUILT_SOURCES)
diff --git a/libpackagekit/Makefile.am b/libpackagekit/Makefile.am
index f836225..94e3bc6 100644
--- a/libpackagekit/Makefile.am
+++ b/libpackagekit/Makefile.am
@@ -149,8 +149,13 @@ gprof: clean-gprof all check
gprof .libs/pk-self-test > gprof.txt
endif
-CLEANFILES = *~ $(BUILT_SOURCES) *.bb *.bbg *.da *.gcov *.gcda
+CLEANFILES = $(BUILT_SOURCES)
clean-local:
+ rm -f *~
+ rm -f *.gcno
+ rm -f *.out
+ rm -f gcov.txt
+ rm -f gprof.txt
rm -f $(CLEANFILES)
diff --git a/libselftest/Makefile.am b/libselftest/Makefile.am
index 3f119a5..a777fb1 100644
--- a/libselftest/Makefile.am
+++ b/libselftest/Makefile.am
@@ -15,6 +15,10 @@ libselftest_la_LIBADD = @DBUS_LIBS@ $(INTLLIBS) $(GLIB_LIBS)
clean-local:
rm -f *~
+ rm -f *.gcno
+ rm -f *.out
+ rm -f gcov.txt
+ rm -f gprof.txt
CLEANFILES = $(BUILT_SOURCES)
diff --git a/src/Makefile.am b/src/Makefile.am
index c1e5573..a6c98c2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -176,9 +176,13 @@ EXTRA_DIST = \
clean-local:
rm -f *~
+ rm -f *.out
+ rm -f *.gcno
+ rm -f gcov.txt
+ rm -f gprof.txt
rm -f pk-marshal.c pk-marshal.h
-CLEANFILES = *~ $(BUILT_SOURCES) *.bb *.bbg *.da *.gcov *.gcda
+CLEANFILES = *~ $(BUILT_SOURCES)
MAINTAINERCLEANFILES = \
*~ \
commit 01099a3220ec27cdaa3410e43060ace90d6a3c3a
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Nov 23 19:33:04 2007 +0000
update TODO
diff --git a/TODO b/TODO
index 72e4358..3f3628d 100644
--- a/TODO
+++ b/TODO
@@ -3,10 +3,6 @@ Order of no particular importance:
*** write to the database for config stuff
- Probably should move the job number too
-*** Write a yum plugin that makes PackageKit reload
- - if there has been updates
- - if there has been a system update
-
*** package->status ***
Convert the backends to send more status calls.
More information about the PackageKit
mailing list