summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-03-23 13:19:11 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-03-23 13:19:11 -0500
commit07e19eaf15e48106d84c606d5bb2d844bad85973 (patch)
tree24a5da4cbe2694d67acd6bef32225e2d3a691890
parent3ac7d09401abde3e0ca3e70254d0b60c8636acc8 (diff)
downloadpki-dev-07e19eaf15e48106d84c606d5bb2d844bad85973.tar.gz
pki-dev-07e19eaf15e48106d84c606d5bb2d844bad85973.tar.xz
pki-dev-07e19eaf15e48106d84c606d5bb2d844bad85973.zip
Do not build Javadoc.
-rwxr-xr-xscripts/core-build.sh2
-rwxr-xr-xscripts/core-uninstall.sh9
2 files changed, 6 insertions, 5 deletions
diff --git a/scripts/core-build.sh b/scripts/core-build.sh
index 2cbd6b6..dee68f3 100755
--- a/scripts/core-build.sh
+++ b/scripts/core-build.sh
@@ -7,7 +7,7 @@ cd $SRC_DIR
rm -rf packages
mkdir packages
-./pki/scripts/compose_pki_core_packages hybrid_rpms
+./pki/scripts/compose_pki_core_packages --without-javadoc hybrid_rpms 2>&1 | tee packages/build.log
mkdir packages/RPMS/combined
cp -p packages/RPMS/*/*.rpm packages/RPMS/combined
diff --git a/scripts/core-uninstall.sh b/scripts/core-uninstall.sh
index 3bc49ec..b4e2852 100755
--- a/scripts/core-uninstall.sh
+++ b/scripts/core-uninstall.sh
@@ -2,6 +2,10 @@
rpm -ev pki-core-debuginfo
+rpm -ev pki-util-javadoc\
+ pki-common-javadoc\
+ pki-java-tools-javadoc
+
rpm -ev pki-deploy\
pki-selinux\
pki-tks\
@@ -10,11 +14,8 @@ rpm -ev pki-deploy\
pki-native-tools\
pki-silent\
pki-util\
- pki-common-javadoc\
- pki-java-tools-javadoc\
pki-setup\
pki-ocsp\
pki-ca\
pki-java-tools\
- pki-symkey\
- pki-util-javadoc
+ pki-symkey