river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fbarn...@apache.org
Subject svn commit: r582986 - in /incubator/river/trunk/jtsk: build_common.xml doc/build.html doc/htmlbook/ doc/index.html doc/specs/ doc/specs/html/ index.html
Date Mon, 08 Oct 2007 22:03:30 GMT
Author: fbarnaby
Date: Mon Oct  8 15:03:26 2007
New Revision: 582986

URL: http://svn.apache.org/viewvc?rev=582986&view=rev
Log:

Added ant targets ("release" and "build.release"--see doc/build.html)
to generate the distribution bundles in the top-level "dist" directory,
moved the doc/htmlbook/ dir to doc/specs/html/ to be consistent with
the distribution, and updated build.html .


Added:
    incubator/river/trunk/jtsk/doc/specs/
    incubator/river/trunk/jtsk/doc/specs/html/
      - copied from r582926, incubator/river/trunk/jtsk/doc/htmlbook/
    incubator/river/trunk/jtsk/index.html
      - copied unchanged from r582926, incubator/river/trunk/jtsk/doc/index.html
Removed:
    incubator/river/trunk/jtsk/doc/htmlbook/
    incubator/river/trunk/jtsk/doc/index.html
Modified:
    incubator/river/trunk/jtsk/build_common.xml
    incubator/river/trunk/jtsk/doc/build.html

Modified: incubator/river/trunk/jtsk/build_common.xml
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/build_common.xml?rev=582986&r1=582985&r2=582986&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/build_common.xml (original)
+++ incubator/river/trunk/jtsk/build_common.xml Mon Oct  8 15:03:26 2007
@@ -112,22 +112,27 @@
       <not> <isset property="src.tools"/> </not>
     </condition>
 
+    <property name="lib.dir"		value="lib"				/>
+    <property name="lib-dl.dir"		value="lib-dl"				/>
+    <property name="lib-ext.dir"	value="lib-ext"				/>
+
+    <property name="lib"		location="${env.JINI_HOME}/${lib.dir}"	  />
+    <property name="lib-dl"		location="${env.JINI_HOME}/${lib-dl.dir}" />
+    <property name="lib-ext"		location="${env.JINI_HOME}/${lib-ext.dir}"/>
+
     <property name="build.classes"	location="${build}/classes"		/>
     <property name="build.deps"         location="${build}/deps"		/>
+    <property name="build.dist"         location="${build}/dist"		/>
     <property name="build.doc"          location="${build}/doc"			/>
     <property name="build.doc.api"      location="${build.doc}/api"		/>
     <property name="build.doc.spec.api" location="${build.doc}/specs/api"	/>
-    <property name="build.lib"          location="${build}/lib"			/>
-    <property name="build.lib-dl"       location="${build}/lib-dl"		/>
-    <property name="build.lib-ext"      location="${build}/lib-ext"		/>
+    <property name="build.lib"		location="${build}/${lib.dir}"		/>
+    <property name="build.lib-dl"	location="${build}/${lib-dl.dir}"	/>
+    <property name="build.lib-ext"	location="${build}/${lib-ext.dir}"	/>
 
     <property name="entry.dest.dir"	location="${build}/configentry"		/>
     <property name="entry.src.dir"	location="${src.jini}/configentry"	/>
 
-    <property name="lib"		location="${env.JINI_HOME}/lib"		/>
-    <property name="lib-dl"		location="${env.JINI_HOME}/lib-dl"	/>
-    <property name="lib-ext"		location="${env.JINI_HOME}/lib-ext"	/>
-
     <property name="src.jini.manifest"	location="${src.jini}/manifest"		/>
     <property name="src.tools.manifest"	location="${src.tools}/manifest"	/>
 
@@ -135,12 +140,25 @@
     <!-- ## Product version info					-->
     <!-- ##								-->
 
+    <property name="product.name"	value="apache-river" />
     <property name="version"		value="2.1.1" />
     <property name="version-suffix"	value=""/>
 
     <property name="manifest-info"	value="${java.version} (${java.vendor})"/>
 
     <!-- ##								-->
+    <!-- ## Distribution Bundles					-->
+    <!-- ##								-->
+
+    <property name="install.dir"		value="${product.name}-${version}"/>
+
+    <property name="bin.tar.bundle"		value="${build.dist}/${product.name}-${version}-incubating-bin.tar.gz"/>
+    <property name="bin.zip.bundle"		value="${build.dist}/${product.name}-${version}-incubating-bin.zip"/>
+
+    <property name="src.tar.bundle"		value="${build.dist}/${product.name}-${version}-incubating-src.tar.gz"/>
+    <property name="src.zip.bundle"		value="${build.dist}/${product.name}-${version}-incubating-src.zip"/>
+
+    <!-- ##								-->
     <!-- ## Private package inclusions for use with classdep; the	-->
     <!-- ## classes in these packages are both not part of the JSK	-->
     <!-- ## platform and not public (have generated javadoc)		-->
@@ -270,6 +288,215 @@
 
   <!-- ################################################################ -->
   <!-- ##								-->
+  <!-- ## TARGET: release						-->
+  <!-- ##								-->
+  <!-- ################################################################ -->
+
+  <target name="build.release"
+	  description=""
+          depends="all,
+		   jars,
+		   doc,
+		   spec-doc,
+		   release">
+
+  </target>
+
+  <!-- ################################################################ -->
+  <!-- ##								-->
+  <!-- ## TARGET: release						-->
+  <!-- ##								-->
+  <!-- ################################################################ -->
+
+  <target name="release"
+	  description=""
+          depends="release.bin,
+		   release.src">
+
+  </target>
+
+  <!-- ################################################################ -->
+  <!-- ##								-->
+  <!-- ## TARGET: release.bin						-->
+  <!-- ##								-->
+  <!-- ################################################################ -->
+
+  <target name="release.bin"
+	  description=""
+          depends="env">
+
+    <mkdir dir="${build.dist}"/>
+
+    <delete file="${bin.zip.bundle}"/>
+
+    <zip destfile="${bin.zip.bundle}">
+
+      <zipfileset dir="${build}" prefix="${install.dir}">
+	<include name="index.html"			/>
+	<include name="LICENSE"				/>
+	<include name="NOTICE"				/>
+
+	<include name="doc/api/**"			/>
+	<include name="doc/arch2_0.html"		/>
+	<include name="doc/info-index.html"		/>
+	<include name="doc/manpages-index.html"		/>
+	<include name="doc/proxypreparation.pdf"	/>
+	<include name="doc/release-notes/**"		/>
+	<include name="doc/simpleproxyverification.pdf"	/>
+	<include name="doc/smartproxyverification.pdf"	/>
+	<include name="doc/spec-index.html"		/>
+	<include name="doc/specs/**"			/>
+
+	<include name="configentry/**"			/>
+
+	<include name="${lib.dir}/**"			/>
+	<include name="${lib-dl.dir}/**"		/>
+	<include name="${lib-ext.dir}/**"		/>
+      </zipfileset>
+
+    </zip>
+
+
+<!-- @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+
+    <delete file="${bin.tar.bundle}"/>
+
+##
+## TODO:
+##
+## Investigate how to deal with the tar task's 100-character limitation.
+##
+
+    <tar destfile="${bin.tar.bundle}"
+	 compression="gzip"
+	 longfile="warn">
+
+      <tarfileset dir="${build}" prefix="${install.dir}">
+	<include name="index.html"			/>
+	<include name="LICENSE"				/>
+	<include name="NOTICE"				/>
+
+	<include name="doc/api/**"			/>
+	<include name="doc/arch2_0.html"		/>
+	<include name="doc/info-index.html"		/>
+	<include name="doc/manpages-index.html"		/>
+	<include name="doc/proxypreparation.pdf"	/>
+	<include name="doc/release-notes/**"		/>
+	<include name="doc/simpleproxyverification.pdf"	/>
+	<include name="doc/smartproxyverification.pdf"	/>
+	<include name="doc/spec-index.html"		/>
+	<include name="doc/specs/**"			/>
+
+	<include name="configentry/**"			/>
+
+	<include name="${lib.dir}/**"			/>
+	<include name="${lib-dl.dir}/**"		/>
+	<include name="${lib-ext.dir}/**"		/>
+      </tarfileset>
+
+    </tar>
+
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -->
+
+  </target>
+
+  <!-- ################################################################ -->
+  <!-- ##								-->
+  <!-- ## TARGET: release.src						-->
+  <!-- ##								-->
+  <!-- ################################################################ -->
+
+  <target name="release.src"
+	  description=""
+          depends="env">
+
+    <mkdir dir="${build.dist}"/>
+
+    <delete file="${src.zip.bundle}"/>
+
+    <zip destfile="${src.zip.bundle}">
+
+      <zipfileset dir="${top}" prefix="${install.dir}">
+	<include name="index.html"			/>
+	<include name="LICENSE"				/>
+	<include name="NOTICE"				/>
+
+	<include name="doc/api/**"			/>
+	<include name="doc/arch2_0.html"		/>
+	<include name="doc/info-index.html"		/>
+	<include name="doc/build.html"			/>
+	<include name="doc/manpages-index.html"		/>
+	<include name="doc/proxypreparation.pdf"	/>
+	<include name="doc/release-notes/**"		/>
+	<include name="doc/simpleproxyverification.pdf"	/>
+	<include name="doc/smartproxyverification.pdf"	/>
+	<include name="doc/spec-index.html"		/>
+	<include name="doc/specs/**"			/>
+      </zipfileset>
+
+      <zipfileset dir="${top}" prefix="${install.dir}/source">
+	<include name="build.xml"			/>
+	<include name="build_common.xml"		/>
+
+	<include name="doc/j2se/**"			/>
+
+	<include name="src/**"				/>
+      </zipfileset>
+
+    </zip>
+
+
+<!-- @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+
+    <delete file="${src.tar.bundle}"/>
+
+##
+## TODO:
+##
+## Investigate how to deal with the tar task's 100-character limitation.
+##
+
+    <tar destfile="${src.tar.bundle}"
+	 compression="gzip"
+	 longfile="warn">
+
+      <tarfileset dir="${top}" prefix="${install.dir}">
+	<include name="index.html"			/>
+	<include name="LICENSE"				/>
+	<include name="NOTICE"				/>
+
+	<include name="doc/api/**"			/>
+	<include name="doc/arch2_0.html"		/>
+	<include name="doc/info-index.html"		/>
+	<include name="doc/build.html"			/>
+	<include name="doc/manpages-index.html"		/>
+	<include name="doc/proxypreparation.pdf"	/>
+	<include name="doc/release-notes/**"		/>
+	<include name="doc/simpleproxyverification.pdf"	/>
+	<include name="doc/smartproxyverification.pdf"	/>
+	<include name="doc/spec-index.html"		/>
+	<include name="doc/specs/**"			/>
+      </tarfileset>
+
+      <tarfileset dir="${top}" prefix="${install.dir}/source">
+	<include name="build.xml"			/>
+	<include name="build_common.xml"		/>
+
+	<include name="doc/j2se/**"			/>
+
+	<include name="src/**"				/>
+      </tarfileset>
+
+    </tar>
+
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -->
+
+
+  </target>
+
+
+  <!-- ################################################################ -->
+  <!-- ##								-->
   <!-- ## TARGET: setup-dirs						-->
   <!-- ##								-->
   <!-- ################################################################ -->
@@ -899,13 +1126,31 @@
 
   <target name="clean.all"
           description="Deletes the lib, lib-dl, and lib-ext  directories."
-          depends="clean.jars,
+          depends="clean.dist,
+		   clean.jars,
 		   clean.jre.ext">
 
-    <delete dir="${build.classes}"	quiet="true"/>
-    <delete dir="${build.deps}"		quiet="true"/>
-    <delete dir="${build.doc.api}"	quiet="true"/>
-    <delete dir="${entry.dest.dir}"     quiet="true"/>
+    <delete dir="${build.classes}"				quiet="true"/>
+    <delete dir="${build.deps}"					quiet="true"/>
+    <delete dir="${build.doc.api}"				quiet="true"/>
+    <delete dir="${build.doc.spec.api}"				quiet="true"/>
+    <delete dir="${entry.dest.dir}"				quiet="true"/>
+    <delete dir="${src.jini}/com/sun/jini/example/hello/lib"	quiet="true"/>
+
+  </target>
+
+
+  <!-- ################################################################ -->
+  <!-- ##								-->
+  <!-- ## TARGET: clean.dist						-->
+  <!-- ##								-->
+  <!-- ################################################################ -->
+
+  <target name="clean.dist"
+          description="Deletes the distribution directory."
+          depends="env">
+
+    <delete dir="${build.dist}"		quiet="true"/>
 
   </target>
 

Modified: incubator/river/trunk/jtsk/doc/build.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/build.html?rev=582986&r1=582985&r2=582986&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/build.html (original)
+++ incubator/river/trunk/jtsk/doc/build.html Mon Oct  8 15:03:26 2007
@@ -46,8 +46,7 @@
 
 <p>
 <b>NOTE</b>:<i> Please do not attempt to build the starter kit JAR files
-without first taking note of the <a href="#outrigger"> Outrigger build
-issues</a>, and the
+without first taking referencing the 
 <a href="http://developer.java.sun.com/developer/products/jini/tested.html"> 
 platforms on which the starter kit has been tested</a></i>.
 
@@ -166,6 +165,19 @@
     <br><br>
       &nbsp;&nbsp; <code><B><VAR>install_dir</VAR></B>/source/doc/specs/api</code>
 
+    <p>
+    <dt>
+    <b>build.release</b><br>
+    This target will compile everything, generate the jar files, generate the javadoc,
+    and produce the distribution bundles (binary and source) in the top-level "dist"
+    directory.
+
+    <p>
+    <dt>
+    <b>release</b><br>
+    This target assumes everything is built and will only produce distribution bundles
+    (binary and source) in the top-level "dist" directory.
+
   </dl>
 </blockquote>
 
@@ -176,43 +188,6 @@
 modifications to <code>jini-comments@sun.com</code> for consideration.
 
 <p>
-<hr>
-<a name="outrigger">
-<h2>Outrigger build issues</h2>
-
-<code>PersistentOutriggerImpl</code> (the contributed persistent
-implementation of JavaSpaces(TM) technology from Sun Microsystems) relies
-on a pluggable persistence layer, <a
-href="api/com/sun/jini/outrigger/Store.html"><code>com.sun.jini.outrigger.Store</code></a>.
-This release includes two implementations of the <code>Store</code>
-interface, <a
-href="api/com/sun/jini/outrigger/logstore/LogStore.html">logstore</a>
-and <a
-href="api/com/sun/jini/outrigger/snaplogstore/LogStore.html">snaplogstore</a>.
-By default,
-<code>PersistentOutriggerImpl</code> uses the snaplogstore implementation.
-<p>
-
-Logstore depends on Progress Software's <i>ObjectStore PSEPro for Java</i>
-(PSEPro) to persist the contents of the space to disk.  PSEPro requires the
-post processing of the class files for any objects that are going to be
-persisted.  PSEPro also requires a set of runtime classes. Neither the
-runtime classes nor post processor are distributed in this release of
-the starter kit. As a result, unless you have obtained the PSEPro
-development tools (in particular Release 6.0 Service Pack 7), you cannot
-build <code>LogStore</code> from its source code (note, logstore's source
-code is included in this release).
-<p>
-
-If you use the above process to build the starter kit, you will be able to
-build <code>TransientOutriggerImpl</code> (the contributed,
-<i>non-persistent</i> implementation of JavaSpaces technology from Sun
-Microsystems), <code>PersistentOutriggerImpl</code>, and snaplogstore
-(along with the non-Outrigger parts of the starter kit). If PSEPro's
-runtime classes are not present, the above process will not (re)build the
-<code>logstore</code> package or the associated archive files.
-<p>
-
 <hr>
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file



Mime
View raw message