diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-02-22 01:15:56 -0600 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-02-29 12:06:39 -0600 |
| commit | 05f8a44b83a01ab60774a14b48c39067dc135171 (patch) | |
| tree | ab6592e2ebd3767a72774878814e6fe5b1749c33 /pki/base/util | |
| parent | db9caadf192227d724ebf084d9ef56c865e5b969 (diff) | |
| download | pki-05f8a44b83a01ab60774a14b48c39067dc135171.tar.gz pki-05f8a44b83a01ab60774a14b48c39067dc135171.tar.xz pki-05f8a44b83a01ab60774a14b48c39067dc135171.zip | |
Removed dependency on OSUtil.
The OSUtil is no longer used by the code. It has been removed from
build scripts and tools.
Ticket #90
Diffstat (limited to 'pki/base/util')
| -rw-r--r-- | pki/base/util/src/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | pki/base/util/test/CMakeLists.txt | 6 |
2 files changed, 5 insertions, 14 deletions
diff --git a/pki/base/util/src/CMakeLists.txt b/pki/base/util/src/CMakeLists.txt index 0c78ac3b7..a9c95837f 100644 --- a/pki/base/util/src/CMakeLists.txt +++ b/pki/base/util/src/CMakeLists.txt @@ -16,14 +16,6 @@ find_file(LDAPJDK_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 @@ -339,21 +331,20 @@ set(pki-cmsutil_java_SRCS set(CMAKE_JAVA_INCLUDE_PATH ${LDAPJDK_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-nsutil set(CMAKE_JAR_CLASSES_PREFIX netscape) add_jar(pki-nsutil ${pki-nsutil_java_SRCS}) -add_dependencies(pki-nsutil osutil) install_jar(pki-nsutil ${JAVA_JAR_INSTALL_DIR}/pki) set(PKI_NSUTIL_JAR ${pki-nsutil_JAR_FILE} CACHE INTERNAL "pki-nsutil jar file") # build pki-cmsutil set(CMAKE_JAR_CLASSES_PREFIX com/netscape/cmsutil) add_jar(pki-cmsutil ${pki-cmsutil_java_SRCS}) -add_dependencies(pki-cmsutil osutil pki-nsutil) +add_dependencies(pki-cmsutil pki-nsutil) install_jar(pki-cmsutil ${JAVA_JAR_INSTALL_DIR}/pki) set(PKI_CMSUTIL_JAR ${pki-cmsutil_JAR_FILE} CACHE INTERNAL "pki-cmsutil jar file") diff --git a/pki/base/util/test/CMakeLists.txt b/pki/base/util/test/CMakeLists.txt index 042731f3b..592f3dbbb 100644 --- a/pki/base/util/test/CMakeLists.txt +++ b/pki/base/util/test/CMakeLists.txt @@ -19,7 +19,7 @@ set(pki-util-test_SRCS set(CMAKE_JAVA_INCLUDE_PATH ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} - ${JSS_JAR} ${LDAPJDK_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} ${XALAN_JAR} ${XERCES_JAR} + ${JSS_JAR} ${LDAPJDK_JAR} ${COMMONS_CODEC_JAR} ${XALAN_JAR} ${XERCES_JAR} ${PKI_TEST_JAR} ${JUNIT_JAR} ) @@ -30,7 +30,7 @@ set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION}) # TODO: build test only when the test is invoked set(CMAKE_JAR_CLASSES_PREFIX com/netscape) add_jar(pki-util-test ${pki-util-test_SRCS}) -add_dependencies(pki-util-test osutil pki-nsutil pki-cmsutil pki-test) +add_dependencies(pki-util-test pki-nsutil pki-cmsutil pki-test) # create test target # do not include xalan and xerces in class path @@ -39,7 +39,7 @@ add_junit_test(test-pki-util CLASSPATH ${pki-util-test_JAR_FILE} ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} - ${JSS_JAR} ${LDAPJDK_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} + ${JSS_JAR} ${LDAPJDK_JAR} ${COMMONS_CODEC_JAR} ${PKI_TEST_JAR} ${JUNIT_JAR} TESTS com.netscape.security.util.BMPStringTest |