Merge authors: James Hunt (jamesodhunt) Related merge proposals: https://code.launchpad.net/~jamesodhunt/upstart/fix-libupstart/+merge/172371 proposed by: James Hunt (jamesodhunt) review: Resubmit - James Hunt (jamesodhunt) review: Needs Fixing - Dmitrijs Ledkovs (xnox) ------------------------------------------------------------ revno: 1501 [merge] committer: Dmitrijs Ledkovs <[email protected]> branch nick: upstart timestamp: Wed 2013-07-03 14:23:49 +0100 message: Merge lp:~jamesodhunt/upstart/fix-libupstart modified: ChangeLog Makefile.am configure.ac lib/Makefile.am lib/tests/test_libupstart.c lib/upstart.h
-- lp:upstart https://code.launchpad.net/~upstart-devel/upstart/trunk Your team Upstart Reviewers is subscribed to branch lp:upstart. To unsubscribe from this branch go to https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'ChangeLog' --- ChangeLog 2013-07-03 08:26:23 +0000 +++ ChangeLog 2013-07-03 12:37:29 +0000 @@ -6,6 +6,24 @@ - Check nih_str_split() return. - Only attempt to extract PID from UPSTART_SESSION in user mode (LP: #1197225). + * Makefile.am: Remove intl directory. + * configure.ac: Use external gettext library. + +2013-07-02 James Hunt <[email protected]> + + * lib/Makefile.am: Make nih-dbus-tool generate code into the + upstart/ directory as we need it there to allow the tests to run + against a simulated installed header directory. + * lib/tests/test_libupstart.c: Remove unecessary include (which + is now included automatically by upstart.h). + +2013-07-01 James Hunt <[email protected]> + + * lib/Makefile.am: + - Install client library headers. + - Add missing backslash. + * lib/upstart.h: Look in upstart/ sub-directory for + auto-generated header files. 2013-06-28 James Hunt <[email protected]> === modified file 'Makefile.am' --- Makefile.am 2013-06-26 09:43:16 +0000 +++ Makefile.am 2013-07-03 12:26:27 +0000 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = test intl dbus init util extra lib conf doc contrib po scripts +SUBDIRS = test dbus init util extra lib conf doc contrib po scripts EXTRA_DIST = HACKING === modified file 'configure.ac' --- configure.ac 2013-06-28 13:30:44 +0000 +++ configure.ac 2013-07-03 12:26:27 +0000 @@ -16,7 +16,7 @@ LT_INIT AM_GNU_GETTEXT_VERSION([0.17]) -AM_GNU_GETTEXT() +AM_GNU_GETTEXT([external]) # Checks for programs. AC_PROG_CC === modified file 'lib/Makefile.am' --- lib/Makefile.am 2013-06-27 10:16:35 +0000 +++ lib/Makefile.am 2013-07-02 15:55:48 +0000 @@ -23,12 +23,30 @@ # The library is built from the autogenerated code. libupstart_la_SOURCES = upstart.h +include_HEADERS = $(libupstart_la_SOURCES) + +upstartincludedir = $(includedir)/upstart + +upstartinclude_HEADERS = \ + upstart/com.ubuntu.Upstart.h \ + upstart/com.ubuntu.Upstart.Instance.h \ + upstart/com.ubuntu.Upstart.Job.h \ + upstart/upstart-dbus.h + + +upstart/upstart-dbus.h: \ + $(top_srcdir)/dbus/upstart.h \ + upstart/com.ubuntu.Upstart.h \ + upstart/com.ubuntu.Upstart.Instance.h \ + upstart/com.ubuntu.Upstart.Job.h + cp $< $@ + nodist_libupstart_la_SOURCES = \ $(com_ubuntu_Upstart_OUTPUTS) \ $(com_ubuntu_Upstart_Job_OUTPUTS) \ $(com_ubuntu_Upstart_Instance_OUTPUTS) -libupstart_la_LIBADD = +libupstart_la_LIBADD = \ $(LTLIBINTL) \ $(NIH_LIBS) \ $(NIH_DBUS_LIBS) \ @@ -86,8 +104,8 @@ -lrt com_ubuntu_Upstart_OUTPUTS = \ - com.ubuntu.Upstart.c \ - com.ubuntu.Upstart.h + upstart/com.ubuntu.Upstart.c \ + upstart/com.ubuntu.Upstart.h com_ubuntu_Upstart_XML = \ ../dbus/com.ubuntu.Upstart.xml @@ -95,6 +113,7 @@ # XXX: We have to use proxy mode for clients # XXX: (meaning we cannot use the library for init itself) $(com_ubuntu_Upstart_OUTPUTS): $(com_ubuntu_Upstart_XML) + mkdir -p upstart $(AM_V_GEN)$(NIH_DBUS_TOOL) \ --package=$(PACKAGE) \ --mode=proxy --prefix=upstart \ @@ -102,13 +121,14 @@ --output=$@ $< com_ubuntu_Upstart_Job_OUTPUTS = \ - com.ubuntu.Upstart.Job.c \ - com.ubuntu.Upstart.Job.h + upstart/com.ubuntu.Upstart.Job.c \ + upstart/com.ubuntu.Upstart.Job.h com_ubuntu_Upstart_Job_XML = \ ../dbus/com.ubuntu.Upstart.Job.xml $(com_ubuntu_Upstart_Job_OUTPUTS): $(com_ubuntu_Upstart_Job_XML) + mkdir -p upstart $(AM_V_GEN)$(NIH_DBUS_TOOL) \ --package=$(PACKAGE) \ --mode=proxy --prefix=job_class \ @@ -116,13 +136,14 @@ --output=$@ $< com_ubuntu_Upstart_Instance_OUTPUTS = \ - com.ubuntu.Upstart.Instance.c \ - com.ubuntu.Upstart.Instance.h + upstart/com.ubuntu.Upstart.Instance.c \ + upstart/com.ubuntu.Upstart.Instance.h com_ubuntu_Upstart_Instance_XML = \ ../dbus/com.ubuntu.Upstart.Instance.xml $(com_ubuntu_Upstart_Instance_OUTPUTS): $(com_ubuntu_Upstart_Instance_XML) + mkdir -p upstart $(AM_V_GEN)$(NIH_DBUS_TOOL) \ --package=$(PACKAGE) \ --mode=proxy --prefix=job \ @@ -134,7 +155,8 @@ BUILT_SOURCES = \ $(com_ubuntu_Upstart_OUTPUTS) \ $(com_ubuntu_Upstart_Job_OUTPUTS) \ - $(com_ubuntu_Upstart_Instance_OUTPUTS) + $(com_ubuntu_Upstart_Instance_OUTPUTS) \ + upstart/upstart-dbus.h CLEANFILES = \ $(com_ubuntu_Upstart_OUTPUTS) \ @@ -149,6 +171,7 @@ clean-local: rm -f *.gcno *.gcda + rm -rf upstart/ maintainer-clean-local: rm -f *.gcov === modified file 'lib/tests/test_libupstart.c' --- lib/tests/test_libupstart.c 2013-06-27 15:14:30 +0000 +++ lib/tests/test_libupstart.c 2013-07-02 14:16:20 +0000 @@ -32,8 +32,6 @@ #include <nih-dbus/errors.h> #include <nih-dbus/dbus_connection.h> -#include "dbus/upstart.h" - #include "upstart.h" #include "test_util_common.h" === modified file 'lib/upstart.h' --- lib/upstart.h 2013-05-22 11:11:00 +0000 +++ lib/upstart.h 2013-07-01 17:12:42 +0000 @@ -24,9 +24,10 @@ NIH_BEGIN_EXTERN -#include "com.ubuntu.Upstart.h" -#include "com.ubuntu.Upstart.Instance.h" -#include "com.ubuntu.Upstart.Job.h" +#include "upstart/upstart-dbus.h" +#include "upstart/com.ubuntu.Upstart.h" +#include "upstart/com.ubuntu.Upstart.Instance.h" +#include "upstart/com.ubuntu.Upstart.Job.h" NIH_END_EXTERN
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
