diff options
| author | Matthew Johnson <mjj29@hecate.trinhall.cam.ac.uk> | 2006-12-29 15:20:59 +0000 |
|---|---|---|
| committer | Matthew Johnson <mjj29@hecate.trinhall.cam.ac.uk> | 2006-12-29 15:20:59 +0000 |
| commit | 129eed36e2cc5e55c2a2ab057e2eccbe0e23c395 (patch) | |
| tree | 1d7d250e9c8650f121d380b044fa1be3aa4d8148 /Makefile | |
| parent | ed1ac8c95969c62653b8358940b62833a8d56fbe (diff) | |
* Add peer 2 peer support with DirectConnection class
* add peer to peer test
* split some code from DBusConnection into common super-class
AbstractConnection
* Support float ('f') type with tests
* Degrade floats to doubles when DBUS_JAVA_FLOATS is not set
* add DBus.Peer interface to standard introspection data
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -97,7 +97,7 @@ doc/dbus-java/index.html: dbus-java.tex .doc rm -f doc/dbus-java/*{4ct,4tc,aux,dvi,idv,lg,log,tmp,xref} cp doc/dbus-java/dbus-java.html doc/dbus-java/index.html doc/api/index.html: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java .doc - $(JAVADOC) -quiet -author -link http://java.sun.com/j2se/1.5.0/docs/api/ -d doc/api $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java + $(JAVADOC) -quiet -author -link http://java.sun.com/j2se/1.5.0/docs/api/ -classpath $(JAVAUNIXJARDIR)/unix.jar:$(JAVAUNIXJARDIR)/hexdump.jar:$(JAVAUNIXJARDIR)/debug-$(DEBUG).jar -d doc/api $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java $(SRCDIR)/dbus/{types,exceptions}/*.java %.1: %.sgml docbook-to-man $< > $@ @@ -114,6 +114,12 @@ cross-test-server: libdbus-java-$(VERSION).jar dbus-java-test-$(VERSION).jar cross-test-client: libdbus-java-$(VERSION).jar dbus-java-test-$(VERSION).jar $(JAVA) $(JFLAGS) $(CPFLAG) $(CLASSPATH):$(JAVAUNIXJARDIR)/unix.jar:$(JAVAUNIXJARDIR)/hexdump.jar:$(JAVAUNIXJARDIR)/debug-$(DEBUG).jar:libdbus-java-$(VERSION).jar:dbus-java-test-$(VERSION).jar org.freedesktop.dbus.test.cross_test_client +peer-server: libdbus-java-$(VERSION).jar dbus-java-test-$(VERSION).jar + $(JAVA) $(JFLAGS) $(CPFLAG) $(CLASSPATH):$(JAVAUNIXJARDIR)/unix.jar:$(JAVAUNIXJARDIR)/hexdump.jar:$(JAVAUNIXJARDIR)/debug-$(DEBUG).jar:libdbus-java-$(VERSION).jar:dbus-java-test-$(VERSION).jar org.freedesktop.dbus.test.test_p2p_server + +peer-client: libdbus-java-$(VERSION).jar dbus-java-test-$(VERSION).jar + $(JAVA) $(JFLAGS) $(CPFLAG) $(CLASSPATH):$(JAVAUNIXJARDIR)/unix.jar:$(JAVAUNIXJARDIR)/hexdump.jar:$(JAVAUNIXJARDIR)/debug-$(DEBUG).jar:libdbus-java-$(VERSION).jar:dbus-java-test-$(VERSION).jar org.freedesktop.dbus.test.test_p2p_client + two-part-server: libdbus-java-$(VERSION).jar dbus-java-test-$(VERSION).jar $(JAVA) $(JFLAGS) $(CPFLAG) $(CLASSPATH):$(JAVAUNIXJARDIR)/unix.jar:$(JAVAUNIXJARDIR)/hexdump.jar:$(JAVAUNIXJARDIR)/debug-$(DEBUG).jar:libdbus-java-$(VERSION).jar:dbus-java-test-$(VERSION).jar org.freedesktop.dbus.test.two_part_test_server @@ -145,6 +151,11 @@ internal-cross-test: libdbus-java-$(VERSION).jar dbus-java-test-$(VERSION).jar $(MAKE) -s cross-test-client | tee client.log ;\ kill $$(cat pid) ; ) +peer-to-peer-test: libdbus-java-$(VERSION).jar dbus-java-test-$(VERSION).jar + ( $(MAKE) DBUS_JAVA_FLOATS=true -s peer-server 2>&1 | tee server.log &\ + sleep 1;\ + $(MAKE) DBUS_JAVA_FLOATS=true -s peer-client 2>&1 | tee client.log ) + two-part-test: libdbus-java-$(VERSION).jar dbus-java-test-$(VERSION).jar ( dbus-daemon --config-file=tmp-session.conf --print-pid --print-address=5 --fork >pid 5>address ; \ export DBUS_SESSION_BUS_ADDRESS=$$(cat address) ;\ |