mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
patching ebuild files to support new java-pkg-simple
Signed-off-by: Zhang Zongyu <zzy2529420793@gmail.com> Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
committed by
Miroslav Šulc
parent
faa4070329
commit
a4d773b4c2
@@ -26,7 +26,7 @@ DEPEND="
|
||||
|
||||
S="${WORKDIR}/${P}"
|
||||
|
||||
JAVA_SRC_DIR="src/api src/impl"
|
||||
JAVA_SRC_DIR=( "src/api" "src/impl" )
|
||||
|
||||
java_prepare() {
|
||||
java-pkg_clean
|
||||
|
||||
@@ -29,7 +29,7 @@ DEPEND="
|
||||
|
||||
S="${WORKDIR}/${PN}.java-${PN}-complete-${PV}"
|
||||
JAVA_GENTOO_CLASSPATH="swt-3.8"
|
||||
JAVA_SRC_DIR="core extras swt"
|
||||
JAVA_SRC_DIR=( "core" "extras" "swt" )
|
||||
|
||||
java_prepare() {
|
||||
rm -rf core/src/test extras/src/test swt/src/test || die
|
||||
|
||||
@@ -37,7 +37,7 @@ DEPEND="
|
||||
app-arch/unzip"
|
||||
|
||||
S="${WORKDIR}/${MY_P}/src"
|
||||
JAVA_SRC_DIR="beaninfo java"
|
||||
JAVA_SRC_DIR=( "beaninfo" "java" )
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
@@ -61,7 +61,7 @@ src_compile() {
|
||||
java-pkg-simple_src_compile
|
||||
|
||||
local DIR
|
||||
for DIR in ${JAVA_SRC_DIR}; do
|
||||
for DIR in "${JAVA_SRC_DIR[@]}"; do
|
||||
java-pkg_addres ${PN}.jar ${DIR}
|
||||
done
|
||||
}
|
||||
|
||||
@@ -26,4 +26,4 @@ DEPEND="
|
||||
>=virtual/jdk-1.6
|
||||
source? ( app-arch/zip )"
|
||||
|
||||
JAVA_SRC_DIR="org javax"
|
||||
JAVA_SRC_DIR=( "org" "javax" )
|
||||
|
||||
@@ -31,13 +31,13 @@ java_prepare() {
|
||||
find -name '*.jar' -exec rm -v {} + || die
|
||||
}
|
||||
|
||||
JAVA_SRC_DIR="src src-apache"
|
||||
JAVA_SRC_DIR=( "src" "src-apache" )
|
||||
JAVA_GENTOO_CLASSPATH="relaxng-datatype,xerces-2"
|
||||
|
||||
src_compile() {
|
||||
java-pkg-simple_src_compile
|
||||
|
||||
local dir; for dir in ${JAVA_SRC_DIR}; do
|
||||
local dir; for dir in "${JAVA_SRC_DIR[@]}"; do
|
||||
pushd ${dir} > /dev/null || die
|
||||
jar -uf "${S}"/${PN}.jar $(find -name '*.properties') || die
|
||||
popd > /dev/null
|
||||
|
||||
Reference in New Issue
Block a user