You are viewing a plain text version of this content. The canonical link for it is here.
Posted to olio-commits@incubator.apache.org by sh...@apache.org on 2009/04/10 20:16:02 UTC

svn commit: r764032 - in /incubator/olio/dist: build.xml releasenotes/RELEASE-NOTES-php-0.1.txt releasenotes/RELEASE-NOTES-rails-0.1.txt

Author: shanti
Date: Fri Apr 10 20:16:02 2009
New Revision: 764032

URL: http://svn.apache.org/viewvc?rev=764032&view=rev
Log:
Fixed build script for rat reports, LICENSE for src pkgs.

Modified:
    incubator/olio/dist/build.xml
    incubator/olio/dist/releasenotes/RELEASE-NOTES-php-0.1.txt
    incubator/olio/dist/releasenotes/RELEASE-NOTES-rails-0.1.txt

Modified: incubator/olio/dist/build.xml
URL: http://svn.apache.org/viewvc/incubator/olio/dist/build.xml?rev=764032&r1=764031&r2=764032&view=diff
==============================================================================
--- incubator/olio/dist/build.xml (original)
+++ incubator/olio/dist/build.xml Fri Apr 10 20:16:02 2009
@@ -149,14 +149,13 @@
 			  tofile="stage/NOTICE" overwrite="true" verbose="true"/>
         <tar destfile="${kit.dir}/${php.src.name}.tar.gz"
             longfile="gnu" compression="gzip">
+            <tarfileset dir="stage" prefix="${php.src.name}" includes="release,LICENSE,NOTICE"/>
             <tarfileset dir="${base.dir}" prefix="${php.src.name}">
                 <include name="dist/*"/>
                 <include name="dist/*"/>
 				<include name="dist/releasenotes/${php.relnotes}"/>
                 <include name="docs/**"/>
                 <include name="geocoder/**"/>
-                <include name="stage/LICENSE"/>
-                <include name="stage/NOTICE"/>
                 <include name="webapp/php/trunk/**"/>
                 <include name="workload/php/trunk/**"/>
                 <exclude name="dist/nightly/**"/>
@@ -168,14 +167,13 @@
             </tarfileset>
         </tar>
         <zip destfile="${kit.dir}/${php.src.name}.zip">
+            <zipfileset dir="stage" prefix="${php.src.name}" includes="release,LICENSE,NOTICE"/>
             <zipfileset dir="${base.dir}" prefix="${php.src.name}">
                 <include name="dist/*"/>
                 <include name="dist/*"/>
 				<include name="dist/releasenotes/${php.relnotes}"/>
                 <include name="docs/**"/>
                 <include name="geocoder/**"/>
-                <include name="stage/LICENSE"/>
-                <include name="stage/NOTICE"/>
                 <include name="webapp/php/trunk/**"/>
                 <include name="workload/php/trunk/**"/>
                 <exclude name="dist/nightly/**"/>
@@ -195,13 +193,12 @@
 			  tofile="stage/NOTICE" overwrite="true" verbose="true"/>
         <tar destfile="${kit.dir}/${rails.src.name}.tar.gz"
             longfile="gnu" compression="gzip">
+            <tarfileset dir="stage" prefix="${rails.src.name}" includes="release,LICENSE,NOTICE"/>
             <tarfileset dir="${base.dir}" prefix="${rails.src.name}">
                 <include name="dist/*"/>
 				<include name="dist/releasenotes/${rails.relnotes}"/>
                 <include name="docs/**"/>
                 <include name="geocoder/**"/>
-                <include name="stage/LICENSE"/>
-                <include name="stage/NOTICE"/>
                 <include name="webapp/rails/trunk/**"/>
                 <include name="workload/rails/trunk/**"/>
                 <exclude name="dist/nightly/**"/>
@@ -213,13 +210,12 @@
             </tarfileset>
         </tar>
         <zip destfile="${kit.dir}/${rails.src.name}.zip">
+            <zipfileset dir="stage" prefix="${rails.src.name}" includes="release,LICENSE,NOTICE"/>
             <zipfileset dir="${base.dir}" prefix="${rails.src.name}">
                 <include name="dist/*"/>
 				<include name="dist/releasenotes/${rails.relnotes}"/>
                 <include name="docs/**"/>
                 <include name="geocoder/**"/>
-                <include name="stage/LICENSE"/>
-                <include name="stage/NOTICE"/>
                 <include name="webapp/rails/trunk/**"/>
                 <include name="workload/rails/trunk/**"/>
                 <exclude name="dist/nightly/**"/>
@@ -248,6 +244,16 @@
      </target>
 
     <target name="php-rat" depends="-taskdef"
+       description="runs the rat task over the php binary tarball">
+       <rat:report xmlns:rat="antlib:rat.anttasks">
+         <tarfileset>
+           <gzipresource>
+             <file file="${kit.dir}/${php.pkg.name}.tar.gz"/>
+           </gzipresource>
+         </tarfileset>
+       </rat:report>
+     </target>
+    <target name="php-rat-src" depends="-taskdef"
        description="runs the rat task over the php src tarball">
        <rat:report xmlns:rat="antlib:rat.anttasks">
          <tarfileset>
@@ -259,6 +265,16 @@
      </target>
 
     <target name="rails-rat" depends="-taskdef"
+       description="runs the rat task over the rails binary tarball">
+       <rat:report xmlns:rat="antlib:rat.anttasks">
+         <tarfileset>
+           <gzipresource>
+             <file file="${kit.dir}/${rails.pkg.name}.tar.gz"/>
+           </gzipresource>
+         </tarfileset>
+       </rat:report>
+     </target>
+    <target name="rails-rat-src" depends="-taskdef"
        description="runs the rat task over the rails src tarball">
        <rat:report xmlns:rat="antlib:rat.anttasks">
          <tarfileset>

Modified: incubator/olio/dist/releasenotes/RELEASE-NOTES-php-0.1.txt
URL: http://svn.apache.org/viewvc/incubator/olio/dist/releasenotes/RELEASE-NOTES-php-0.1.txt?rev=764032&r1=764031&r2=764032&view=diff
==============================================================================
--- incubator/olio/dist/releasenotes/RELEASE-NOTES-php-0.1.txt (original)
+++ incubator/olio/dist/releasenotes/RELEASE-NOTES-php-0.1.txt Fri Apr 10 20:16:02 2009
@@ -1,3 +1,21 @@
+<!--
+ * 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.
+ * 
+-->
 This is the first release of the PHP implementation of Olio.
 There are two tarballs for this release: 
 apache-olio-php-0.1.tar.gz is the binary kit.

Modified: incubator/olio/dist/releasenotes/RELEASE-NOTES-rails-0.1.txt
URL: http://svn.apache.org/viewvc/incubator/olio/dist/releasenotes/RELEASE-NOTES-rails-0.1.txt?rev=764032&r1=764031&r2=764032&view=diff
==============================================================================
--- incubator/olio/dist/releasenotes/RELEASE-NOTES-rails-0.1.txt (original)
+++ incubator/olio/dist/releasenotes/RELEASE-NOTES-rails-0.1.txt Fri Apr 10 20:16:02 2009
@@ -1,3 +1,21 @@
+<!--
+ * 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.
+ * 
+-->
 This is the first release of the rails implementation of Olio.
 There are two tarballs for this release: 
 apache-olio-rails-0.1.tar.gz is the binary kit.