[nss-softokn] - Copy the util headers until the system has 3.13 - Skip bltest, fipstest, and lib until the sytem 3

[Elio Maldonado]

commit 0831cc6fe16d86e5fac1ebcb85ea9828423b2536
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Oct 8 10:27:34 2011 -0700

    - Copy the util headers until the system has 3.13
    - Skip bltest, fipstest, and lib until the sytem 3.13

 nss-split-softokn.sh |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/nss-split-softokn.sh b/nss-split-softokn.sh
index 8ff553b..0fcd7b3 100644
--- a/nss-split-softokn.sh
+++ b/nss-split-softokn.sh
@@ -35,7 +35,6 @@ softokn_dir=${name}-softokn-${version}
 #   mozilla/security/nss/lib         --- top files only
 #   mozilla/security/nss/lib/freebl  --- full directory
 #   mozilla/security/nss/lib/softoken --- full directory
-#   mozilla/security/nss/lib/softoken/dbm --- full directory
 #-------------------------------------------------------
 
 SOFTOKN_WORK=${softokn_dir}-work
@@ -50,12 +49,13 @@ rm -rf ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
 rm -rf ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/tests
 rm -rf ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib
 rm -rf ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/pkg
-# rstart with an empty lib directory and copy only what we need
+# start with an empty lib directory and copy only what we need
 mkdir ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib
 # copy entire freebl and softoken directories recursively
 cp -a ${nss_source_dir}/mozilla/security/nss/lib/freebl ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib/freebl
 cp -a ${nss_source_dir}/mozilla/security/nss/lib/softoken ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib/softoken
-cp -a ${nss_source_dir}/mozilla/security/nss/lib/softoken ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib/softoken/dbm
+# Copy util because some headers have changed, won't be needed in next update
+cp -a ${nss_source_dir}/mozilla/security/nss/lib/util ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib/util
 
 # and some Makefiles and related files
 cp ${nss_source_dir}/mozilla/security/nss/Makefile ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss
@@ -72,17 +72,20 @@ cp -p ${nss_source_dir}/mozilla/security/nss/cmd/manifest.mn ${SOFTOKN_WORK}/${s
 cp -p ${nss_source_dir}/mozilla/security/nss/cmd/platlibs.mk ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
 cp -p ${nss_source_dir}/mozilla/security/nss/cmd/platrules.mk ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
 
-# copy the bltest, fipstests, lib, and shlibsign subdirectories
+cp -a ${nss_source_dir}/mozilla/security/nss/cmd/shlibsign ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd/shlibsign
+#
+# copy the bltest, fipstests, lib, and subdirectories for testing
 #for d in "bltest fipstest lib shlibsign"; do
-cp -a ${nss_source_dir}/mozilla/security/nss/cmd/bltest \
-      ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd/bltest
-cp -a ${nss_source_dir}/mozilla/security/nss/cmd/fipstest \
-      ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd/fipstest
-cp -a ${nss_source_dir}/mozilla/security/nss/cmd/lib \
-      ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd/lib
-cp -a ${nss_source_dir}/mozilla/security/nss/cmd/shlibsign \
-      ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd/shlibsign
-#done
+src=${nss_source_dir}/mozilla/security/nss/cmd
+dst=${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
+
+# uncomment this line when we are to resume testing as part of the build
+#ts="bltest fipstest lib"
+ts=""
+for t in $ts; do
+  p -a ${src}/$t ${sst}/$t
+done
+
 
 # we also need some test scripts and dtest data from tests
 mkdir ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/tests