Date: Tuesday, July 22, 2014 @ 21:41:16 Author: guillaume Revision: 217735
Remove links from packages Modified: java-meta/trunk/PKGBUILD java-meta/trunk/bin_archlinux-java java-meta/trunk/bin_archlinux-java_tests --------------------------+ PKGBUILD | 79 +++++++++++---------------------------------- bin_archlinux-java | 3 + bin_archlinux-java_tests | 14 +++++-- 3 files changed, 32 insertions(+), 64 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-07-22 16:38:44 UTC (rev 217734) +++ PKGBUILD 2014-07-22 19:41:16 UTC (rev 217735) @@ -1,78 +1,41 @@ # Maintainer: Guillaume ALAUX <[email protected]> -pkgname=('java-runtime-headless-meta' 'java-runtime-meta' 'java-environment-meta') -pkgbase=java-meta -pkgver=2 -pkgrel=5 +pkgname=java-common +pkgver=1 +pkgrel=1 +pkgdesc='Common files for Java Environments' arch=('any') url='www.archlinux.org' license=('GPL') checkdepends=('wget') +backup=(etc/profile.d/jre.sh + etc/profile.d/jre.csh) +# TODO rename +install=install_java-runtime-headless-meta.sh source=(profile_jre.csh profile_jre.sh bin_archlinux-java bin_archlinux-java_tests - bin_java-wrapper) + bin_java-wrapper + https://shunit2.googlecode.com/files/shunit2-2.1.6.tgz) + sha256sums=('9f0032e47705ce55a615ab3b942720b8447f490d1ff430b214038b81c3019ac2' '8dbafa311f34d23c5bbef71fa942b97b224ebeb330b36195f22a1836285bbb83' - '96291bdc1197162288ee52160bf8d954119c86efc56c88bebabee6d9eba815a3' - '2cc7c1f1c41c49d58a71c5fbc1a6b04717b7f998dbd47e704b6dc65cc74b78bf' - '622927af9ec374140a878993936f7fdd4206fe069dddfcefc6d4e15fa6d67f39') + 'af9539b5bfb28ec5ace67547a8e4ba94e1aa2fe09b0fcd6d779e07c19ba4a9b2' + 'e91b0ca5fe3fab8720822d930f2f17635104353368674e72e852124bb11112e9' + '622927af9ec374140a878993936f7fdd4206fe069dddfcefc6d4e15fa6d67f39' + '65a313a76fd5cc1c58c9e19fbc80fc0e418a4cbfbd46d54b35ed5b6e0025d4ee') check() { cd "${srcdir}" - if [ ! -d shunit2-2.1.6 ]; then - wget https://shunit2.googlecode.com/files/shunit2-2.1.6.tgz - tar xf shunit2-2.1.6.tgz - fi ./bin_archlinux-java_tests } -package_java-runtime-headless-meta() { - pkgdesc='Meta files for headless Java Runtime Environments' - backup=(etc/profile.d/jre.sh - etc/profile.d/jre.csh) - install=install_java-runtime-headless-meta.sh - +build() { cd "${srcdir}" - install -d -m 755 "${pkgdir}/etc/profile.d" - install -m 644 profile_jre.sh "${pkgdir}/etc/profile.d/jre.sh" - install -m 644 profile_jre.csh "${pkgdir}/etc/profile.d/jre.csh" - - install -D -m 755 bin_java-wrapper "${pkgdir}/usr/bin/java" - # Official list of supplementary binaries that Java headless runtime packages MUST provide - # This list is based on Arch Linux' default Java implementation: "OpenJDK 7 Icedtea" - for bin in keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200; do - ln -s java "${pkgdir}/usr/bin/${bin}" - done - - install -D bin_archlinux-java "${pkgdir}/usr/bin/archlinux-java" + install -D -m 644 profile_jre.sh "${pkgdir}/etc/profile.d/jre.sh" + install -D -m 644 profile_jre.csh "${pkgdir}/etc/profile.d/jre.csh" + # TODO change name + install -D -m 755 bin_java-wrapper "${pkgdir}/usr/share/java-common-wrapper" + install -D -m 755 bin_archlinux-java "${pkgdir}/usr/bin/archlinux-java" } - -package_java-runtime-meta() { - pkgdesc='Meta files for full Java Runtime Environments' - - cd "${srcdir}" - - install -d -m 755 "${pkgdir}/usr/bin/" - # Official list of supplementary binaries that Java runtime packages MUST provide - # This list is based on Arch Linux' default Java implementation: "OpenJDK 7 Icedtea" - ln -s java "${pkgdir}/usr/bin/policytool" -} - -package_java-environment-meta() { - pkgdesc='Meta files for Java Development Kits' - - cd "${srcdir}" - - install -d -m 755 "${pkgdir}/usr/bin/" - # Official list of supplementary binaries that Java environment packages MUST provide - # This list is based on Arch Linux' default Java implementation: "OpenJDK 7 Icedtea" - for bin in \ - appletviewer extcheck idlj jar jarsigner javac javadoc javah javap jcmd \ - jconsole jdb jdeps jhat jinfo jmap jps jrunscript jsadebugd jstack jstat \ - jstatd native2ascii rmic schemagen serialver wsgen wsimport xjc; - do - ln -s java "${pkgdir}/usr/bin/${bin}" - done -} Modified: bin_archlinux-java =================================================================== --- bin_archlinux-java 2014-07-22 16:38:44 UTC (rev 217734) +++ bin_archlinux-java 2014-07-22 19:41:16 UTC (rev 217735) @@ -7,6 +7,7 @@ DEFAULT_NAME=java-default-runtime DEFAULT_PATH=${JVM_DIR}/${DEFAULT_NAME} BIN_PATH=/usr/bin +WRAPPER_PATH=/usr/share/java-common-wrapper # Utility functions @@ -61,7 +62,7 @@ ln -sf $1 ${DEFAULT_PATH} find ${DEFAULT_PATH}/bin ! -type d -perm /a=x \ | while read bpath; do - ln -sf ${bpath} ${BIN_PATH}/$(basename ${bpath}) + ln -sf ${WRAPPER_PATH} ${BIN_PATH}/$(basename ${bpath}) done } Modified: bin_archlinux-java_tests =================================================================== --- bin_archlinux-java_tests 2014-07-22 16:38:44 UTC (rev 217734) +++ bin_archlinux-java_tests 2014-07-22 19:41:16 UTC (rev 217735) @@ -11,6 +11,8 @@ INIT_JVM_DIR=${JVM_DIR} INIT_DEFAULT_PATH=${DEFAULT_PATH} +INIT_BIN_PATH=${BIN_PATH} +INIT_WRAPPER_PATH=${WRAPPER_PATH} # Redefining this so that tested script can be invoked without root privileges check_root() { @@ -27,8 +29,10 @@ JVM_DIR=${test_dir}${INIT_JVM_DIR} DEFAULT_PATH=${test_dir}${INIT_DEFAULT_PATH} JAVA_NAME=$(get_rand_str) - BIN_PATH=${test_dir}/usr/bin + BIN_PATH=${test_dir}${INIT_BIN_PATH} mkdir -p ${BIN_PATH} + WRAPPER_PATH=${test_dir}${INIT_WRAPPER_PATH} + mkdir -p $(dirname ${WRAPPER_PATH}) } tearDown() { @@ -53,9 +57,9 @@ set_default_for_test() { ln -s $1 ${DEFAULT_PATH} - ln -s ${DEFAULT_PATH}/bin/java ${BIN_PATH}/java + ln -s ${WRAPPER_PATH} ${BIN_PATH}/java if [ -x ${DEFAULT_PATH}/bin/javac ]; then - ln -s ${DEFAULT_PATH}/bin/javac ${BIN_PATH}/javac + ln -s ${WRAPPER_PATH} ${BIN_PATH}/javac fi } @@ -67,9 +71,9 @@ assertDefaultSetTo() { assertEquals "Default is not set to $1" "$1" "$(readlink ${DEFAULT_PATH})" - assertEquals "PATH has no java binary" "${DEFAULT_PATH}/bin/java" "$(readlink ${BIN_PATH}/java)" + assertEquals "PATH has no java binary" "${WRAPPER_PATH}" "$(readlink ${BIN_PATH}/java)" if [ -d ${DEFAULT_PATH}/jre ]; then - assertEquals "PATH has no javac binary" "${DEFAULT_PATH}/bin/javac" "$(readlink ${BIN_PATH}/javac)" + assertEquals "PATH has no javac binary" "${WRAPPER_PATH}" "$(readlink ${BIN_PATH}/javac)" fi }
