diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2013-08-13 15:56:50 -0400 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2013-08-15 12:26:12 -0400 |
| commit | 17d6be4d85741bffa21d93aceaff00223bc77dec (patch) | |
| tree | 7703eba9059076e47c7262120150292270c54d15 /scripts/compose_pki_core_packages | |
| parent | 4ab7fdc3c08a6279d838ae795889924e9fc306cb (diff) | |
| download | pki-17d6be4d85741bffa21d93aceaff00223bc77dec.tar.gz pki-17d6be4d85741bffa21d93aceaff00223bc77dec.tar.xz pki-17d6be4d85741bffa21d93aceaff00223bc77dec.zip | |
Moved Tomcat-based TPS to separate folder.
The source files for the new Tomcat-based TPS has been moved from base/tps
to base/tps-tomcat. The new TPS will now be build in pki-core and packaged
in pki-tps-tomcat RPM. The old TPS and RA have been restored to the previous
state before adding the new TPS. Once the new TPS is complete, the old TPS
can be removed, the new TPS can be moved back to base/tps and the package
can be renamed back to pki-tps.
Ticket #702
Diffstat (limited to 'scripts/compose_pki_core_packages')
| -rwxr-xr-x | scripts/compose_pki_core_packages | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/scripts/compose_pki_core_packages b/scripts/compose_pki_core_packages index 99d480c31..eb124ebb0 100755 --- a/scripts/compose_pki_core_packages +++ b/scripts/compose_pki_core_packages @@ -39,9 +39,9 @@ PKI_CORE_VERSION="10.1.0" ## PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_CORE}.spec" -PKI_COMPONENT_LIST="test setup symkey util common native-tools java-tools server selinux ca kra ocsp tks silent" +PKI_COMPONENT_LIST="test setup symkey util common native-tools java-tools server selinux ca kra ocsp tks tps-tomcat silent" -if [ "$JAVADOC" = "" ]; then +if [ "$WITHOUT_JAVADOC" = "" ]; then PKI_COMPONENT_LIST="$PKI_COMPONENT_LIST javadoc" fi @@ -50,7 +50,7 @@ fi ## if [ $WORK_DIR ]; then - PKI_PACKAGES="$WORK_DIR" + PKI_PACKAGES="`cd $WORK_DIR ; pwd`" else PKI_PACKAGES="${PKI_PWD}/packages" fi @@ -154,12 +154,25 @@ else cd ${PKI_BASE_DIR} cp -p ${PKI_BASE_MANIFEST} ${PKI_CORE_BASE_DIR} cp -p VERSION ${PKI_CORE_BASE_DIR} - for component in "${PKI_COMPONENT_LIST}" ; + for component in ${PKI_COMPONENT_LIST} ; do - find ${component} \ + if [ "${component}" = "tps-tomcat" ] ; then + # rename tps-tomcat to tps + dest="tps" + else + dest="${component}" + fi + + # copying ${PKI_BASE_DIR}/${component} to ${PKI_CORE_BASE_DIR}/${dest} + cd ${component} + mkdir ${PKI_CORE_BASE_DIR}/${dest} + + find \ -name .svn -prune -o \ -name *.swp -prune -o \ - -print | cpio -pdum ${PKI_CORE_BASE_DIR} > /dev/null 2>&1 + -print | cpio -pdum ${PKI_CORE_BASE_DIR}/${dest} > /dev/null 2>&1 + + cd .. done cd - > /dev/null 2>&1 |