[Jboss-svn-commits] JBL Code SVN: r4740 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: jfr...@jb...
Date: 2006-06-12 06:18:55 -0400 (Mon, 12 Jun 2006)
New Revision: 4740

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
use tar to prevent duping files when symlinks.


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-12 09:51:21 UTC (rev 4739)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-12 10:18:55 UTC (rev 4740)
@@ -206,6 +206,18 @@
 }
 
 #
+# Copy the file and the symlinks
+# $1 : source directory
+# $2 : file names (like "*.so*")
+# $3 : destination
+Copy()
+{
+(cd $1
+ tar cvf - $2 ) | (cd $3
+ tar xvf - )
+}
+
+#
 # Allow to parameters to the build
 n=$#
 for ((i=0 ; i<$n ; i=`expr $i + 1`))
@@ -752,52 +764,52 @@
 # Copy the libraries to php/lib
 if ${BUILDKRB5}
 then
-  cp -p $TOOLS/KRB5/lib/lib*.so* $TOOLS/PHP/lib
+  Copy $TOOLS/KRB5/lib "lib*.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDGTTX}
 then
-  cp -p $TOOLS/GTTX/lib/lib*.so* $TOOLS/PHP/lib
+  Copy $TOOLS/GTTX/lib "lib*.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDXML2}
 then
-  cp -p $TOOLS/LIBXML2/lib/libxml2.so* $TOOLS/PHP/lib
+  Copy $TOOLS/LIBXML2/lib "libxml2.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDPSQL}
 then
-  cp -p $TOOLS/POSTGRESQL/lib/libpq.so* $TOOLS/PHP/lib
+  Copy $TOOLS/POSTGRESQL/lib "libpq.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDOSSL}
 then
-  cp -p $TOOLS/SSL/lib/libcrypto.so* $TOOLS/PHP/lib
-  cp -p $TOOLS/SSL/lib/libssl.so* $TOOLS/PHP/lib
+  Copy $TOOLS/SSL/lib "libcrypto.so*" $TOOLS/PHP/lib
+  Copy $TOOLS/SSL/lib "libssl.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDLPNG}
 then
-  cp -p $TOOLS/LPNG/lib/libpng12.so* $TOOLS/PHP/lib
+  Copy $TOOLS/LPNG/lib "libpng12.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDJPEG}
 then
-  cp -p $TOOLS/JPEG/lib/libjpeg.so* $TOOLS/PHP/lib
+  Copy $TOOLS/JPEG/lib "libjpeg.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDMSQL}
 then
-  cp -p $TOOLS/MSQL/lib/lib*.so* $TOOLS/PHP/lib
+  Copy $TOOLS/MSQL/lib "lib*.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDLDAP}
 then
-  cp -p $TOOLS/LDAP/lib/lib*.so* $TOOLS/PHP/lib
+  Copy $TOOLS/LDAP/lib "lib*.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDICNV}
 then
-  cp -p $TOOLS/ICNV/lib/lib*.so* $TOOLS/PHP/lib
+  Copy $TOOLS/ICNV/lib "lib*.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDFTT2}
 then
-  cp -p $TOOLS/FTT2/lib/lib*.so* $TOOLS/PHP/lib
+  Copy $TOOLS/FTT2/lib "lib*.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDLBGD}
 then
-  cp -p $TOOLS/LBGD/lib/lib*.so* $TOOLS/PHP/lib
+  Copy $TOOLS/LBGD/lib "lib*.so*" $TOOLS/PHP/lib
 fi
 
 #