gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject svn commit: r1617865 - in /gump/metadata: profile/gump.xml project/apr-1.xml project/tomcat-native.xml
Date Thu, 14 Aug 2014 02:39:01 GMT
Author: billbarker
Date: Thu Aug 14 02:39:01 2014
New Revision: 1617865

URL: http://svn.apache.org/r1617865
Log:
Tomcat Native requires apr-1. The apr project doesn't seem interested in releasing trunk anytime
soon so use latest apr-1 branch even if this will be hard to maintain in Gump

Added:
    gump/metadata/project/apr-1.xml   (with props)
Modified:
    gump/metadata/profile/gump.xml
    gump/metadata/project/tomcat-native.xml

Modified: gump/metadata/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?rev=1617865&r1=1617864&r2=1617865&view=diff
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Thu Aug 14 02:39:01 2014
@@ -67,6 +67,7 @@
 
 <!-- Apache Portable Runtime -->
   <module href="project/apr.xml"/>
+  <module href="project/apr-1.xml"/>
 
 <!-- Apache Tika -->
   <module href="project/tika.xml"/>

Added: gump/metadata/project/apr-1.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/apr-1.xml?rev=1617865&view=auto
==============================================================================
--- gump/metadata/project/apr-1.xml (added)
+++ gump/metadata/project/apr-1.xml Thu Aug 14 02:39:01 2014
@@ -0,0 +1,49 @@
+<?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="apr-1">
+
+  <url href="http://apr.apache.org/"/>
+  <description>
+    Apache Portable Runtime
+  </description>
+
+  <svn repository="asf" dir="apr/apr/branches/1.6.x"/>
+
+  <project name="apr-1-buildconf">
+    <script name="buildconf"/>
+  </project>
+
+  <project name="apr-1-configure">
+    <configure>
+      <arg name="--prefix" path="dest-@@DATE@@"/>
+    </configure>
+    <depend project="apr-1-buildconf"/>
+    <home nested="dest-@@DATE@@"/>
+  </project>
+
+  <project name="apr-1-make">
+    <make/>
+    <depend project="apr-1-configure"/>
+  </project>
+
+  <project name="apr-1-make-install">
+    <make target="install"/>
+    <depend project="apr-1-make"/>
+    <output name="dest-@@DATE@@/bin/apr-2-config" id="apr-config" type="script"/>
+  </project>
+</module>

Propchange: gump/metadata/project/apr-1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: gump/metadata/project/tomcat-native.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-native.xml?rev=1617865&r1=1617864&r2=1617865&view=diff
==============================================================================
--- gump/metadata/project/tomcat-native.xml (original)
+++ gump/metadata/project/tomcat-native.xml Thu Aug 14 02:39:01 2014
@@ -26,18 +26,19 @@
 
   <project name="tomcat-native-buildconf">
     <script name="buildconf" basedir="native">
-     <arg name="--with-apr" project="apr-configure" reference="srcdir"/>
+     <arg name="--with-apr" project="apr-1-configure" reference="srcdir"/>
     </script>
   </project>
 
   <project name="tomcat-native-configure">
+    <mkdir path="dest-@@DATE@@"/>
     <configure basedir="native">
       <arg name="--prefix" path="dest-@@DATE@@"/>
-      <arg name="--with-apr" project="apr-configure" reference="home"/>
+      <arg name="--with-apr" project="apr-1-configure" reference="home"/>
       <arg name="--with-ssl" project="openssl-configure" reference="home"/>
     </configure>
     <depend project="tomcat-native-buildconf"/>
-    <depend project="apr-make-install"/>
+    <depend project="apr-1-make-install"/>
     <depend project="openssl-make-install"/>
     <home nested="dest-@@DATE@@"/>
   </project>



Mime
View raw message