Attachment #121389 for bug #156815

Lines 12-18 Link Here

(-)tinyos-tools/tinyos-tools-1.2.3_p20070606.ebuild (-6 / +8 lines)
12	LICENSE="Intel"	12	LICENSE="Intel"
13	SLOT="0"	13	SLOT="0"
14	KEYWORDS="~x86 ~amd64"	14	KEYWORDS="~x86 ~amd64"
15	IUSE=""	15	IUSE="javacomm"
16	#DEPEND=">=dev-tinyos/tos-2.0.0"	16	#DEPEND=">=dev-tinyos/tos-2.0.0"
17		17
18	# !dev-tinyos/listen	18	# !dev-tinyos/listen
Lines 110-119 Link Here
110	src_install() {	110	src_install() {
111	emake DESTDIR="${D}" install \|\| die "emake install failed"	111	emake DESTDIR="${D}" install \|\| die "emake install failed"
112		112
113	local JNI="$(java-config -O)/jre"	113	if ! use javacomm; then
114	einfo "installing libgetenv.so and libtoscomm.so in ${JNI}"	114	local JNI="$(java-config -O)/jre"
115	into ${JNI}	115	einfo "installing libgetenv.so and libtoscomm.so in ${JNI}"
116	dobin ${S}/tinyos/java/env/libgetenv.so	116	into ${JNI}
117	dobin ${S}/tinyos/java/serial/libtoscomm.so	117	dobin ${S}/tinyos/java/env/libgetenv.so
		118	dobin ${S}/tinyos/java/serial/libtoscomm.so
		119	fi
118	}	120	}
119		121

Lines 16-22 Link Here

(-)tos-sdk-java/tos-sdk-java-2.0.1_p20070606.ebuild (-1 / +7 lines)
16	LICENSE="Intel"	16	LICENSE="Intel"
17	SLOT="2"	17	SLOT="2"
18	KEYWORDS="~x86 ~amd64"	18	KEYWORDS="~x86 ~amd64"
19	IUSE="doc"	19	IUSE="doc javacomm"
20	DEPEND=">=dev-tinyos/tinyos-tools-1.2.3	20	DEPEND=">=dev-tinyos/tinyos-tools-1.2.3
21	>=dev-tinyos/tos-${PV}	21	>=dev-tinyos/tos-${PV}
22	dev-tinyos/eselect-tinyos"	22	dev-tinyos/eselect-tinyos"
Lines 47-52 Link Here
47	einfo " java makefile clean target "	47	einfo " java makefile clean target "
48	epatch ${FILESDIR}/message_Makefile_clean-mig-target.patch	48	epatch ${FILESDIR}/message_Makefile_clean-mig-target.patch
49		49
		50	# replace the TOSComm Serial implementation with JavaComm-based code
		51	if use javacomm; then
		52	einfo "Using JavaComm-based serial communication instead of TOSComm."
		53	cp -f ${FILESDIR}/SerialByteSource-JavaComm.java \
		54	${S}/support/sdk/java/net/tinyos/packet/SerialByteSource.java
		55	fi
50	}	56	}
51		57
52	src_compile() {	58	src_compile() {

Return to bug 156815