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

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

Author: mla...@jb...
Date: 2006-04-19 06:28:11 -0400 (Wed, 19 Apr 2006)
New Revision: 3792

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildprep.sh
Log:
Add win zip target

Modified: labs/jbossweb/trunk/src/share/native/build/buildprep.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildprep.sh	2006-04-19 10:21:42 UTC (rev 3791)
+++ labs/jbossweb/trunk/src/share/native/build/buildprep.sh	2006-04-19 10:28:11 UTC (rev 3792)
@@ -5,6 +5,13 @@
 # Distributable under LGPL license.
 # See terms of license at gnu.org.
 #
+
+crlf=false;
+
+if test "$1" = "--crlf" ; then
+  crlf=true
+fi
+
 NATIVETAG=HEAD
 
 # Replace NATIVEEXT with tagged version number, like 1.1.0
@@ -17,7 +24,11 @@
 NATIVEDIST=tomcat-native-${NATIVEEXT}
 rm -rf ${NATIVEDIST}
 
-svn export -r $NATIVETAG ${NATIVESVN}/jni/native ${NATIVEDIST}
+if $crlf ; then
+  svn export -r $NATIVETAG --native-eol CRLF ${NATIVESVN}/jni/native ${NATIVEDIST}
+else
+  svn export -r $NATIVETAG ${NATIVESVN}/jni/native ${NATIVEDIST}
+fi
 
 APRVER="1.2.7"
 SSLVER="0.9.8a"
@@ -27,22 +38,40 @@
 mkdir srclib
 cd srclib
 
-wget http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-${APRVER}.tar.gz
-tar zxf apr-${APRVER}.tar.gz
+# Download APR
+if $crlf ; then
+  wget http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-${APRVER}-win32-src.zip
+  unzip -q -o apr-${APRVER}-win32-src.zip
+  rm -f apr-${APRVER}-win32-src.zip
+else
+  wget http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-${APRVER}.tar.gz
+  tar zxf apr-${APRVER}.tar.gz
+  rm -f apr-${APRVER}.tar.gz
+fi
 
+# Download OpenSSL
 wget http://www.openssl.org/source/openssl-${SSLVER}.tar.gz
 tar zxf openssl-${SSLVER}.tar.gz
-#Adjust the location of APR sources
+rm -f openssl-${SSLVER}.tar.gz
+
 cd ..
-./buildconf --with-apr=./srclib/apr-${APRVER}
+if test "$crlf" = "false" ; then
+  # Create Configure
+  ./buildconf --with-apr=./srclib/apr-${APRVER}
+fi
+
 cd ..
 cp ./buildworld.sh ${NATIVEDIST}/
+cp ./NMAKEcommon.inc ${NATIVEDIST}/build/
+cp ../NMAKEmakefile ${NATIVEDIST}/
+cp ../srclib/apr/NMAKEmakefile ${NATIVEDIST}/srclib/apr-${APRVER}/
+cp ../srclib/openssl/*.bat ${NATIVEDIST}/srclib/openssl-${SSLVER}/
 
 # Create distribution
-tar cfz ${NATIVEDIST}.tar.gz ${NATIVEDIST}
+if $crlf ; then
+  zip -9 -r -q -o  ${NATIVEDIST}.zip ${NATIVEDIST}
+else
+  tar cfz ${NATIVEDIST}.tar.gz ${NATIVEDIST}
+fi
 
-# Convert lineends to DOS
-# perl apr/build/lineends.pl --cr ${NATIVEDIST}
-# zip -9 -r  ${NATIVEDIST}.zip ${NATIVEDIST}
-
 rm -rf ${NATIVEDIST}