Thread: [Archive-access-cvs] SF.net SVN: archive-access:[2604] trunk/archive-access/projects/nutchwax/ arch

Brought to you by: binzino, bradtofel, gojomo, ia_igor, and 5 others

archive-access-cvs

[Archive-access-cvs] SF.net SVN: archive-access:[2604] trunk/archive-access/projects/nutchwax/ archive/build.xml

From: <bi...@us...> - 2008-10-11 01:46:06

Revision: 2604
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2604&view=rev
Author:   binzino
Date:     2008-10-11 01:45:56 +0000 (Sat, 11 Oct 2008)

Log Message:
-----------
Moved NutchWAX-specific part of "package" rule to "onlypack" so it can
be run w/o triggering all the dependencies.

Modified Paths:
--------------
    trunk/archive-access/projects/nutchwax/archive/build.xml

Modified: trunk/archive-access/projects/nutchwax/archive/build.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/archive/build.xml	2008-10-11 01:45:00 UTC (rev 2603)
+++ trunk/archive-access/projects/nutchwax/archive/build.xml	2008-10-11 01:45:56 UTC (rev 2604)
@@ -107,9 +107,12 @@
        and let the individual user decide whether or not to
        incorporate our modifications.
     -->
-  <target name="package" depends="jar, job, war, javadoc">
+  <target name="package" depends="jar, job, war, javadoc" >
     <ant dir="${nutch.dir}" target="package" inheritAll="false" />
+    <ant target="onlypack" />
+  </target>
 
+  <target name="onlypack">
     <copy todir="${dist.dir}/lib" includeEmptyDirs="false">
       <fileset dir="lib"/>
     </copy>
@@ -133,6 +136,11 @@
       </fileset>
     </copy>
 
+    <mkdir dir="${dist.dir}/contrib/archive/web"/>
+    <copy todir="${dist.dir}/contrib/archive/web">
+      <fileset dir="src/web" />
+    </copy>
+
   </target>
 
 </project>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Archive-access-cvs] SF.net SVN: archive-access:[2661] trunk/archive-access/projects/nutchwax/ archive/build.xml

From: <bi...@us...> - 2008-12-11 22:59:31

Revision: 2661
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2661&view=rev
Author:   binzino
Date:     2008-12-11 22:59:27 +0000 (Thu, 11 Dec 2008)

Log Message:
-----------
Add use of 'rsync' to copy Nutch source over-rides into Nutch main
source dir before compilation.

Modified Paths:
--------------
    trunk/archive-access/projects/nutchwax/archive/build.xml

Modified: trunk/archive-access/projects/nutchwax/archive/build.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/archive/build.xml	2008-12-11 22:58:28 UTC (rev 2660)
+++ trunk/archive-access/projects/nutchwax/archive/build.xml	2008-12-11 22:59:27 UTC (rev 2661)
@@ -26,6 +26,14 @@
   <property name="dist.dir"  value="${build.dir}/nutch-1.0-dev" />
 
   <target name="nutch-compile-core">
+    <!-- First, copy over Nutch source overlays -->
+    <exec executable="rsync">
+      <arg value="-vac"/>
+      <arg value="--exclude"/>
+      <arg value="*~"/>
+      <arg value="src/nutch/"/>
+      <arg value="../../"/>
+    </exec>
     <ant dir="${nutch.dir}" target="compile-core" inheritAll="false" />
   </target>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Archive-access-cvs] SF.net SVN: archive-access:[2662] trunk/archive-access/projects/nutchwax/ archive/build.xml

From: <bi...@us...> - 2008-12-12 05:12:41

Revision: 2662
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2662&view=rev
Author:   binzino
Date:     2008-12-12 05:12:36 +0000 (Fri, 12 Dec 2008)

Log Message:
-----------
Fixed rsync args to exclude .svn subdirs and other stuff we don't want
to copy over into the Nutch source tree.

Modified Paths:
--------------
    trunk/archive-access/projects/nutchwax/archive/build.xml

Modified: trunk/archive-access/projects/nutchwax/archive/build.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/archive/build.xml	2008-12-11 22:59:27 UTC (rev 2661)
+++ trunk/archive-access/projects/nutchwax/archive/build.xml	2008-12-12 05:12:36 UTC (rev 2662)
@@ -28,9 +28,7 @@
   <target name="nutch-compile-core">
     <!-- First, copy over Nutch source overlays -->
     <exec executable="rsync">
-      <arg value="-vac"/>
-      <arg value="--exclude"/>
-      <arg value="*~"/>
+      <arg value="-vacC"/>
       <arg value="src/nutch/"/>
       <arg value="../../"/>
     </exec>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Archive-access-cvs] SF.net SVN: archive-access:[2667] trunk/archive-access/projects/nutchwax/ archive/build.xml

From: <bi...@us...> - 2008-12-15 22:55:54

Revision: 2667
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2667&view=rev
Author:   binzino
Date:     2008-12-15 21:39:28 +0000 (Mon, 15 Dec 2008)

Log Message:
-----------
Copy the src/etc directory to the build/package directory, just like
we do with conf and web.

Modified Paths:
--------------
    trunk/archive-access/projects/nutchwax/archive/build.xml

Modified: trunk/archive-access/projects/nutchwax/archive/build.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/archive/build.xml	2008-12-15 17:47:01 UTC (rev 2666)
+++ trunk/archive-access/projects/nutchwax/archive/build.xml	2008-12-15 21:39:28 UTC (rev 2667)
@@ -147,6 +147,11 @@
       <fileset dir="src/web" />
     </copy>
 
+    <mkdir dir="${dist.dir}/contrib/archive/etc"/>
+    <copy todir="${dist.dir}/contrib/archive/etc">
+      <fileset dir="src/etc" />
+    </copy>
+
   </target>
 
 </project>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Archive-access-cvs] SF.net SVN: archive-access:[2676] trunk/archive-access/projects/nutchwax/ archive/build.xml

From: <bi...@us...> - 2008-12-16 19:52:45

Revision: 2676
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2676&view=rev
Author:   binzino
Date:     2008-12-16 19:52:42 +0000 (Tue, 16 Dec 2008)

Log Message:
-----------
Removed references to web and conf sub-dirs in "onlypack" target since
they are now rolled into set of files copied into Nutch.

Modified Paths:
--------------
    trunk/archive-access/projects/nutchwax/archive/build.xml

Modified: trunk/archive-access/projects/nutchwax/archive/build.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/archive/build.xml	2008-12-16 07:38:28 UTC (rev 2675)
+++ trunk/archive-access/projects/nutchwax/archive/build.xml	2008-12-16 19:52:42 UTC (rev 2676)
@@ -104,14 +104,6 @@
   <!-- This one does a little more after calling down to the relevant
        Nutch target.  After Nutch has copied everything into the
        distribution directory, we add our script, libraries, etc.
-       
-       Rather than over-write the standard Nutch configuration files,
-       we place ours in a newly created directory
-       
-         contrib/archive/conf
-
-       and let the individual user decide whether or not to
-       incorporate our modifications.
     -->
   <target name="package" depends="jar, job, war, javadoc" >
     <ant dir="${nutch.dir}" target="package" inheritAll="false" />
@@ -131,22 +123,12 @@
         <fileset dir="${dist.dir}/bin"/>
     </chmod>
 
-    <mkdir dir="${dist.dir}/contrib/archive/conf"/>
-    <copy todir="${dist.dir}/contrib/archive/conf">
-      <fileset dir="conf" />
-    </copy>
-
     <copy todir="${dist.dir}/contrib/archive">
       <fileset dir=".">
         <include name="*.txt" />
       </fileset>
     </copy>
 
-    <mkdir dir="${dist.dir}/contrib/archive/web"/>
-    <copy todir="${dist.dir}/contrib/archive/web">
-      <fileset dir="src/web" />
-    </copy>
-
     <mkdir dir="${dist.dir}/contrib/archive/etc"/>
     <copy todir="${dist.dir}/contrib/archive/etc">
       <fileset dir="src/etc" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Archive-access-cvs] SF.net SVN: archive-access:[2690] trunk/archive-access/projects/nutchwax/ archive/build.xml

From: <bi...@us...> - 2009-03-04 04:35:07

Revision: 2690
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2690&view=rev
Author:   binzino
Date:     2009-03-04 04:35:06 +0000 (Wed, 04 Mar 2009)

Log Message:
-----------
Fix JIRA WAX-38.  Added rules to "job" target to add our libraries to
the .job file.

Modified Paths:
--------------
    trunk/archive-access/projects/nutchwax/archive/build.xml

Modified: trunk/archive-access/projects/nutchwax/archive/build.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/archive/build.xml	2009-03-04 01:18:44 UTC (rev 2689)
+++ trunk/archive-access/projects/nutchwax/archive/build.xml	2009-03-04 04:35:06 UTC (rev 2690)
@@ -15,7 +15,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<project name="nutchwax" default="job">
+<project name="nutchwax" default="jar">
 
   <property name="nutch.dir" value="../../" />
 
@@ -23,8 +23,9 @@
   <property name="lib.dir"   value="lib" />
   <property name="build.dir" value="${nutch.dir}/build" />
   <!-- HACK: Need to import default.properties like Nutch does -->
-  <property name="dist.dir"  value="${build.dir}/nutch-1.0-dev" />
-
+  <property name="final.name" value="nutch-1.0-dev" />
+  <property name="dist.dir"  value="${build.dir}/${final.name}" />
+ 
   <target name="nutch-compile-core">
     <!-- First, copy over Nutch source overlays -->
     <exec executable="rsync">
@@ -83,6 +84,11 @@
 
   <target name="job" depends="compile">
     <ant dir="${nutch.dir}" target="job" inheritAll="false" />
+
+    <!-- Add our NutchWAX libs to the .job created by Nutch's build. -->
+    <jar jarfile="${build.dir}/${final.name}.job" update="true">
+      <zipfileset dir="lib" prefix="lib" includes="*.jar"/>
+    </jar>
   </target>
 
   <target name="war" depends="compile">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Archive-access-cvs] SF.net SVN: archive-access:[2856] trunk/archive-access/projects/nutchwax/ archive/build.xml

From: <bi...@us...> - 2009-10-28 00:30:32

Revision: 2856
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2856&view=rev
Author:   binzino
Date:     2009-10-28 00:30:16 +0000 (Wed, 28 Oct 2009)

Log Message:
-----------
Updated for Nutch 1.0 from Nutch 1.0-dev.

Modified Paths:
--------------
    trunk/archive-access/projects/nutchwax/archive/build.xml

Modified: trunk/archive-access/projects/nutchwax/archive/build.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/archive/build.xml	2009-10-28 00:29:23 UTC (rev 2855)
+++ trunk/archive-access/projects/nutchwax/archive/build.xml	2009-10-28 00:30:16 UTC (rev 2856)
@@ -23,7 +23,7 @@
   <property name="lib.dir"   value="lib" />
   <property name="build.dir" value="${nutch.dir}/build" />
   <!-- HACK: Need to import default.properties like Nutch does -->
-  <property name="final.name" value="nutch-1.0-dev" />
+  <property name="final.name" value="nutch-1.0" />
   <property name="dist.dir"  value="${build.dir}/${final.name}" />
  
   <target name="nutch-compile-core">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.