[oe-commits] org.oe.dev midpath: major rework of midpath
woglinde2 commit
openembedded-commits at lists.openembedded.org
Fri Aug 24 21:51:14 UTC 2007
midpath: major rework of midpath
* new releas 0.1
* introduce midpath.inc
* split midpath-cldc and midpath-cldc-sdl from midpath
* seperate out kxml2 from midpath
* split midpath-test from midpath
* change jar-installdir to /usr/share/java
Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: 03afba4cea3f8016c2adba12bfd9bcf3c5033ff6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=03afba4cea3f8016c2adba12bfd9bcf3c5033ff6
Files:
1
packages/midpath/midpath-alsa_svn.bb
packages/midpath/midpath-alsa_0.1.bb
packages/midpath/midpath-cldc-x11_svn.bb
packages/midpath/midpath-cldc-x11_0.1.bb
packages/midpath/midpath-gtk_svn.bb
packages/midpath/midpath-gtk_0.1.bb
packages/midpath/midpath-native_svn.bb
packages/midpath/midpath-cldc-native_0.1.bb
packages/midpath/midpath-qt3x11_svn.bb
packages/midpath/midpath-qt3x11_0.1.bb
packages/midpath/midpath-qte_svn.bb
packages/midpath/midpath-qte_0.1.bb
packages/midpath/midpath_svn.bb
packages/midpath/midpath_0.1.bb
packages/midpath/files
packages/midpath/files/shellscript.patch
packages/midpath/midpath-cldc-sdl_0.1.bb
packages/midpath/midpath-cldc_0.1.bb
packages/midpath/midpath-test_0.1.bb
packages/midpath/midpath.inc
Diffs:
#
# mt diff -r1abc6f973eb37007ddf737b0e536dc1c21d98ff2 -r03afba4cea3f8016c2adba12bfd9bcf3c5033ff6
#
#
#
# rename "packages/midpath/midpath-alsa_svn.bb"
# to "packages/midpath/midpath-alsa_0.1.bb"
#
# rename "packages/midpath/midpath-cldc-x11_svn.bb"
# to "packages/midpath/midpath-cldc-x11_0.1.bb"
#
# rename "packages/midpath/midpath-gtk_svn.bb"
# to "packages/midpath/midpath-gtk_0.1.bb"
#
# rename "packages/midpath/midpath-native_svn.bb"
# to "packages/midpath/midpath-cldc-native_0.1.bb"
#
# rename "packages/midpath/midpath-qt3x11_svn.bb"
# to "packages/midpath/midpath-qt3x11_0.1.bb"
#
# rename "packages/midpath/midpath-qte_svn.bb"
# to "packages/midpath/midpath-qte_0.1.bb"
#
# rename "packages/midpath/midpath_svn.bb"
# to "packages/midpath/midpath_0.1.bb"
#
# add_dir "packages/midpath/files"
#
# add_file "packages/midpath/files/shellscript.patch"
# content [ac9b3b66a149945556438fedc9c5c8005c4e2463]
#
# add_file "packages/midpath/midpath-cldc-sdl_0.1.bb"
# content [d4c391082d12422464fa05d027053d80e72073de]
#
# add_file "packages/midpath/midpath-cldc_0.1.bb"
# content [5f4356e7b663f2921a4419a7443a72987f557805]
#
# add_file "packages/midpath/midpath-test_0.1.bb"
# content [9086208d53ee5c8a8eafe4d13de2580741d16a60]
#
# add_file "packages/midpath/midpath.inc"
# content [0deb1420f019591c182424d43dc6670bda6274ec]
#
# patch "packages/midpath/midpath-alsa_0.1.bb"
# from [fb00f08dd7e21b0915d61bc4f5da08d449c042dd]
# to [3b9cd6ad01860aa9c6ef173017b41052d720e9ad]
#
# patch "packages/midpath/midpath-cldc-native_0.1.bb"
# from [475af2536e2be424a741fb3fb8474bc922661dbb]
# to [876ed1db01ef361d0403dfa49aa970522a41661d]
#
# patch "packages/midpath/midpath-cldc-x11_0.1.bb"
# from [4508d47ae521121138c38ca1c627bbe1b03a38b0]
# to [32a005bc8c128bb381ac3e795e9efea897db125f]
#
# patch "packages/midpath/midpath-gtk_0.1.bb"
# from [8b8dbd9444e83c2f45d5646af02cfd5654a87113]
# to [aa5d09aafbc3d8a7fd37a4629dc7e86da0bcf8b4]
#
# patch "packages/midpath/midpath-qt3x11_0.1.bb"
# from [ae69b147de0f7b04618b3b2d35131bc7ce9c9adc]
# to [3f1384df13f5a0dbd7cea235b83e4fcb840c0c85]
#
# patch "packages/midpath/midpath-qte_0.1.bb"
# from [3712d85d8c5ae1385fb2ed8a6b0631a4fbac2839]
# to [31c329b1caef113ff5b380787e4960b5a61d8049]
#
# patch "packages/midpath/midpath_0.1.bb"
# from [1b064ce492cfa8ba318e23f4a4af8ab1b0bc8184]
# to [d2d43501642415ee4c61b8e8ae4fe885f928f74c]
#
============================================================
--- packages/midpath/files/shellscript.patch ac9b3b66a149945556438fedc9c5c8005c4e2463
+++ packages/midpath/files/shellscript.patch ac9b3b66a149945556438fedc9c5c8005c4e2463
@@ -0,0 +1,27 @@
+Index: midpath-0.1/bin/midpath-test-cacao-cldc.sh
+===================================================================
+--- midpath-0.1.orig/bin/midpath-test-cacao-cldc.sh 2007-07-03 22:09:33.000000000 +0200
++++ midpath-0.1/bin/midpath-test-cacao-cldc.sh 2007-08-24 22:31:32.000000000 +0200
+@@ -3,19 +3,13 @@
+ # Adapt the next line to your environment
+ JAVA_CMD=cacao
+
+-if [ "$MIDPATH_HOME" = "" ]; then
+- MIDPATH_HOME=$(pwd)/..
+-fi
++MIDPATH_HOME=
+
+ # Set the classpath
+-BCP=$MIDPATH_HOME/dist/cldc1.1.jar:$MIDPATH_HOME/dist/midpath.jar:$MIDPATH_HOME/resources-embedded:$MIDPATH_HOME/dist/sdljava-cldc.jar:$MIDPATH_HOME/dist/escher-x11-cldc.jar:$MIDPATH_HOME/dist/kxml2-2.3.0.jar
++BCP=$MIDPATH_HOME/cldc1.1.jar:$MIDPATH_HOME/midpath.jar:$MIDPATH_HOME/resources-embedded:$MIDPATH_HOME/sdljava-cldc.jar:$MIDPATH_HOME/escher-x11-cldc.jar:$MIDPATH_HOME/kxml2-2.3.0.jar
+ # Add the MIDlet jar to the classpath (must be loaded by the main
+ # classloader yet)
+-BCP=$BCP:$MIDPATH_HOME/dist/midpath-tests.jar
+-
+-# Path of the native libraries
+-JLP=$MIDPATH_HOME/dist
+-export LD_LIBRARY_PATH=$JLP
++BCP=$BCP:$MIDPATH_HOME/midpath-tests.jar
+
+ CLASS=org.thenesis.midpath.main.StandardMIDletLauncher
+ # The classname of the MIDlet (we have to set it manually yet)
============================================================
--- packages/midpath/midpath-cldc-sdl_0.1.bb d4c391082d12422464fa05d027053d80e72073de
+++ packages/midpath/midpath-cldc-sdl_0.1.bb d4c391082d12422464fa05d027053d80e72073de
@@ -0,0 +1,43 @@
+
+require midpath.inc
+
+do_configure() {
+
+ cd ${S}/resources-embedded/com/sun/midp/configuration
+ sed -i -e "s|ui.backend:AWT|ui.backend:SDL|" \
+ -e "s|bitsPerPixel:32|bitsPerPixel:16|" \
+ configuration.cfg
+
+}
+
+
+do_compile() {
+
+mkdir -p ${S}/dist
+
+# Build SDLJava for CLDC
+cd ${S}/external/sdljava-cldc
+make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH}:${GNU_CLASSPATH_PATH} -sourcepath ${S}/external/sdljava-cldc -source 1.3 -target 1.1" || exit 1
+make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH}:${GNU_CLASSPATH_PATH} -source 1.3 -target 1.1" JAR_FILE="sdljava-cldc.jar" JAR_FLAGS="cvf" || exit 1
+
+}
+
+do_install() {
+ install -d ${D}${datadir}/java
+ install -m 0644 ${S}/external/sdljava-cldc/sdljava-cldc.jar ${D}${datadir}/java
+ install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration
+ install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/
+}
+
+do_stage() {
+ install -d ${STAGING_DATADIR}/java
+ install -m 0644 ${S}/external/sdljava-cldc/sdljava-cldc.jar ${STAGING_DATADIR}/java
+}
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "${datadir}/java/sdljava-cldc.jar \
+ ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
+ "
+
+CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg"
============================================================
--- packages/midpath/midpath-cldc_0.1.bb 5f4356e7b663f2921a4419a7443a72987f557805
+++ packages/midpath/midpath-cldc_0.1.bb 5f4356e7b663f2921a4419a7443a72987f557805
@@ -0,0 +1,37 @@
+
+require midpath.inc
+
+PROVIDES = "virtual/cldc-api-1.1"
+
+do_compile() {
+
+mkdir -p ${S}/dist
+
+# Build CLDC1.1
+# Build base classes
+cd ${S}/external/cldc1.1/src
+make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath . -source 1.3 -target 1.1" || exit 1
+make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath . -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes || exit 1
+# Build CLDC extra classes for MIDP2
+cd ${S}/src/cldc-glue
+make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -sourcepath ${S}/src/cldc-glue -source 1.3 -target 1.1"
+make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes
+# Make a jar
+${FASTJAR_CMD} cvf ${S}/dist/cldc1.1.jar -C ${S}/external/cldc1.1/classes .
+
+
+}
+
+do_install() {
+ install -d ${D}${datadir}/java
+ install -m 0644 dist/cldc1.1.jar ${D}${datadir}/java
+}
+
+do_stage() {
+ install -d ${STAGING_DATADIR}/java
+ install -m 0644 dist/cldc1.1.jar ${STAGING_DATADIR}/java
+}
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "${datadir}/java/cldc1.1.jar"
============================================================
--- packages/midpath/midpath-test_0.1.bb 9086208d53ee5c8a8eafe4d13de2580741d16a60
+++ packages/midpath/midpath-test_0.1.bb 9086208d53ee5c8a8eafe4d13de2580741d16a60
@@ -0,0 +1,46 @@
+
+require midpath.inc
+
+SRC_URI += "file://shellscript.patch;patch=1"
+
+DEPENDS += " midpath"
+RDEPENDS += " midpath"
+
+CLDC_PATH = ${STAGING_DATADIR}/java/cldc1.1.jar
+
+do_configure() {
+
+ cd ${S}/bin
+ sed -i -e "s|MIDPATH_HOME=|MIDPATH_HOME=${datadir}/java|" \
+ midpath-test-cacao-cldc.sh
+
+}
+
+do_compile() {
+
+cd ${S}/tests
+make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${STAGING_DATADIR}/java/midpath.jar:${CLDC_PATH} -sourcepath ${S}/tests -source 1.3 -target 1.1" || exit 1
+make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${STAGING_DATADIR}/java/midpath.jar:${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="midpath-tests.jar" JAR_FLAGS="cvf" || exit 1
+
+}
+
+do_install() {
+ install -d ${D}${bindir}
+# install -m 0755 bin/graphical_launcher-j2se.sh ${D}${bindir}
+# install -m 0755 bin/midpath-test.sh ${D}${bindir}
+ install -m 0755 bin/midpath-test-cacao-cldc.sh ${D}${bindir}
+ install -d ${D}${datadir}/java
+ install -m 0644 ${S}/tests/midpath-tests.jar ${D}${datadir}/java
+}
+
+do_stage() {
+ :
+}
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "${datadir}/java/midpath-tests.jar \
+# ${bindir}/graphical_launcher-j2se.sh \
+# ${bindir}/midpath-test.sh \
+ ${bindir}/midpath-test-cacao-cldc.sh \
+ "
============================================================
--- packages/midpath/midpath.inc 0deb1420f019591c182424d43dc6670bda6274ec
+++ packages/midpath/midpath.inc 0deb1420f019591c182424d43dc6670bda6274ec
@@ -0,0 +1,22 @@
+DESCRIPTION = "MIDPath is a Java library which provides a MIDP2 implementation"
+HOMEPAGE = "http://midpath.thenesis.org/"
+LICENSE = "GPL"
+PRIORITY = "optional"
+SECTION = "interpreters"
+PR = "r0"
+
+SRC_URI = "http://downloads.sourceforge.net/midpath/midpath-${PV}.tar.gz"
+
+S = "${WORKDIR}/midpath-${PV}"
+
+DEPENDS = "ecj-native fastjar-native classpath-minimal"
+
+JAVAC_CMD = "${STAGING_BINDIR_NATIVE}/ecj"
+
+FASTJAR_CMD = "${STAGING_BINDIR_NATIVE}/fastjar"
+
+JAVA_PATH = "${STAGING_DATADIR}/java"
+
+GNU_CLASSPATH_PATH = "${JAVA_PATH}/classpath-minimal/glibj.zip"
+
+CLDC_PATH = ${JAVA_PATH}/cldc1.1.jar
============================================================
--- packages/midpath/midpath-alsa_svn.bb fb00f08dd7e21b0915d61bc4f5da08d449c042dd
+++ packages/midpath/midpath-alsa_0.1.bb 3b9cd6ad01860aa9c6ef173017b41052d720e9ad
@@ -20,15 +20,14 @@ make || exit 1
# Build the ALSA native part
cd ${S}/native/alsa
make || exit 1
-cp *.so ${S}/dist
}
do_install() {
install -d ${D}${libdir}
- install -m 0644 dist/libmidpathalsa.so ${D}${libdir}
- install -d ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration
- install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration/
+ install -m 0644 ${S}/native/alsa/libmidpathalsa.so ${D}${libdir}
+ install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration
+ install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/
}
do_stage() {
@@ -38,5 +37,7 @@ FILES_${PN} = "${libdir}/libmidpathalsa
PACKAGES = "${PN}"
FILES_${PN} = "${libdir}/libmidpathalsa.so \
- ${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
+ ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
"
+
+CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg"
============================================================
--- packages/midpath/midpath-native_svn.bb 475af2536e2be424a741fb3fb8474bc922661dbb
+++ packages/midpath/midpath-cldc-native_0.1.bb 876ed1db01ef361d0403dfa49aa970522a41661d
@@ -1,34 +1,14 @@ inherit native
inherit native
-require midpath_${PV}.bb
+require midpath-cldc_${PV}.bb
-DEPENDS = "ecj-native fastjar-native classpath-minimal-native"
+
PROVIDES = "virtual/cldc-api-1.1-native"
+RPROVIDES = " "
PACKAGES = " "
-
-do_configure() {
- :
-}
-
-do_compile() {
-mkdir -p ${S}/dist
-
-# Build CLDC1.1
-# Build base classes
-cd ${S}/external/cldc1.1/src
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath . -source 1.3 -target 1.1" || exit 1
-make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath . -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes || exit 1
-# Build CLDC extra classes for MIDP2
-cd ${S}/src/cldc-glue
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -sourcepath ${S}/src/cldc-glue -source 1.3 -target 1.1"
-make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes
-# Make a jar
-fastjar cvf ${S}/dist/cldc1.1.jar -C ${S}/external/cldc1.1/classes .
-}
-
do_install() {
:
}
============================================================
--- packages/midpath/midpath-cldc-x11_svn.bb 4508d47ae521121138c38ca1c627bbe1b03a38b0
+++ packages/midpath/midpath-cldc-x11_0.1.bb 32a005bc8c128bb381ac3e795e9efea897db125f
@@ -1,11 +1,8 @@
-require midpath_${PV}.bb
+require midpath.inc
-DEPENDS += "virtual/libx11 virtual/cldc-api-1.1"
-RDEPENDS = "libx11"
+DEPENDS += " virtual/libx11 virtual/cldc-api-1.1"
-CLDC_PATH = ${STAGING_LIBDIR}/java/cldc1.1.jar
-
do_configure() {
cd ${S}/resources-embedded/com/sun/midp/configuration
@@ -21,23 +18,23 @@ make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS=
cd ${S}/external/escher-cldc/core
make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -sourcepath ${S}/external/escher-cldc/core -source 1.3 -target 1.1" || exit 1
make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="escher-x11-cldc.jar" JAR_FLAGS="cvf" || exit 1
-cp ${S}/external/escher-cldc/core/escher-x11-cldc.jar ${S}/dist
}
do_install() {
- install -d ${D}${libdir}
- install -m 0644 dist/escher-x11-cldc.jar ${D}${libdir}
- install -d ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration
- install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration/
+ install -d ${D}${datadir}
+ install -m 0644 ${S}/external/escher-cldc/core/escher-x11-cldc.jar ${D}${datadir}
+ install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration
+ install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/
}
do_stage() {
- :
+ install -d ${STAGING_DATADIR}/java
+ install -m 0644 ${S}/external/escher-cldc/core/escher-x11-cldc.jar ${STAGING_DATADIR}/java
}
PACKAGES = "${PN}"
-FILES_${PN} = "${libdir}/java/escher-x11-cldc.jar \
- ${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
+FILES_${PN} = "${datadir}/java/escher-x11-cldc.jar \
+ ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
"
============================================================
--- packages/midpath/midpath-gtk_svn.bb 8b8dbd9444e83c2f45d5646af02cfd5654a87113
+++ packages/midpath/midpath-gtk_0.1.bb aa5d09aafbc3d8a7fd37a4629dc7e86da0bcf8b4
@@ -1,8 +1,7 @@
-require midpath_${PV}.bb
+require midpath.inc
DEPENDS += "gtk+"
-RDEPENDS = "gtk+"
do_configure() {
@@ -21,15 +20,14 @@ make || exit 1
# Build the GTK native part
cd ${S}/native/gtk
make || exit 1
-cp *.so ${S}/dist
}
do_install() {
install -d ${D}${libdir}
- install -m 0644 dist/libmidpathgtk.so ${D}${libdir}
- install -d ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration
- install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration/
+ install -m 0644 ${S}/native/gtk/libmidpathgtk.so ${D}${libdir}
+ install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration
+ install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/
}
do_stage() {
@@ -39,5 +37,6 @@ FILES_${PN} = "${libdir}/libmidpathgtk.
PACKAGES = "${PN}"
FILES_${PN} = "${libdir}/libmidpathgtk.so \
- ${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
+ ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
"
+CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg"
============================================================
--- packages/midpath/midpath-qt3x11_svn.bb ae69b147de0f7b04618b3b2d35131bc7ce9c9adc
+++ packages/midpath/midpath-qt3x11_0.1.bb 3f1384df13f5a0dbd7cea235b83e4fcb840c0c85
@@ -1,8 +1,7 @@
-require midpath_${PV}.bb
+require midpath.inc
-DEPENDS += "qt-mt"
-RDEPENDS = "qt-mt"
+DEPENDS += " qt-mt"
RCONFILCTS = "midpath-qte"
inherit qt3x11
@@ -26,15 +25,14 @@ make || exit 1
# Build the QT native part
cd ${S}/native/qt
make || exit 1
-cp *.so ${S}/dist
}
do_install() {
install -d ${D}${libdir}
- insta%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list