From d62f325b9cb77d2c2000d66c255908d2a57bc842 Mon Sep 17 00:00:00 2001 From: Matthew Johnson Date: Tue, 14 Nov 2006 16:04:45 +0000 Subject: whoops --- Makefile | 9 ++++++--- changelog | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 667f58d..5ef0fa5 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +37,9 @@ LIBPREFIX?=$(PREFIX)/lib/jni BINPREFIX?=$(PREFIX)/bin DOCPREFIX?=$(PREFIX)/share/doc/libdbus-java MANPREFIX?=$(PREFIX)/share/man/man1 +RUNPREFIX?=$(PREFIX) +RUNJARPREFIX?=$(RUNPREFIX)/share/java +RUNLIBPREFIX?=$(RUNPREFIX)/lib/jni VERSION = 1.11 RELEASEVERSION = 1.10 @@ -192,11 +195,11 @@ install: dbus-java-viewer-$(VERSION).jar libdbus-java-$(VERSION).jar libdbus-jav install -d $(LIBPREFIX) install libdbus-java.so $(LIBPREFIX) install -d $(BINPREFIX) - sed 's,\%JARPATH\%,$(JARPREFIX),;s,\%LIBPATH\%,$(LIBPREFIX),' < bin/DBusViewer > $(BINPREFIX)/DBusViewer + sed 's,\%JARPATH\%,$(RUNJARPREFIX),;s,\%LIBPATH\%,$(RUNLIBPREFIX),' < bin/DBusViewer > $(BINPREFIX)/DBusViewer chmod +x $(BINPREFIX)/DBusViewer - sed 's,\%JARPATH\%,$(JARPREFIX),;s,\%LIBPATH\%,$(LIBPREFIX),' < bin/CreateInterface > $(BINPREFIX)/CreateInterface + sed 's,\%JARPATH\%,$(RUNJARPREFIX),;s,\%LIBPATH\%,$(RUNLIBPREFIX),' < bin/CreateInterface > $(BINPREFIX)/CreateInterface chmod +x $(BINPREFIX)/CreateInterface - sed 's,\%JARPATH\%,$(JARPREFIX),;s,\%LIBPATH\%,$(LIBPREFIX),' < bin/ListDBus > $(BINPREFIX)/ListDBus + sed 's,\%JARPATH\%,$(RUNJARPREFIX),;s,\%LIBPATH\%,$(RUNLIBPREFIX),' < bin/ListDBus > $(BINPREFIX)/ListDBus chmod +x $(BINPREFIX)/ListDBus install-doc: doc CreateInterface.1 ListDBus.1 DBusViewer.1 changelog AUTHORS COPYING README INSTALL diff --git a/changelog b/changelog index 98ee899..52a6c58 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,6 @@ Version 1.11: - * + * fix script replacement directories to be different to install directories Version 1.10: -- cgit v1.2.3 From 547073e01fc0e17b010aec9c0b087a8e23e4f497 Mon Sep 17 00:00:00 2001 From: Matthew Johnson Date: Tue, 14 Nov 2006 16:32:52 +0000 Subject: split install-man and install-doc --- INSTALL | 2 +- Makefile | 13 ++++++++----- changelog | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/INSTALL b/INSTALL index 50bab41..d59f76f 100644 --- a/INSTALL +++ b/INSTALL @@ -31,7 +31,7 @@ directories can be achieved using the BINDIR etc variables. For more detail read the Makefile. Documentation for the bindings can be built with `make doc' and installed with -`make install-doc', with the same provisos for installation paths. +`make install-doc install-man', with the same provisos for installation paths. Using the Bindings ------------------ diff --git a/Makefile b/Makefile index 5ef0fa5..5e5f4f6 100644 --- a/Makefile +++ b/Makefile @@ -202,13 +202,20 @@ install: dbus-java-viewer-$(VERSION).jar libdbus-java-$(VERSION).jar libdbus-jav sed 's,\%JARPATH\%,$(RUNJARPREFIX),;s,\%LIBPATH\%,$(RUNLIBPREFIX),' < bin/ListDBus > $(BINPREFIX)/ListDBus chmod +x $(BINPREFIX)/ListDBus -install-doc: doc CreateInterface.1 ListDBus.1 DBusViewer.1 changelog AUTHORS COPYING README INSTALL +install-man: CreateInterface.1 ListDBus.1 DBusViewer.1 changelog AUTHORS COPYING README INSTALL install -d $(DOCPREFIX) install -m 644 changelog $(DOCPREFIX) install -m 644 COPYING $(DOCPREFIX) install -m 644 AUTHORS $(DOCPREFIX) install -m 644 README $(DOCPREFIX) install -m 644 INSTALL $(DOCPREFIX) + install -d $(MANPREFIX) + install -m 644 CreateInterface.1 $(MANPREFIX)/CreateInterface.1 + install -m 644 ListDBus.1 $(MANPREFIX)/ListDBus.1 + install -m 644 DBusViewer.1 $(MANPREFIX)/DBusViewer.1 + +install-doc: doc + install -d $(DOCPREFIX) install -m 644 doc/dbus-java.dvi $(DOCPREFIX) install -m 644 doc/dbus-java.ps $(DOCPREFIX) install -m 644 doc/dbus-java.pdf $(DOCPREFIX) @@ -218,10 +225,6 @@ install-doc: doc CreateInterface.1 ListDBus.1 DBusViewer.1 changelog AUTHORS COP install -m 644 doc/dbus-java/*.png $(DOCPREFIX)/dbus-java install -d $(DOCPREFIX)/api cp -a doc/api/* $(DOCPREFIX)/api - install -d $(MANPREFIX) - install -m 644 CreateInterface.1 $(MANPREFIX)/CreateInterface.1 - install -m 644 ListDBus.1 $(MANPREFIX)/ListDBus.1 - install -m 644 DBusViewer.1 $(MANPREFIX)/DBusViewer.1 dist: .dist .dist: bin dbus-java.c dbus-java.tex Makefile org tmp-session.conf CreateInterface.sgml ListDBus.sgml DBusViewer.sgml changelog AUTHORS COPYING README INSTALL diff --git a/changelog b/changelog index 52a6c58..6fdc2de 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,7 @@ Version 1.11: * fix script replacement directories to be different to install directories + * split install-doc and install-man to allow easy split -doc package Version 1.10: -- cgit v1.2.3 From a16deb186f8b20a06e0118cbc13a169399e29b9d Mon Sep 17 00:00:00 2001 From: Matthew Johnson Date: Thu, 16 Nov 2006 16:18:39 +0000 Subject: new todo item --- TODO | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO b/TODO index 60a07ee..4a61b27 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,6 @@ * support Enums as UInt32s * use native java backend + * allow 'virtual' object handlers, so that all object paths under a certain hierarchy are handled by the same object * make it work with free VM/Compilers: make CFLAGS="`pkg-config --cflags dbus-1` -I/opt/java-generics/include" CLASSPATH=/opt/java-generics/share/classpath/glibj.zip:. LD_LIBRARY_PATH=/opt/java-generics/lib/classpath/ JAVAC="ecj -1.5" JAVA_HOME=/opt/java-generics/ JCFLAGS="-cp classes -bootclasspath /opt/java-generics/share/classpath/glibj.zip" JAVA=jamvm check after installing eclipse eclipse-ecj jamvm and compiling classpath-generics with prefix=/opt/java-generics -- cgit v1.2.3 From c2eeee75a016f1a352aa546b5e60d096e62be93d Mon Sep 17 00:00:00 2001 From: Matthew Johnson Date: Thu, 16 Nov 2006 16:19:15 +0000 Subject: more todo items --- TODO | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TODO b/TODO index 4a61b27..f0f9381 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,8 @@ * support Enums as UInt32s * use native java backend * allow 'virtual' object handlers, so that all object paths under a certain hierarchy are handled by the same object + * fix dbus-viewer to recurse on paths + * extend dbus-viewer to make calls * make it work with free VM/Compilers: make CFLAGS="`pkg-config --cflags dbus-1` -I/opt/java-generics/include" CLASSPATH=/opt/java-generics/share/classpath/glibj.zip:. LD_LIBRARY_PATH=/opt/java-generics/lib/classpath/ JAVAC="ecj -1.5" JAVA_HOME=/opt/java-generics/ JCFLAGS="-cp classes -bootclasspath /opt/java-generics/share/classpath/glibj.zip" JAVA=jamvm check after installing eclipse eclipse-ecj jamvm and compiling classpath-generics with prefix=/opt/java-generics -- cgit v1.2.3 From f1a9ec0f79eb66eda93c62c9b04360f62d1a7b79 Mon Sep 17 00:00:00 2001 From: Matthew Johnson Date: Fri, 17 Nov 2006 12:57:16 +0000 Subject: new todo --- TODO | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/TODO b/TODO index f0f9381..322cdab 100644 --- a/TODO +++ b/TODO @@ -3,6 +3,10 @@ * allow 'virtual' object handlers, so that all object paths under a certain hierarchy are handled by the same object * fix dbus-viewer to recurse on paths * extend dbus-viewer to make calls + * check that this is true: + objects should not return ObjectUnknown if the path has an existant + child node, but should if not (for introspection) It should return + UnknownInterface or Method * make it work with free VM/Compilers: make CFLAGS="`pkg-config --cflags dbus-1` -I/opt/java-generics/include" CLASSPATH=/opt/java-generics/share/classpath/glibj.zip:. LD_LIBRARY_PATH=/opt/java-generics/lib/classpath/ JAVAC="ecj -1.5" JAVA_HOME=/opt/java-generics/ JCFLAGS="-cp classes -bootclasspath /opt/java-generics/share/classpath/glibj.zip" JAVA=jamvm check after installing eclipse eclipse-ecj jamvm and compiling classpath-generics with prefix=/opt/java-generics -- cgit v1.2.3