diff options
| -rw-r--r-- | classes/java-library.bbclass | 21 | ||||
| -rw-r--r-- | classes/java.bbclass | 35 | ||||
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 4 | ||||
| -rw-r--r-- | packages/classpath/classpath-native_0.97.1.bb | 3 | ||||
| -rw-r--r-- | packages/docbook-utils/docbook-utils-native_0.6.13.bb | 24 | ||||
| -rw-r--r-- | packages/docbook-utils/docbook-utils_0.6.13.bb | 13 |
6 files changed, 58 insertions, 42 deletions
diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass index 8aecfef1b9..b6cb5dcbde 100644 --- a/classes/java-library.bbclass +++ b/classes/java-library.bbclass @@ -35,3 +35,24 @@ PACKAGE_ARCH_${JPN} = "all" FILES_${JPN} = "${datadir_java}" +# File name of the libraries' main Jar file +JARFILENAME = "${P}.jar" + +# Space-separated list of alternative file names. +ALTJARFILENAMES = "${PN}.jar" + +java_install() { + oe_jarinstall ${JARFILENAME} ${ALTJARFILENAMES} +} + +do_install() { + java_install +} + +java_stage() { + oe_jarinstall -s ${JARFILENAME} ${ALTJARFILENAMES} +} + +do_stage() { + java_stage +} diff --git a/classes/java.bbclass b/classes/java.bbclass index 41d52fe425..e51b0d71da 100644 --- a/classes/java.bbclass +++ b/classes/java.bbclass @@ -61,6 +61,41 @@ oe_jarinstall() { done } +oe_makeclasspath() { + # Purpose: Generate a classpath variable from the given Jar file names + # where the ".jar" has been omitted. + # + # oe_makeclasspath foo baz bar + # Prints ${datadir_java}/foo.jar:${datadir_java}/baz.jar:${datadir_java}/bar.jar + # + # oe_makeclasspath -s foo baz bar + # Prints ${STAGING_DATADIR_JAVA}/foo.jar:${STAGING_DATADIR_JAVA}/baz.jar:${STAGING_DATADIR_JAVA}/bar.jar + # + # Provide the -s at the beginning otherwise strange things happen. + # + dir=${datadir_java} + classpath= + delimiter= + + while [ "$#" -gt 0 ]; do + case "$1" in + -s) + dir=${STAGING_DATADIR_JAVA} + ;; + -*) + oefatal "oe_makeclasspath: unknown option: $1" + ;; + *) + classpath=$classpath$delimiter$dir/$1.jar + delimiter=":" + ;; + esac + shift + done + + echo $classpath +} + # Creates a simple wrapper script for your Java program. # The script is written to ${PN} by default. # diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 0e04959b7e..99f0390dee 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -263,8 +263,8 @@ PREFERRED_VERSION_distcc ?= "2.18.3" PREFERRED_VERSION_djvulibre ?= "3.5.19" PREFERRED_VERSION_dmxproto ?= "2.2.2" PREFERRED_VERSION_dnsmasq ?= "2.38" -PREFERRED_VERSION_docbook-utils ?= "0.6.13" -PREFERRED_VERSION_docbook-utils-native ?= "0.6.13" +PREFERRED_VERSION_docbook-utils ?= "0.6.14" +PREFERRED_VERSION_docbook-utils-native ?= "0.6.14" PREFERRED_VERSION_dosbox ?= "0.70" PREFERRED_VERSION_dosfstools ?= "2.11" PREFERRED_VERSION_dosfstools-native ?= "2.10" diff --git a/packages/classpath/classpath-native_0.97.1.bb b/packages/classpath/classpath-native_0.97.1.bb deleted file mode 100644 index 02328b8a21..0000000000 --- a/packages/classpath/classpath-native_0.97.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require classpath-native.inc - -PR = "r0" diff --git a/packages/docbook-utils/docbook-utils-native_0.6.13.bb b/packages/docbook-utils/docbook-utils-native_0.6.13.bb deleted file mode 100644 index 19aa327107..0000000000 --- a/packages/docbook-utils/docbook-utils-native_0.6.13.bb +++ /dev/null @@ -1,24 +0,0 @@ -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "openjade-native docbook-sgml-dtd-3.1-native docbook-dsssl-stylesheets-native" - -SRC_URI = "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-${PV}.tar.gz" -S = "${WORKDIR}/docbook-utils-${PV}" - -inherit autotools native - -do_stage () { - for b in docbook2dvi docbook2man docbook2ps docbook2tex \ - docbook2txt docbook2html docbook2pdf docbook2rtf \ - docbook2texi jw; do - install -m 0755 ${S}/bin/$b ${STAGING_BINDIR}/ - done - for i in backends/dvi backends/html backends/man \ - backends/pdf backends/ps backends/rtf backends/tex \ - backends/texi backends/txt frontends/docbook \ - helpers/docbook2man-spec.pl helpers/docbook2texi-spec.pl \ - docbook-utils.dsl; do - install -d ${STAGING_DATADIR}/sgml/docbook/utils-${PV}/`dirname $i` - install ${S}/$i ${STAGING_DATADIR}/sgml/docbook/utils-${PV}/$i - done -} diff --git a/packages/docbook-utils/docbook-utils_0.6.13.bb b/packages/docbook-utils/docbook-utils_0.6.13.bb deleted file mode 100644 index ab27062970..0000000000 --- a/packages/docbook-utils/docbook-utils_0.6.13.bb +++ /dev/null @@ -1,13 +0,0 @@ -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "" -DESCRIPTION = "docbook-utils contains scripts for easy conversion \ -from DocBook SGML files to other formats (for example, HTML, RTF, \ -and PostScript), and for comparing SGML files." - -# Not tested. -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-${PV}.tar.gz" - -inherit autotools |