From d0fdcb5a3b8852fe4e6bf3938d77a2efbba46525 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Fri, 5 Dec 2008 12:14:05 +0100 Subject: Cleanup of recipes. dbus-java: Removed 2.3/2.4, updated 2.5 to 2.5.1. --- packages/dbus-java/dbus-java_2.3.bb | 102 ---------------------------------- packages/dbus-java/dbus-java_2.4.bb | 92 ------------------------------ packages/dbus-java/dbus-java_2.5.1.bb | 89 +++++++++++++++++++++++++++++ packages/dbus-java/dbus-java_2.5.bb | 87 ----------------------------- 4 files changed, 89 insertions(+), 281 deletions(-) delete mode 100644 packages/dbus-java/dbus-java_2.3.bb delete mode 100644 packages/dbus-java/dbus-java_2.4.bb create mode 100644 packages/dbus-java/dbus-java_2.5.1.bb delete mode 100644 packages/dbus-java/dbus-java_2.5.bb diff --git a/packages/dbus-java/dbus-java_2.3.bb b/packages/dbus-java/dbus-java_2.3.bb deleted file mode 100644 index 8ed5c44d94..0000000000 --- a/packages/dbus-java/dbus-java_2.3.bb +++ /dev/null @@ -1,102 +0,0 @@ -DESCRIPTION = "A pure Java D-Bus Implementation" -DESCRIPTION_dbus-java-viewer = "${DESCRIPTION} (DBusViewer Binary)" -DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)" - -LICENSE = "GPLv2 AFL" -SECTION = "libs" -HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java" -AUTHOR = "Matthew Johnson " - -PR = "r4" - -inherit java-library - -SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz" - -S = "${WORKDIR}/dbus-java-${PV}" - -DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native" -RSUGGESTS_libdbus-java = "libunixsocket-java dbus" -RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}" -RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}" - -# jamvm-native unfortunately contains non-generificed java/lang/reflect classes -# which are accessed in this package. Work around this by setting the bootclasspath -# explicitly. -JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip" - -do_compile () { - # run target .binclasses first to fix a brokenness in the Makefile - oe_runmake \ - JCFLAGS="-source 1.5 ${JCFLAGS}" \ - JAVAC="javac" \ - JARPREFIX="${STAGING_DATADIR_JAVA}" \ - JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ - CLASSPATH="${S}/classes" \ - JAR="fastjar" \ - .binclasses - - oe_runmake \ - JCFLAGS="-source 1.5 ${JCFLAGS}" \ - JAVAC="javac" \ - JARPREFIX="${STAGING_DATADIR_JAVA}" \ - JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ - CLASSPATH="${S}/classes" \ - JAR="fastjar" \ - all - - # Generated shell scripts will have staging paths inside them. - rm bin/* - - # Generate them again with target paths. - oe_runmake \ - JAVAC="oefatal \"No Java compilation expected here.\"" \ - JAR="oefatal \"No jar invocation expected here.\"" \ - JARPREFIX=${datadir_java} \ - JAVAUNIXPATH=${datadir_java} \ - all - - # Trigger generation of all documentation files to prevent this - # being happen at the target 'install-man' in do_install. - oe_runmake \ - JAVAC="oefatal \"No Java compilation expected here.\"" \ - JAR="oefatal \"No jar invocation expected here.\"" \ - JARPREFIX=${datadir_java} \ - JAVAUNIXPATH=${datadir_java} \ - CreateInterface.1 ListDBus.1 DBusDaemon.1 DBusViewer.1 changelog AUTHORS COPYING README INSTALL DBusCall.1 -} - -do_stage () { - oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar -} - -do_install () { - oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar - oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar - oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar - - install -d ${D}${bindir} - install bin/DBusViewer ${D}${bindir} - install bin/DBusCall ${D}${bindir} - install bin/CreateInterface ${D}${bindir} - install bin/ListDBus ${D}${bindir} - install bin/DBusDaemon ${D}${bindir} - - oe_runmake \ - JAVAC="oefatal \"No Java compilation expected here.\"" \ - JAR="oefatal \"No jar invocation expected here.\"" \ - MANPREFIX=${D}${mandir} \ - DOCPREFIX=${D}${docdir}/${JPN} \ - install-man -} - -# ${JPN} must be last otherwise it would pick up dbus-viewer*.jar -# and dbus-bin*.jar -PACKAGES = "dbus-java-viewer dbus-java-viewer-doc dbus-java-bin dbus-java-bin-doc ${JPN}" - -PACKAGE_ARCH = "all" - -FILES_dbus-java-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer" -FILES_dbus-java-viewer-doc = "${mandir}/DBusViewer*" -FILES_dbus-java-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}" -FILES_dbus-java-bin-doc = "${mandir} ${docdir}/${JPN}" diff --git a/packages/dbus-java/dbus-java_2.4.bb b/packages/dbus-java/dbus-java_2.4.bb deleted file mode 100644 index 37c539b20e..0000000000 --- a/packages/dbus-java/dbus-java_2.4.bb +++ /dev/null @@ -1,92 +0,0 @@ -DESCRIPTION = "A pure Java D-Bus Implementation" -DESCRIPTION_dbus-java-viewer = "${DESCRIPTION} (DBusViewer Binary)" -DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)" -AUTHOR = "Matthew Johnson " -HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java" -SECTION = "libs" -LICENSE = "GPLv2 AFL" -DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native" -RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}" -RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}" -RSUGGESTS_libdbus-java = "libunixsocket-java dbus" -PR = "r1" - -SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz" - -S = "${WORKDIR}/dbus-java-${PV}" - -inherit java-library - -# jamvm-native unfortunately contains non-generificed java/lang/reflect classes -# which are accessed in this package. Work around this by setting the bootclasspath -# explicitly. -JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip" - -do_compile () { - # run target .binclasses first to fix a brokenness in the Makefile - oe_runmake \ - JCFLAGS="-source 1.5 ${JCFLAGS}" \ - JAVAC="javac" \ - JARPREFIX="${STAGING_DATADIR_JAVA}" \ - JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ - CLASSPATH="${S}/classes" \ - JAR="fastjar" \ - .binclasses - oe_runmake \ - JCFLAGS="-source 1.5 ${JCFLAGS}" \ - JAVAC="javac" \ - JARPREFIX="${STAGING_DATADIR_JAVA}" \ - JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ - CLASSPATH="${S}/classes" \ - JAR="fastjar" \ - all - # Generated shell scripts will have staging paths inside them. - rm bin/* - # Generate them again with target paths. - oe_runmake \ - JAVAC="oefatal \"No Java compilation expected here.\"" \ - JAR="oefatal \"No jar invocation expected here.\"" \ - JARPREFIX=${datadir_java} \ - JAVAUNIXPATH=${datadir_java} \ - all - # Trigger generation of all documentation files to prevent this - # being happen at the target 'install-man' in do_install. - oe_runmake \ - JAVAC="oefatal \"No Java compilation expected here.\"" \ - JAR="oefatal \"No jar invocation expected here.\"" \ - JARPREFIX=${datadir_java} \ - JAVAUNIXPATH=${datadir_java} \ - CreateInterface.1 ListDBus.1 DBusDaemon.1 DBusViewer.1 changelog AUTHORS COPYING README INSTALL DBusCall.1 -} - -do_install () { - oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar - oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar - oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar - install -d ${D}${bindir} - install bin/DBusViewer ${D}${bindir} - install bin/DBusCall ${D}${bindir} - install bin/CreateInterface ${D}${bindir} - install bin/ListDBus ${D}${bindir} - install bin/DBusDaemon ${D}${bindir} - oe_runmake \ - JAVAC="oefatal \"No Java compilation expected here.\"" \ - JAR="oefatal \"No jar invocation expected here.\"" \ - MANPREFIX=${D}${mandir} \ - DOCPREFIX=${D}${docdir}/${JPN} \ - install-man -} - -do_stage () { - oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar -} - -PACKAGE_ARCH = "all" -# ${JPN} must be last otherwise it would pick up dbus-viewer*.jar -# and dbus-bin*.jar -PACKAGES = "dbus-java-viewer dbus-java-viewer-doc dbus-java-bin dbus-java-bin-doc ${JPN}" - -FILES_dbus-java-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer" -FILES_dbus-java-viewer-doc = "${mandir}/DBusViewer*" -FILES_dbus-java-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}" -FILES_dbus-java-bin-doc = "${mandir} ${docdir}/${JPN}" diff --git a/packages/dbus-java/dbus-java_2.5.1.bb b/packages/dbus-java/dbus-java_2.5.1.bb new file mode 100644 index 0000000000..23aa1f933c --- /dev/null +++ b/packages/dbus-java/dbus-java_2.5.1.bb @@ -0,0 +1,89 @@ +DESCRIPTION = "A pure Java D-Bus Implementation" +DESCRIPTION_dbus-java-viewer = "${DESCRIPTION} (DBusViewer Binary)" +DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)" +AUTHOR = "Matthew Johnson " +HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java" +SECTION = "libs" +LICENSE = "LGPLv2 AFL" + +DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native" +RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java dbus-java-bin libmatthew-debug-java ${JPN}" +RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java libmatthew-debug-java ${JPN}" +RSUGGESTS_libdbus-java = "libunixsocket-java" + +PR = "r0" + +SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz" + +S = "${WORKDIR}/dbus-java-${PV}" + +inherit java-library + +# jamvm-native unfortunately contains non-generificed java/lang/reflect classes +# which are accessed in this package. Work around this by setting the bootclasspath +# explicitly. +JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip" + +do_compile () { + oe_runmake \ + JCFLAGS="-source 1.5 ${JCFLAGS}" \ + JAVAC="javac" \ + JARPREFIX="${STAGING_DATADIR_JAVA}" \ + JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ + CLASSPATH="${S}/classes" \ + JAR="fastjar" \ + bin + + # Generated shell scripts will have staging paths inside them. + rm bin/* + + # Generate them again with target paths. + oe_runmake \ + JAVAC="oefatal \"No Java compilation expected here.\"" \ + JAR="oefatal \"No jar invocation expected here.\"" \ + JARPREFIX=${datadir_java} \ + JAVAUNIXPATH=${datadir_java} \ + bin + + # Generate man pages. + oe_runmake \ + JAVAC="oefatal \"No Java compilation expected here.\"" \ + JAR="oefatal \"No jar invocation expected here.\"" \ + JARPREFIX=${datadir_java} \ + JAVAUNIXPATH=${datadir_java} \ + man +} + +do_install () { + oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar dbus.jar + oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar dbus-viewer.jar + oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar dbus-bin.jar + + install -d ${D}${bindir} + install bin/DBusViewer ${D}${bindir} + install bin/DBusCall ${D}${bindir} + install bin/CreateInterface ${D}${bindir} + install bin/ListDBus ${D}${bindir} + install bin/DBusDaemon ${D}${bindir} + + oe_runmake \ + JAVAC="oefatal \"No Java compilation expected here.\"" \ + JAR="oefatal \"No jar invocation expected here.\"" \ + MANPREFIX=${D}${mandir} \ + DOCPREFIX=${D}${docdir}/${JPN} \ + install-man +} + +do_stage () { + oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar +} + +PACKAGE_ARCH = "all" +# ${JPN} must be last otherwise it would pick up dbus-viewer*.jar +# and dbus-bin*.jar +PACKAGES = "dbus-java-viewer dbus-java-viewer-doc dbus-java-bin dbus-java-bin-doc ${JPN}" + +FILES_dbus-java-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer" +FILES_dbus-java-viewer-doc = "${mandir}/DBusViewer*" +FILES_dbus-java-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}" +FILES_dbus-java-bin-doc = "${mandir} ${docdir}/${JPN}" diff --git a/packages/dbus-java/dbus-java_2.5.bb b/packages/dbus-java/dbus-java_2.5.bb deleted file mode 100644 index a3ab37bd9e..0000000000 --- a/packages/dbus-java/dbus-java_2.5.bb +++ /dev/null @@ -1,87 +0,0 @@ -DESCRIPTION = "A pure Java D-Bus Implementation" -DESCRIPTION_dbus-java-viewer = "${DESCRIPTION} (DBusViewer Binary)" -DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)" -AUTHOR = "Matthew Johnson " -HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java" -SECTION = "libs" -LICENSE = "LGPLv2 AFL" -DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native" -RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java dbus-java-bin libmatthew-debug-java ${JPN}" -RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java libmatthew-debug-java ${JPN}" -RSUGGESTS_libdbus-java = "libunixsocket-java" -PR = "r1" - -SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz" - -S = "${WORKDIR}/dbus-java-${PV}" - -inherit java-library - -# jamvm-native unfortunately contains non-generificed java/lang/reflect classes -# which are accessed in this package. Work around this by setting the bootclasspath -# explicitly. -JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip" - -do_compile () { - oe_runmake \ - JCFLAGS="-source 1.5 ${JCFLAGS}" \ - JAVAC="javac" \ - JARPREFIX="${STAGING_DATADIR_JAVA}" \ - JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ - CLASSPATH="${S}/classes" \ - JAR="fastjar" \ - bin - - # Generated shell scripts will have staging paths inside them. - rm bin/* - - # Generate them again with target paths. - oe_runmake \ - JAVAC="oefatal \"No Java compilation expected here.\"" \ - JAR="oefatal \"No jar invocation expected here.\"" \ - JARPREFIX=${datadir_java} \ - JAVAUNIXPATH=${datadir_java} \ - bin - - # Generate man pages. - oe_runmake \ - JAVAC="oefatal \"No Java compilation expected here.\"" \ - JAR="oefatal \"No jar invocation expected here.\"" \ - JARPREFIX=${datadir_java} \ - JAVAUNIXPATH=${datadir_java} \ - man -} - -do_install () { - oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar dbus.jar - oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar dbus-viewer.jar - oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar dbus-bin.jar - - install -d ${D}${bindir} - install bin/DBusViewer ${D}${bindir} - install bin/DBusCall ${D}${bindir} - install bin/CreateInterface ${D}${bindir} - install bin/ListDBus ${D}${bindir} - install bin/DBusDaemon ${D}${bindir} - - oe_runmake \ - JAVAC="oefatal \"No Java compilation expected here.\"" \ - JAR="oefatal \"No jar invocation expected here.\"" \ - MANPREFIX=${D}${mandir} \ - DOCPREFIX=${D}${docdir}/${JPN} \ - install-man -} - -do_stage () { - oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar -} - -PACKAGE_ARCH = "all" -# ${JPN} must be last otherwise it would pick up dbus-viewer*.jar -# and dbus-bin*.jar -PACKAGES = "dbus-java-viewer dbus-java-viewer-doc dbus-java-bin dbus-java-bin-doc ${JPN}" - -FILES_dbus-java-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer" -FILES_dbus-java-viewer-doc = "${mandir}/DBusViewer*" -FILES_dbus-java-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}" -FILES_dbus-java-bin-doc = "${mandir} ${docdir}/${JPN}" -- cgit v1.2.3