diff options
Diffstat (limited to 'pki/base/java-tools')
4 files changed, 2 insertions, 40 deletions
diff --git a/pki/base/java-tools/src/CMakeLists.txt b/pki/base/java-tools/src/CMakeLists.txt index 17c6f6b68..0411a54c7 100644 --- a/pki/base/java-tools/src/CMakeLists.txt +++ b/pki/base/java-tools/src/CMakeLists.txt @@ -8,14 +8,6 @@ find_file(JSS_JAR /usr/share/java ) -find_file(OSUTIL_JAR - NAMES - osutil.jar - PATHS - ${JAVA_LIB_INSTALL_DIR} - /usr/share/java -) - find_file(COMMONS_CODEC_JAR NAMES commons-codec.jar @@ -67,13 +59,13 @@ set(pki-tools_java_SRCS set(CMAKE_JAVA_INCLUDE_PATH ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} ${XALAN_JAR} ${XERCES_JAR} - ${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR}) + ${JSS_JAR} ${COMMONS_CODEC_JAR}) set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION}) # build pki-tools add_jar(pki-tools ${pki-tools_java_SRCS}) -add_dependencies(pki-tools osutil pki-nsutil pki-cmsutil) +add_dependencies(pki-tools pki-nsutil pki-cmsutil) install( FILES com/netscape/cmstools/DRMTool.cfg diff --git a/pki/base/java-tools/templates/pki_java_command_wrapper.in b/pki/base/java-tools/templates/pki_java_command_wrapper.in index b09740945..b0d406161 100644 --- a/pki/base/java-tools/templates/pki_java_command_wrapper.in +++ b/pki/base/java-tools/templates/pki_java_command_wrapper.in @@ -74,15 +74,12 @@ if [ "${OS}" = "Linux" ] ; then if [ "${ARCHITECTURE}" = "i386" ] ; then LD_LIBRARY_PATH=/usr/lib:/lib LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH elif [ "${ARCHITECTURE}" = "x86_64" ] ; then LD_LIBRARY_PATH=/usr/lib:/lib LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH} LD_LIBRARY_PATH=/usr/lib64:/lib64:${LD_LIBRARY_PATH} LD_LIBRARY_PATH=/usr/lib64/jss:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib64/osutil:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH else invalid_architecture "${ARCHITECTURE}" @@ -135,13 +132,6 @@ if [ "${OS}" = "Linux" ] && # Fedora 16+ CP=/usr/lib64/java/jss4.jar fi -CP=/usr/lib/java/osutil.jar:${CP} -CP=/usr/lib/java/dirsec/osutil.jar:${CP} -if [ "${OS}" = "Linux" ] && - [ "${ARCHITECTURE}" = "x86_64" ] ; then - # Fedora 16+ - CP=/usr/lib64/java/osutil.jar:${CP} -fi CP=/usr/share/java/commons-codec.jar:${CP} CP=/usr/share/java/ldapjdk.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP} diff --git a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in index ec1f2a9f8..7f3331357 100644 --- a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in +++ b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in @@ -74,15 +74,12 @@ if [ "${OS}" = "Linux" ] ; then if [ "${ARCHITECTURE}" = "i386" ] ; then LD_LIBRARY_PATH=/usr/lib:/lib LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH elif [ "${ARCHITECTURE}" = "x86_64" ] ; then LD_LIBRARY_PATH=/usr/lib:/lib LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH} LD_LIBRARY_PATH=/usr/lib64:/lib64:${LD_LIBRARY_PATH} LD_LIBRARY_PATH=/usr/lib64/jss:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib64/osutil:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH else invalid_architecture "${ARCHITECTURE}" @@ -135,13 +132,6 @@ if [ "${OS}" = "Linux" ] && # Fedora 16+ CP=/usr/lib64/java/jss4.jar fi -CP=/usr/lib/java/osutil.jar:${CP} -CP=/usr/lib/java/dirsec/osutil.jar:${CP} -if [ "${OS}" = "Linux" ] && - [ "${ARCHITECTURE}" = "x86_64" ] ; then - # Fedora 16+ - CP=/usr/lib64/java/osutil.jar:${CP} -fi CP=/usr/share/java/commons-codec.jar:${CP} CP=/usr/share/java/ldapjdk.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP} diff --git a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in index 2fb27f699..95a559503 100644 --- a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in +++ b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in @@ -74,15 +74,12 @@ if [ "${OS}" = "Linux" ] ; then if [ "${ARCHITECTURE}" = "i386" ] ; then LD_LIBRARY_PATH=/usr/lib:/lib LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH elif [ "${ARCHITECTURE}" = "x86_64" ] ; then LD_LIBRARY_PATH=/usr/lib:/lib LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH} LD_LIBRARY_PATH=/usr/lib64:/lib64:${LD_LIBRARY_PATH} LD_LIBRARY_PATH=/usr/lib64/jss:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib64/osutil:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH else invalid_architecture "${ARCHITECTURE}" @@ -135,13 +132,6 @@ if [ "${OS}" = "Linux" ] && # Fedora 16+ CP=/usr/lib64/java/jss4.jar fi -CP=/usr/lib/java/osutil.jar:${CP} -CP=/usr/lib/java/dirsec/osutil.jar:${CP} -if [ "${OS}" = "Linux" ] && - [ "${ARCHITECTURE}" = "x86_64" ] ; then - # Fedora 16+ - CP=/usr/lib64/java/osutil.jar:${CP} -fi CP=/usr/share/java/commons-codec.jar:${CP} CP=/usr/share/java/ldapjdk.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP} |