ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r425605 - in /ant/antlibs/common/trunk: NOTICE NOTICE.template build.xml
Date Wed, 26 Jul 2006 04:21:40 GMT
Author: bodewig
Date: Tue Jul 25 21:21:39 2006
New Revision: 425605

URL: http://svn.apache.org/viewvc?rev=425605&view=rev
Log:
apply new NOTICE file policy

Added:
    ant/antlibs/common/trunk/NOTICE.template
      - copied, changed from r425602, ant/antlibs/common/trunk/NOTICE
Removed:
    ant/antlibs/common/trunk/NOTICE
Modified:
    ant/antlibs/common/trunk/build.xml

Copied: ant/antlibs/common/trunk/NOTICE.template (from r425602, ant/antlibs/common/trunk/NOTICE)
URL: http://svn.apache.org/viewvc/ant/antlibs/common/trunk/NOTICE.template?p2=ant/antlibs/common/trunk/NOTICE.template&p1=ant/antlibs/common/trunk/NOTICE&r1=425602&r2=425605&rev=425605&view=diff
==============================================================================
--- ant/antlibs/common/trunk/NOTICE (original)
+++ ant/antlibs/common/trunk/NOTICE.template Tue Jul 25 21:21:39 2006
@@ -3,8 +3,9 @@
    ==  the Apache License, Version 2.0                                    ==
    =========================================================================
 
+   Apache [PRODUCT_NAME]
+   Copyright [yyyy] The Apache Software Foundation
+
    This product includes software developed by
    The Apache Software Foundation (http://www.apache.org/).
 
-   Please read the different LICENSE files present in the root directory of
-   this distribution.

Modified: ant/antlibs/common/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/common/trunk/build.xml?rev=425605&r1=425604&r2=425605&view=diff
==============================================================================
--- ant/antlibs/common/trunk/build.xml (original)
+++ ant/antlibs/common/trunk/build.xml Tue Jul 25 21:21:39 2006
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <!--
- Copyright 2005-2006 The Apache Software Foundation
+  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
  
-  Licensed 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.
+  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.
 -->
 <project name="common">
 
@@ -39,14 +42,23 @@
       />
   </target>
 
-  <target name="antlib" depends="compile">
+  <target name="check-for-NOTICE">
+    <available file="NOTICE" property="notice-present?"/>
+
+    <fail unless="notice-present?">You must create a product specific
+    NOTICE file based on common/NOTICE.template in the top level
+    directory</fail>
+  </target>
+
+  <target name="antlib" depends="compile, check-for-NOTICE">
     <copy todir="${build.classes}">
       <fileset dir="src/main" includes="**/antlib.xml"/>
     </copy>
-    <jar 
-      destfile="${jarname}"
-      basedir="${build.classes}"
-      />
+    <jar destfile="${jarname}">
+      <fileset dir="${build.classes}"/>
+      <metainf file="NOTICE"/>
+      <metainf file="common/LICENSE"/>
+    </jar>
   </target>
 
   <target name="setup-for-tests" depends="setup">



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


Mime
View raw message