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 2015/04/16 05:17:20 UTC
svn commit: r1673995 - in /gump/metadata: profile/gump.xml
project/tomcat-native-trunk.xml project/tomcat-trunk.xml
Author: billbarker
Date: Thu Apr 16 03:17:20 2015
New Revision: 1673995
URL: http://svn.apache.org/r1673995
Log:
As I understand it, tomcat-trunk should work against the tomcat-native-trunk which should work against openssl 1.0.2.x. Easy enough to change back if I've misunderstood what the tomcat project wants
Added:
gump/metadata/project/tomcat-native-trunk.xml (with props)
Modified:
gump/metadata/profile/gump.xml
gump/metadata/project/tomcat-trunk.xml
Modified: gump/metadata/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?rev=1673995&r1=1673994&r2=1673995&view=diff
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Thu Apr 16 03:17:20 2015
@@ -81,6 +81,7 @@
<module href="project/tomcat-tc8.xml" />
<module href="project/tomcat-trunk.xml" />
<module href="project/tomcat-native.xml"/>
+ <module href="project/tomcat-native-trunk.xml"/>
<!-- Apache.XML -->
Added: gump/metadata/project/tomcat-native-trunk.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-native-trunk.xml?rev=1673995&view=auto
==============================================================================
--- gump/metadata/project/tomcat-native-trunk.xml (added)
+++ gump/metadata/project/tomcat-native-trunk.xml Thu Apr 16 03:17:20 2015
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<module name="tomcat-native-trunk">
+
+ <url href="http://tomcat.apache.org/"/>
+ <description>
+ Tomcat native library using Apache Portable Runtime
+ </description>
+
+ <svn repository="asf" dir="tomcat/native/trunk"/>
+
+ <project name="tomcat-native-trunk-buildconf">
+ <script name="buildconf" basedir="native">
+ <arg name="--with-apr" project="apr-1-configure" reference="srcdir"/>
+ </script>
+ <depend project="apr-1-configure"/>
+ <nag to="dev@tomcat.apache.org"
+ from="Bill Barker <billbarker@apache.org>" />
+ </project>
+
+ <project name="tomcat-native-trunk-configure">
+ <mkdir dir="dest-@@DATE@@"/>
+ <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"/>
+ </configure>
+ <depend project="tomcat-native-trunk-buildconf"/>
+ <depend project="apr-1-make-install"/>
+ <depend project="openssl-1.0.2-make-install"/>
+ <home nested="dest-@@DATE@@"/>
+ <nag to="dev@tomcat.apache.org"
+ from="Bill Barker <billbarker@apache.org>" />
+ </project>
+
+ <project name="tomcat-native-trunk-make">
+ <make basedir="native"/>
+ <depend project="tomcat-native-trunk-configure"/>
+ <nag to="dev@tomcat.apache.org"
+ from="Bill Barker <billbarker@apache.org>" />
+ </project>
+
+ <project name="tomcat-native-trunk-make-install">
+ <make target="install" basedir="native"/>
+ <depend project="tomcat-native-trunk-make"/>
+ <home nested="dest-@@DATE@@/lib"/>
+ <nag to="dev@tomcat.apache.org"
+ from="Bill Barker <billbarker@apache.org>" />
+ </project>
+</module>
+
Propchange: gump/metadata/project/tomcat-native-trunk.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: gump/metadata/project/tomcat-trunk.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-trunk.xml?rev=1673995&r1=1673994&r2=1673995&view=diff
==============================================================================
--- gump/metadata/project/tomcat-trunk.xml (original)
+++ gump/metadata/project/tomcat-trunk.xml Thu Apr 16 03:17:20 2015
@@ -185,9 +185,9 @@
<property name="execute.test.apr" 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"/>
- <property name="test.apr.loc" project="tomcat-native-make-install"
+ <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-trunk-make-install"
reference="home"/>
</ant>