tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r676510 - in /tomcat/trunk: build.properties.default build.xml dist.xml res/tomcat.nsi
Date Mon, 14 Jul 2008 08:36:42 GMT
Author: mturk
Date: Mon Jul 14 01:36:41 2008
New Revision: 676510

URL: http://svn.apache.org/viewvc?rev=676510&view=rev
Log:
Use tomcat native from ASF repository instead downloading at install time from tomcat.heanet.ie

Modified:
    tomcat/trunk/build.properties.default
    tomcat/trunk/build.xml
    tomcat/trunk/dist.xml
    tomcat/trunk/res/tomcat.nsi

Modified: tomcat/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=676510&r1=676509&r2=676510&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Jul 14 01:36:41 2008
@@ -62,9 +62,11 @@
 jdt.loc=http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
 
 # ----- Tomcat native library -----
-tomcat-native.home=${base.path}/tomcat-native-1.1.12
+tomcat-native.version=1.1.14
+tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
-tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.12-src.tar.gz
+tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-${tomcat-native.version}-src.tar.gz
+tomcat-native.dll=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/binaries
 
 # ----- Commons DBCP, version 1.1 or later -----
 commons-dbcp.version=1.2.2

Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=676510&r1=676509&r2=676510&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Jul 14 01:36:41 2008
@@ -610,6 +610,18 @@
       <param name="destdir" value="${tomcat-native.home}"/>
     </antcall>
 
+    <antcall target="downloadfile">
+      <param name="sourcefile" value="${tomcat-native.dll}/win32/tcnative-1.dll"/>
+      <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x86"/>
+      <param name="destdir" value="${tomcat-native.home}"/>
+    </antcall>
+
+    <antcall target="downloadfile">
+      <param name="sourcefile" value="${tomcat-native.dll}/win64/x64/tcnative-1.dll"/>
+      <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x64"/>
+      <param name="destdir" value="${tomcat-native.home}"/>
+    </antcall>
+
     <antcall target="downloadgz">
       <param name="sourcefile" value="${commons-daemon.loc}"/>
       <param name="destfile" value="${commons-daemon.jar}"/>

Modified: tomcat/trunk/dist.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=676510&r1=676509&r2=676510&view=diff
==============================================================================
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Mon Jul 14 01:36:41 2008
@@ -449,6 +449,8 @@
         tofile="${tomcat.dist}/bin/tomcat6.exe" />
     <copy file="res/procrun/tomcat6w.exe"
         tofile="${tomcat.dist}/bin/tomcat6w.exe" />
+    <copy file="${tomcat-native.home}/tcnative-1.dll.x86"
+        tofile="${tomcat.dist}/bin/tcnative-1.dll" />
 
     <filter token="VERSION" value="${version}"/>
     <filter token="VERSION_NUMBER" value="${version.number}"/>
@@ -470,6 +472,7 @@
               forceOverwrite="yes" fileext=".md5" />
     <echo     file="${tomcat.release}/v${version}/bin/${final.name}.exe.md5" 
                       message="${md5sum.binary-prefix}${final.name}.exe${line.separator}"
append="true" />
+    <delete file="${tomcat.dist}/bin/tcnative-1.dll"/>
   </target>
 
 

Modified: tomcat/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=676510&r1=676509&r2=676510&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Mon Jul 14 01:36:41 2008
@@ -95,7 +95,7 @@
     LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet container."
     LangString DESC_SecTomcatCore ${LANG_ENGLISH} "Install the Tomcat Servlet container core."
     LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start Tomcat when the
computer is started. This requires Windows NT 4.0, Windows 2000 or Windows XP."
-    LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Downloads and installs APR based Tomcat
native .dll for better performance and scalability in production environments."
+    LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Install APR based Tomcat native .dll
for better performance and scalability in production environments."
     LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program group for Tomcat."
     LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat documentation bundle. This
include documentation on the servlet container and its configuration options, on the Jasper
JSP page compiler, as well as on the native webserver connectors."
     LangString DESC_SecExamples ${LANG_ENGLISH} "Installs some examples web applications."
@@ -209,16 +209,8 @@
 
   SectionIn 3
 
-  ; tcnative-1.dll is a symlink to the tcnative-1-ipv4.dll
-  ; If IPV6 support is required, download the tcnative-1-ipv6.dll insted
-  ; The tcnative-1.dll from heanet.ie comes with APR 1.2.8 and OpenSSL 0.9.8e compiled in.
-  ; TODO: Depending on the JVM download the 32 or 64 bit version.
-  NSISdl::download /TIMEOUT=30000 http://tomcat.heanet.ie/native/1.1.10/binaries/win32/tcnative-1.dll
$INSTDIR\bin\tcnative-1.dll
-  Pop $0
-  StrCmp $0 success success
-    SetDetailsView show
-    DetailPrint "download failed from http://tomcat.heanet.ie/native/1.1.10/binaries/win32/tcnative-1.dll:
$0"
-  success:
+  SetOutPath $INSTDIR\bin
+  File bin\tcnative-1.dll
 
   ClearErrors
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message