Revised compose scripts to allow them to use 'patches'.

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1871 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

1 files changed, 96 insertions, 97 deletions

diff --git a/pki/scripts/compose_ipa_pki_theme_packages b/pki/scripts/compose_ipa_pki_theme_packages
index 8ed362a4d..43d1ccc41 100755
--- a/pki/scripts/compose_ipa_pki_theme_packages
+++ b/pki/scripts/compose_ipa_pki_theme_packages
@@ -38,12 +38,7 @@ IPA_PKI_THEME_VERSION="9.0.3"
 ## Establish the SOURCE files/directories of the 'ipa-pki' source directory
 ##
 
-PKI_DIR="pki"
-PKI_DOGTAG_DIR="${PKI_DIR}/dogtag"
 PKI_SPECS_FILE="${PKI_DIR}/specs/${IPA_PKI_THEME}.spec"
-PKI_FILE_LIST="CMakeLists.txt COPYING CPackConfig.cmake ConfigureChecks.cmake DefineOptions.cmake README cmake_uninstall.cmake.in config.h.cmake"
-PKI_CMAKE_DIR="cmake"
-PKI_DOGTAG_MANIFEST="CMakeLists.txt"
 PKI_COMPONENT_LIST="common-ui ca-ui"
 
 
@@ -106,98 +101,102 @@ rm -f  ${IPA_PKI_THEME_SRPMS_DIR}/${IPA_PKI_THEME}-${IPA_PKI_THEME_VERSION}*.rpm
 cp -p ${PKI_SPECS_FILE} ${IPA_PKI_THEME_SPECS_DIR}
 
 
-##
-## Always start with a new 'ipa-pki' staging directory
-##
-
-rm -rf ${IPA_PKI_THEME_STAGING_DIR}
-
-
-##
-## To generate the 'ipa-pki' tarball, construct a staging area
-## consisting of the 'ipa-pki' source components from the
-## current contents of the PKI working repository
-##
-
-mkdir -p ${IPA_PKI_THEME_DIR}
-cd ${PKI_DIR}
-for file in "${PKI_FILE_LIST}" ;
-do
-	cp -p ${file} ${IPA_PKI_THEME_DIR}
-done
-find ${PKI_CMAKE_DIR}             \
-	-name .svn -prune -o          \
-	-name *.swp -prune -o         \
-	-print | cpio -pdum ${IPA_PKI_THEME_DIR} > /dev/null 2>&1
-cd - > /dev/null 2>&1
-
-mkdir -p ${IPA_PKI_THEME_DOGTAG_DIR}
-cd ${PKI_DOGTAG_DIR}
-cp -p ${PKI_DOGTAG_MANIFEST} ${IPA_PKI_THEME_DOGTAG_DIR}
-for component in "${PKI_COMPONENT_LIST}" ;
-do
-	find ${component}             \
-	-name .svn -prune -o          \
-	-name config-ext -prune -o    \
-	-name *.spec -prune -o        \
-	-name *.swp -prune -o         \
-	-name build.xml -prune -o     \
-	-name build_dogtag -prune -o  \
-	-print | cpio -pdum ${IPA_PKI_THEME_DOGTAG_DIR} > /dev/null 2>&1
-done
-cd - > /dev/null 2>&1
-
-
-##
-## Due to the following lower-level 'config' subdirectories,
-## INDEPENDENTLY remove ALL top-level 'config' directories:
-##
-##     * ./common-ui/shared/admin/console/config
-##     * ./ra-ui/shared/docroot/ra/admin/console/config   (N/A 'ipa-pki')
-##     * ./tps-ui/shared/docroot/tps/admin/console/config (N/A 'ipa-pki')
-##
-
-rm -rf ${IPA_PKI_THEME_DOGTAG_DIR}/*/config
-
-
-##
-## Create the 'ipa-pki' tarball
-##
-
-mkdir -p ${IPA_PKI_THEME_SOURCES_DIR}
-cd ${IPA_PKI_THEME_STAGING_DIR}
-# Remove all '*.htm*' web pages and 'Dogtag-specific' graphics
-# Map 'Dogtag' color '#225580' to black
-# Map 'Dogtag' color '#4f52b5' to black
-# Map 'DCS'    text to 'XXX'
-# Map 'dogtag' text to 'XXXXXX'
-# Map 'Dogtag' text to 'XXXXXX'
-# Map 'DOGTAG' text to 'XXXXXX'
-# Map 'Fedora' text to 'XXXXXX'
-# Map 'FEDORA' text to 'XXXXXX'
-find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -name "favicon.ico"     -print -or \
-                              -name "*.htm"           -print -or \
-                              -name "*.html"          -print -or \
-                              -name "logo_header.gif" -print | xargs rm        ;
-find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/#225580/#000000/g' {} \; ;
-find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/#4f52b5/#000000/g' {} \; ;
-find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/DCS/XXX/g'         {} \; ;
-find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/dogtag/XXXXXX/g'   {} \; ;
-find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/Dogtag/XXXXXX/g'   {} \; ;
-find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/DOGTAG/XXXXXX/g'   {} \; ;
-find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/Fedora/XXXXXX/g'   {} \; ;
-find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/FEDORA/XXXXXX/g'   {} \;
-gtar -zcvf ${IPA_PKI_THEME_TARBALL}    \
-	"${IPA_PKI_THEME}-${IPA_PKI_THEME_VERSION}" > /dev/null 2>&1
-mv ${IPA_PKI_THEME_TARBALL} ${IPA_PKI_THEME_SOURCES_DIR}
-cd - > /dev/null 2>&1
-
-
-##
-## Always remove the PKI staging area
-##
-
-rm -rf ${IPA_PKI_THEME_STAGING_DIR}
+if [ ${USE_PATCH_FILES} -eq 1 ] ; then
+	Retrieve_Source_Tarball_and_Patches ${PKI_SPECS_FILE} ${PKI_PATCHES_DIR} ${IPA_PKI_THEME_SOURCES_DIR}
+else
+	##
+	## Always start with a new 'ipa-pki' staging directory
+	##
+
+	rm -rf ${IPA_PKI_THEME_STAGING_DIR}
+
+
+	##
+	## To generate the 'ipa-pki' tarball, construct a staging area
+	## consisting of the 'ipa-pki' source components from the
+	## current contents of the PKI working repository
+	##
+
+	mkdir -p ${IPA_PKI_THEME_DIR}
+	cd ${PKI_DIR}
+	for file in "${PKI_FILE_LIST}" ;
+	do
+		cp -p ${file} ${IPA_PKI_THEME_DIR}
+	done
+	find ${PKI_CMAKE_DIR}             \
+		-name .svn -prune -o          \
+		-name *.swp -prune -o         \
+		-print | cpio -pdum ${IPA_PKI_THEME_DIR} > /dev/null 2>&1
+	cd - > /dev/null 2>&1
+
+	mkdir -p ${IPA_PKI_THEME_DOGTAG_DIR}
+	cd ${PKI_DOGTAG_DIR}
+	cp -p ${PKI_DOGTAG_MANIFEST} ${IPA_PKI_THEME_DOGTAG_DIR}
+	for component in "${PKI_COMPONENT_LIST}" ;
+	do
+		find ${component}             \
+		-name .svn -prune -o          \
+		-name config-ext -prune -o    \
+		-name *.spec -prune -o        \
+		-name *.swp -prune -o         \
+		-name build.xml -prune -o     \
+		-name build_dogtag -prune -o  \
+		-print | cpio -pdum ${IPA_PKI_THEME_DOGTAG_DIR} > /dev/null 2>&1
+	done
+	cd - > /dev/null 2>&1
+
+
+	##
+	## Due to the following lower-level 'config' subdirectories,
+	## INDEPENDENTLY remove ALL top-level 'config' directories:
+	##
+	##     * ./common-ui/shared/admin/console/config
+	##     * ./ra-ui/shared/docroot/ra/admin/console/config   (N/A 'ipa-pki')
+	##     * ./tps-ui/shared/docroot/tps/admin/console/config (N/A 'ipa-pki')
+	##
+
+	rm -rf ${IPA_PKI_THEME_DOGTAG_DIR}/*/config
+
+
+	##
+	## Create the 'ipa-pki' tarball
+	##
+
+	mkdir -p ${IPA_PKI_THEME_SOURCES_DIR}
+	cd ${IPA_PKI_THEME_STAGING_DIR}
+	# Remove all '*.htm*' web pages and 'Dogtag-specific' graphics
+	# Map 'Dogtag' color '#225580' to black
+	# Map 'Dogtag' color '#4f52b5' to black
+	# Map 'DCS'    text to 'XXX'
+	# Map 'dogtag' text to 'XXXXXX'
+	# Map 'Dogtag' text to 'XXXXXX'
+	# Map 'DOGTAG' text to 'XXXXXX'
+	# Map 'Fedora' text to 'XXXXXX'
+	# Map 'FEDORA' text to 'XXXXXX'
+	find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -name "favicon.ico"     -print -or \
+	                                    -name "*.htm"           -print -or \
+	                                    -name "*.html"          -print -or \
+	                                    -name "logo_header.gif" -print | xargs rm        ;
+	find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/#225580/#000000/g' {} \; ;
+	find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/#4f52b5/#000000/g' {} \; ;
+	find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/DCS/XXX/g'         {} \; ;
+	find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/dogtag/XXXXXX/g'   {} \; ;
+	find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/Dogtag/XXXXXX/g'   {} \; ;
+	find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/DOGTAG/XXXXXX/g'   {} \; ;
+	find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/Fedora/XXXXXX/g'   {} \; ;
+	find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/FEDORA/XXXXXX/g'   {} \;
+	gtar -zcvf ${IPA_PKI_THEME_TARBALL}    \
+		"${IPA_PKI_THEME}-${IPA_PKI_THEME_VERSION}" > /dev/null 2>&1
+	mv ${IPA_PKI_THEME_TARBALL} ${IPA_PKI_THEME_SOURCES_DIR}
+	cd - > /dev/null 2>&1
+
+
+	##
+	## Always remove the PKI staging area
+	##
+
+	rm -rf ${IPA_PKI_THEME_STAGING_DIR}
+fi
 
 
 ##