gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1734146 - in /gump/metadata/project: tomcat-native-trunk.xml tomcat-native.xml tomcat-tc7.xml tomcat-tc8.xml
Date Tue, 08 Mar 2016 20:37:24 GMT
Author: rjung
Date: Tue Mar  8 20:37:24 2016
New Revision: 1734146

URL: http://svn.apache.org/viewvc?rev=1734146&view=rev
Log:
Build tcnative-trunk against OpenSSL master and
tcnative 1.1.x against OpenSSL 1.0.2 not the
other way round.

Make TC 7 and TC 8 using tcnative trunk, because
current stable tcnative releases 1.2.x are cut
from trunk.

Modified:
    gump/metadata/project/tomcat-native-trunk.xml
    gump/metadata/project/tomcat-native.xml
    gump/metadata/project/tomcat-tc7.xml
    gump/metadata/project/tomcat-tc8.xml

Modified: gump/metadata/project/tomcat-native-trunk.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-native-trunk.xml?rev=1734146&r1=1734145&r2=1734146&view=diff
==============================================================================
--- gump/metadata/project/tomcat-native-trunk.xml (original)
+++ gump/metadata/project/tomcat-native-trunk.xml Tue Mar  8 20:37:24 2016
@@ -38,11 +38,11 @@
     <configure basedir="native">
       <arg name="--prefix" path="dest-@@DATE@@"/>
       <arg name="--with-apr" project="apr-1-configure" reference="home"/>
-      <arg name="--with-ssl" project="openssl-1.0.2-configure" reference="home"/>
+      <arg name="--with-ssl" project="openssl-configure" reference="home"/>
     </configure>
     <depend project="tomcat-native-trunk-buildconf"/>
     <depend project="apr-1-make-install"/>
-    <depend project="openssl-1.0.2-make-install"/>
+    <depend project="openssl-make-install"/>
     <home nested="dest-@@DATE@@"/>
     <nag to="dev@tomcat.apache.org"
          from="Bill Barker &lt;billbarker@apache.org&gt;" />

Modified: gump/metadata/project/tomcat-native.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-native.xml?rev=1734146&r1=1734145&r2=1734146&view=diff
==============================================================================
--- gump/metadata/project/tomcat-native.xml (original)
+++ gump/metadata/project/tomcat-native.xml Tue Mar  8 20:37:24 2016
@@ -38,11 +38,11 @@
     <configure basedir="native">
       <arg name="--prefix" path="dest-@@DATE@@"/>
       <arg name="--with-apr" project="apr-1-configure" reference="home"/>
-      <arg name="--with-ssl" project="openssl-configure" reference="home"/>
+      <arg name="--with-ssl" project="openssl-1.0.2-configure" reference="home"/>
     </configure>
     <depend project="tomcat-native-buildconf"/>
     <depend project="apr-1-make-install"/>
-    <depend project="openssl-make-install"/>
+    <depend project="openssl-1.0.2-make-install"/>
     <home nested="dest-@@DATE@@"/>
     <nag to="dev@tomcat.apache.org"
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
@@ -63,4 +63,3 @@
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
   </project>
 </module>
-

Modified: gump/metadata/project/tomcat-tc7.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-tc7.xml?rev=1734146&r1=1734145&r2=1734146&view=diff
==============================================================================
--- gump/metadata/project/tomcat-tc7.xml (original)
+++ gump/metadata/project/tomcat-tc7.xml Tue Mar  8 20:37:24 2016
@@ -238,7 +238,7 @@
       <property name="execute.test.apr" value="true"/>
       <property name="execute.test.bio" value="false"/>
       <property name="execute.test.nio" value="false"/>
-      <property name="test.apr.loc" project="tomcat-native-make-install"
+      <property name="test.apr.loc" project="tomcat-native-trunk-make-install"
                 reference="home"/>
       <property name="base.path" path="tomcat-build-libs"/>
     </ant>

Modified: gump/metadata/project/tomcat-tc8.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-tc8.xml?rev=1734146&r1=1734145&r2=1734146&view=diff
==============================================================================
--- gump/metadata/project/tomcat-tc8.xml (original)
+++ gump/metadata/project/tomcat-tc8.xml Tue Mar  8 20:37:24 2016
@@ -235,7 +235,7 @@
       <property name="execute.test.nio2" value="false"/>
       <property name="test.openssl.path" project="openssl-1.0.2-make-install" 
                 id="openssl-1.0.2" reference="outputpath"/>
-      <property name="test.apr.loc" project="tomcat-native-make-install"
+      <property name="test.apr.loc" project="tomcat-native-trunk-make-install"
                 reference="home"/>
       <property name="base.path" path="tomcat-build-libs"/>
     </ant>



Mime
View raw message