xmlgraphics-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerem...@apache.org
Subject svn commit: r394881 - in /xmlgraphics/commons/trunk: ./ src/documentation/ src/documentation/content/xdocs/ src/documentation/resources/stylesheets/
Date Tue, 18 Apr 2006 08:24:55 GMT
Author: jeremias
Date: Tue Apr 18 01:24:51 2006
New Revision: 394881

URL: http://svn.apache.org/viewcvs?rev=394881&view=rev
Log:
Merged all changes from commons-1_0 branch into trunk.

Added:
    xmlgraphics/commons/trunk/KEYS
      - copied unchanged from r394782, xmlgraphics/commons/branches/commons-1_0/KEYS
    xmlgraphics/commons/trunk/src/documentation/resources/stylesheets/
      - copied from r394782, xmlgraphics/commons/branches/commons-1_0/src/documentation/resources/stylesheets/
    xmlgraphics/commons/trunk/src/documentation/resources/stylesheets/changes2document.xsl
      - copied unchanged from r394782, xmlgraphics/commons/branches/commons-1_0/src/documentation/resources/stylesheets/changes2document.xsl
    xmlgraphics/commons/trunk/src/documentation/resources/stylesheets/dotdots.xsl
      - copied unchanged from r394782, xmlgraphics/commons/branches/commons-1_0/src/documentation/resources/stylesheets/dotdots.xsl
    xmlgraphics/commons/trunk/src/documentation/resources/stylesheets/releaseNotes2document.xsl
      - copied unchanged from r394782, xmlgraphics/commons/branches/commons-1_0/src/documentation/resources/stylesheets/releaseNotes2document.xsl
    xmlgraphics/commons/trunk/src/documentation/sitemap.xmap
      - copied unchanged from r394782, xmlgraphics/commons/branches/commons-1_0/src/documentation/sitemap.xmap
    xmlgraphics/commons/trunk/status.xml
      - copied, changed from r394782, xmlgraphics/commons/branches/commons-1_0/status.xml
Modified:
    xmlgraphics/commons/trunk/   (props changed)
    xmlgraphics/commons/trunk/README
    xmlgraphics/commons/trunk/build.xml
    xmlgraphics/commons/trunk/src/documentation/content/xdocs/download.xml
    xmlgraphics/commons/trunk/src/documentation/content/xdocs/index.xml
    xmlgraphics/commons/trunk/src/documentation/content/xdocs/site.xml

Propchange: xmlgraphics/commons/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Apr 18 01:24:51 2006
@@ -3,3 +3,6 @@
 .project
 build-local.properties
 work
+dist-*
+xmlgraphics-commons*.zip
+xmlgraphics-commons*.gz

Modified: xmlgraphics/commons/trunk/README
URL: http://svn.apache.org/viewcvs/xmlgraphics/commons/trunk/README?rev=394881&r1=394880&r2=394881&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/README (original)
+++ xmlgraphics/commons/trunk/README Tue Apr 18 01:24:51 2006
@@ -44,4 +44,8 @@
   RELEASE NOTES
 ==============================================================================
 
-No releases, yet.
+Version 1.0
+--------------
+
+This is the first release of Apache XML Graphics Commons. There are currently
+no known issues with the code.
\ No newline at end of file

Modified: xmlgraphics/commons/trunk/build.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/commons/trunk/build.xml?rev=394881&r1=394880&r2=394881&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/build.xml (original)
+++ xmlgraphics/commons/trunk/build.xml Tue Apr 18 01:24:51 2006
@@ -48,6 +48,11 @@
   <property name="build.dir" value="${basedir}/build"/>
   <property name="build.classes.dir" value="${build.dir}/classes"/>
   <property name="build.javadocs.dir" value="${build.dir}/javadocs"/>
+  
+  <property name="dist.bin.dir" value="${basedir}/dist-bin"/>
+  <property name="dist.src.dir" value="${basedir}/dist-src"/>
+  <property name="dist.bin.result.dir" value="${dist.bin.dir}/${name}-${version}"/>
+  <property name="dist.src.result.dir" value="${dist.src.dir}/${name}-${version}"/>
 
   <!-- .NET support (using IKVM) -->
   <property name="ikvm.dir" value="."/>
@@ -68,6 +73,36 @@
     </fileset>
   </path>
 
+  <fileset dir="${basedir}" id="dist.bin">
+    <include name="examples/**"/>
+    <include name="LICENSE"/>
+    <include name="NOTICE"/>
+    <include name="README"/>
+    <include name="KEYS"/>
+    <include name="status.xml"/>
+  </fileset>
+
+  <fileset dir="${basedir}" id="dist.bin.lib">
+    <patternset id="dist.lib">
+      <include name="lib/commons-io*"/>
+      <include name="lib/README*"/>
+    </patternset>
+  </fileset>
+
+  <fileset dir="${basedir}" id="dist.src">
+    <include name="src/**"/>
+    <patternset refid="dist.lib"/>
+    <include name="test/**"/>
+    <include name="examples/**"/>
+    <include name="LICENSE"/>
+    <include name="NOTICE"/>
+    <include name="README"/>
+    <include name="KEYS"/>
+    <include name="status.xml"/>
+    <include name="build.*"/>
+    <include name="forrest.*"/>
+  </fileset>
+
   <!-- =================================================================== -->
   <!-- Initialization target                                               -->
   <!-- =================================================================== -->
@@ -420,6 +455,102 @@
   </target>
 
   <target name="checkstyle" depends="checkstyle-avail, checkstyle-check, checkstyle-html"
description="Runs Checkstyle for a code quality report"/>
+
+  <!-- =================================================================== -->
+  <!-- Creates the documentation                                           -->
+  <!-- =================================================================== -->
+  <target name="docs" description="Generates documentation">
+    <echo message="Building documentation with Forrest..."/>
+    <!--
+    <echo message="Make sure that you have installed Apache Forrest and"/>
+    <echo message="the FORREST_HOME environment variable is set (see http://forrest.apache.org/)"/>
+    <echo message="FORREST_HOME = ${forrest.home}"/>
+    -->
+    <echo message="Make sure you have a proper Forrest installation (see http://forrest.apache.org/)"/>
+
+    <!--<antcall target="site"/>-->
+    
+    <!-- You can provide a JDK 1.4 for a JDK 1.3 build by adding "javahome.jdk14" to build-local.properties
-->
+    <condition property="javahome.jdk14.override" value="${javahome.jdk14}">
+      <isset property="javahome.jdk14"/>
+    </condition>
+    <echo message="java home: ${javahome.jdk14.override}"/>
+    <condition property="javahome.jdk14.override" value="${env.JAVA_HOME}">
+      <not>
+        <isset property="javahome.jdk14.override"/>
+      </not>
+    </condition>
+    <echo message="java home: ${javahome.jdk14.override}"/>
+    <condition property="forrest.call" value="forrest.bat" else="forrest">
+      <os family="windows"/>
+    </condition>
+    <exec executable="${forrest.call}">
+      <env key="JAVA_HOME" value="${javahome.jdk14.override}"/>
+    </exec>
+  </target>
+  
+  <!-- =================================================================== -->
+  <!-- Creates the distribution                                            -->
+  <!-- =================================================================== -->
+  <target name="dist" depends="dist-src,dist-bin" description="Generates the distribution
package"/>
+
+  <!-- IMPORTANT: .NET binaries must not be included in the distribution. License policy!
-->
+
+  <target name="dist-bin" depends="all,javadocs,docs">
+    <echo message="Building the binary distribution files (zip,tar)"/>
+    <mkdir dir="${dist.bin.result.dir}"/>
+    <copy todir="${dist.bin.result.dir}">
+      <fileset refid="dist.bin"/>
+      <fileset refid="dist.bin.lib"/>
+    </copy>
+    <copy todir="${dist.bin.result.dir}/docs">
+      <fileset dir="${build.dir}/site"/>
+    </copy>
+    <copy todir="${dist.bin.result.dir}/javadocs">
+      <fileset dir="${build.javadocs.dir}"/>
+    </copy>
+    <mkdir dir="${dist.bin.result.dir}/build"/>
+    <copy todir="${dist.bin.result.dir}/build" file="build/${name}.jar"/>
+    <chmod file="${dist.bin.result.dir}/${name}" perm="ugo+rx"/>
+
+    <property name="bin.suffix" value="bin-jdk${java.specification.version}"/>
+    <zip zipfile="${name}-${version}-${bin.suffix}.zip" basedir="${dist.bin.dir}" includes="**"/>
+    <tar longfile="gnu"
+         destfile="${name}-${version}-${bin.suffix}.tar">
+      <tarfileset dir="${dist.bin.dir}" mode="755">
+        <include name="${name}-${version}/${name}"/>
+      </tarfileset>
+      <tarfileset dir="${dist.bin.dir}">
+        <include name="**"/>
+        <exclude name="${name}-${version}/${name}"/>
+      </tarfileset>
+    </tar>
+    <gzip zipfile="${name}-${version}-${bin.suffix}.tar.gz" src="${name}-${version}-${bin.suffix}.tar"/>
+    <delete file="${name}-${version}-${bin.suffix}.tar"/>
+  </target>
+
+  <target name="dist-src" depends="all">
+    <echo message="Building the source distribution files (zip,tar)"/>
+    <mkdir dir="${dist.src.result.dir}"/>
+    <copy todir="${dist.src.result.dir}">
+      <fileset refid="dist.src"/>
+    </copy>
+    <chmod file="${dist.src.result.dir}/${name}" perm="ugo+rx"/>
+
+    <zip zipfile="${name}-${version}-src.zip" basedir="${dist.src.dir}" includes="**"/>
+    <tar longfile="gnu"
+         destfile="${name}-${version}-src.tar" >
+      <tarfileset dir="${dist.src.dir}" mode="755">
+        <include name="${name}-${version}/${name}"/>
+      </tarfileset>
+      <tarfileset dir="${dist.src.dir}">
+        <include name="**"/>
+        <exclude name="${name}-${version}/${name}"/>
+      </tarfileset>
+    </tar>
+    <gzip zipfile="${name}-${version}-src.tar.gz" src="${name}-${version}-src.tar"/>
+    <delete file="${name}-${version}-src.tar"/>
+  </target>
 
   <!-- =================================================================== -->
   <!-- Clean targets                                                       -->

Modified: xmlgraphics/commons/trunk/src/documentation/content/xdocs/download.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/commons/trunk/src/documentation/content/xdocs/download.xml?rev=394881&r1=394880&r2=394881&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/content/xdocs/download.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/content/xdocs/download.xml Tue Apr 18 01:24:51
2006
@@ -23,9 +23,8 @@
     <section id="release">
       <title>Download a Release</title>
       <p>
-        The first release of Apache XML Graphics Commons will soon be made available.
-        Until then, please get the source code via Subversion (svn) using the 
-        information below.
+        Source ("-src") and binary ("-bin") distributions can be downloaded from a
+        <a href="http://www.apache.org/dyn/closer.cgi/xmlgraphics/commons">Apache XML
Graphics Commons Distribution Mirror</a>.
       </p>
     </section>
     <section id="svn">

Modified: xmlgraphics/commons/trunk/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/commons/trunk/src/documentation/content/xdocs/index.xml?rev=394881&r1=394880&r2=394881&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/content/xdocs/index.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/content/xdocs/index.xml Tue Apr 18 01:24:51
2006
@@ -17,7 +17,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document> 
   <header> 
-    <title>Apache XML Graphics Commons</title> 
+    <title>Apache XML Graphics Commons</title>
   </header> 
   <body> 
     <section>

Modified: xmlgraphics/commons/trunk/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/commons/trunk/src/documentation/content/xdocs/site.xml?rev=394881&r1=394880&r2=394881&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/content/xdocs/site.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/content/xdocs/site.xml Tue Apr 18 01:24:51
2006
@@ -37,6 +37,7 @@
     <information label="Information">
       <mail label="Mailing Lists" href="http://xmlgraphics.apache.org/mail.html" description="Information
on Mailing Lists"/>
       <repo label="Code Repositories" href="http://xmlgraphics.apache.org/repo.html" description="Information
on Code Repositories"/>
+      <changes label="Changes" href="changes.html"/>
     </information>
   </about>
 

Copied: xmlgraphics/commons/trunk/status.xml (from r394782, xmlgraphics/commons/branches/commons-1_0/status.xml)
URL: http://svn.apache.org/viewcvs/xmlgraphics/commons/trunk/status.xml?p2=xmlgraphics/commons/trunk/status.xml&p1=xmlgraphics/commons/branches/commons-1_0/status.xml&r1=394782&r2=394881&rev=394881&view=diff
==============================================================================
--- xmlgraphics/commons/branches/commons-1_0/status.xml (original)
+++ xmlgraphics/commons/trunk/status.xml Tue Apr 18 01:24:51 2006
@@ -26,6 +26,8 @@
   </todo>
 
   <changes>
+    <release version="Trunk" date="n/a">
+    </release>
     <release version="1.0" date="17 Apr 2006">
       <action context="Code" dev="JM" type="add">
         Initial release with several components from Batik and FOP: 



---------------------------------------------------------------------
Apache XML Graphics Project URL: http://xmlgraphics.apache.org/
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org


Mime
View raw message