You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bi...@apache.org on 2014/08/09 04:09:29 UTC

svn commit: r1616914 - in /gump/metadata/project: openssl.xml tomcat-trunk.xml

Author: billbarker
Date: Sat Aug  9 02:09:29 2014
New Revision: 1616914

URL: http://svn.apache.org/r1616914
Log:
Allow Tomcat to use built openssl

Modified:
    gump/metadata/project/openssl.xml
    gump/metadata/project/tomcat-trunk.xml

Modified: gump/metadata/project/openssl.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/openssl.xml?rev=1616914&r1=1616913&r2=1616914&view=diff
==============================================================================
--- gump/metadata/project/openssl.xml (original)
+++ gump/metadata/project/openssl.xml Sat Aug  9 02:09:29 2014
@@ -41,5 +41,6 @@
   <project name="openssl-make-install">
     <make target="install"/>
     <depend project="openssl-make"/>
+    <output name="dest-@@DATE@@/bin/openssl" id="openssl" type="script"/>
   </project>
 </module>

Modified: gump/metadata/project/tomcat-trunk.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-trunk.xml?rev=1616914&r1=1616913&r2=1616914&view=diff
==============================================================================
--- gump/metadata/project/tomcat-trunk.xml (original)
+++ gump/metadata/project/tomcat-trunk.xml Sat Aug  9 02:09:29 2014
@@ -103,6 +103,8 @@
       <property name="execute.test.bio" value="true"/>
       <property name="execute.test.nio" value="false"/>
       <property name="execute.test.nio2" value="false"/>
+      <property name="test.openssl.path" project="openssl-make-install" 
+                id="openssl" reference="outputpath"/>
     </ant>
 
    <depend project="ant" inherit="runtime" />
@@ -142,6 +144,8 @@
       <property name="execute.test.bio" value="false"/>
       <property name="execute.test.nio" value="true"/>
       <property name="execute.test.nio2" value="false"/>
+      <property name="test.openssl.path" project="openssl-make-install" 
+                id="openssl" reference="outputpath"/>
     </ant>
 
    <depend project="ant" inherit="runtime" />
@@ -181,6 +185,8 @@
       <property name="execute.test.bio" value="false"/>
       <property name="execute.test.nio" value="false"/>
       <property name="execute.test.nio2" value="true"/>
+      <property name="test.openssl.path" project="openssl-make-install" 
+                id="openssl" reference="outputpath"/>
     </ant>
 
    <depend project="ant" inherit="runtime" />