Re: javatoolkit: new project layout
Alistair Bush <[email protected]>
| Newsgroups | gmane.linux.gentoo.java |
|---|---|
| Message-ID | <[email protected]> |
Ok here are 2 patches to support the moving of javatoolkit currently I have tested them on 1!! package!! so surely they are tree ready :) What do you think of them? Some parts are getting a bit messy but im unsure of how they could be cleaned up without breaking backwards comp. Alistair ps, im just about to do a re-emerge-everything-java.sh, we will see how it goes pss. Have I missed anything?
javatoolkit_java-ant-2.eclass.patch
(text/plain, 3.1 KB)
--- java-ant-2.eclass.orig 2008-01-03 16:31:16.000000000 +1300
+++ java-ant-2.eclass 2008-01-09 21:31:17.000000000 +1300
@@ -224,7 +224,16 @@
else
local files
- [[ -x "/usr/bin/xml-rewrite-2.py" ]] && local using_new="true"
+ local using_new=""
+ local xml_rewrite_2="/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py"
+ if [[ -x "${xml_rewrite_2}" ]]; then
+ using_new="true"
+ else
+ xml_rewrite_2="/usr/bin/xml-rewrite-2.py"
+ if [[ -x "${xml_rewrite_2}" ]]; then
+ using_new="true"
+ fi
+ fi
for file in "${@}"; do
debug-print "${FUNCNAME}: ${file}"
@@ -243,10 +252,10 @@
echo "Rewriting $file (using xml-rewrite.py)"
# Doing this twice because otherwise the source attributes would
# get added to target tags too and javadoc does not like target
- xml-rewrite.py -f "${file}" \
+ eval ${xml-rewrite.py} -f "${file}" \
-c -e ${JAVA_PKG_BSFIX_SOURCE_TAGS// / -e } \
-a source -v ${want_source} || _bsfix_die "xml-rewrite failed: ${file}"
- xml-rewrite.py -f "${file}" \
+ eval ${xml-rewrite.py} -f "${file}" \
-c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / -e } \
-a target -v ${want_target} || _bsfix_die "xml-rewrite failed: ${file}"
fi
@@ -259,21 +268,25 @@
fi
# for javadoc target and all in one pass, we need the new rewriter.
- local rewriter3="/usr/share/javatoolkit/xml-rewrite-3.py"
+ local rewriter3="/usr/$(get_libdir)}/javatoolkit/bin/xml-rewrite-3.py"
+ if [[ ! -f ${rewriter3} ]]; then
+ rewriter3="/usr/bin/xml-rewrite-3.py"
+ fi
+
if [[ ! -f ${rewriter3} ]]; then
debug-print "Using second generation rewriter"
eval echo "Rewriting source attributes" ${output}
- eval xml-rewrite-2.py ${files} \
+ eval ${xml_rewrite_2} ${files} \
-c -e ${JAVA_PKG_BSFIX_SOURCE_TAGS// / -e } \
-a source -v ${want_source} ${output} || _bsfix_die "xml-rewrite2 failed: ${file}"
eval echo "Rewriting target attributes" ${output}
- eval xml-rewrite-2.py ${files} \
+ eval ${xml_rewrite_2} ${files} \
-c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / -e } \
-a target -v ${want_target} ${output} || _bsfix_die "xml-rewrite2 failed: ${file}"
eval echo "Rewriting nowarn attributes" ${output}
- eval xml-rewrite-2.py ${files} \
+ eval ${xml_rewrite_2} ${files} \
-c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / -e } \
-a nowarn -v yes ${output} || _bsfix_die "xml-rewrite2 failed: ${file}"
else
@@ -410,10 +423,17 @@
# ------------------------------------------------------------------------------
java-ant_xml-rewrite() {
local bindir="${ROOT}/usr/bin/"
+ local newbindir="${ROOT}/usr/$(get_libdir)/javatoolkit/bin"
local gen2="${bindir}/xml-rewrite-2.py"
+ local gen2_1="${newbindir}/xml-rewrite-2.py"
local gen1="${bindir}/xml-rewrite.py"
- if [[ -x "${gen2}" ]]; then
+ local gen1_1="${newbindir}/xml-rewrite.py"
+ if [[ -x "${gen2_1}" ]]; then
+ ${gen2_1} "${@}" || die "${gen2_1} failed"
+ elif [[ -x "${gen2}" ]]; then
${gen2} "${@}" || die "${gen2} failed"
+ elif [[ -x "${gen1_1}" ]]; then
+ ${gen1_1} "${@}"
elif [[ -x "${gen1}" ]]; then
${gen1} "${@}" || die "${gen1} failed"
else
javatoolkit_java-utils-2.eclass.patch
(text/plain, 961 B)
--- java-utils-2.eclass.orig 2008-01-09 21:34:56.000000000 +1300
+++ java-utils-2.eclass 2008-01-09 21:41:54.000000000 +1300
@@ -2606,15 +2606,19 @@
# ------------------------------------------------------------------------------
java-pkg_verify-classes() {
#$(find ${D} -type f -name '*.jar' -o -name '*.class')
+ local verifier="/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py"
+ if [[ ! -x "${verifier}" ]]; then
+ verifier="/usr/bin/class-version-verify.py"
+ fi
local target=$(java-pkg_get-target)
local result
local log="${T}/class-version-verify.log"
if [[ -n "${1}" ]]; then
- class-version-verify.py -v -t ${target} "${1}" > "${log}"
+ eval ${verifier} -v -t ${target} "${1}" > "${log}"
result=$?
else
ebegin "Verifying java class versions (target: ${target})"
- class-version-verify.py -v -t ${target} -r "${D}" > "${log}"
+ eval ${verifier} -v -t ${target} -r "${D}" > "${log}"
result=$?
eend ${result}
fi