Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 78475 invoked from network); 5 Jan 2009 16:39:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Jan 2009 16:39:32 -0000 Received: (qmail 22406 invoked by uid 500); 5 Jan 2009 16:39:31 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 22337 invoked by uid 500); 5 Jan 2009 16:39:31 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 22328 invoked by uid 99); 5 Jan 2009 16:39:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jan 2009 08:39:31 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jan 2009 16:39:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1C513238899B; Mon, 5 Jan 2009 08:39:08 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r731614 - in /db/derby/site/trunk: build/site/dev/derby_source.html src/documentation/content/xdocs/dev/derby_source.xml Date: Mon, 05 Jan 2009 16:39:07 -0000 To: derby-commits@db.apache.org From: rhillegas@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090105163908.1C513238899B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rhillegas Date: Mon Jan 5 08:39:07 2009 New Revision: 731614 URL: http://svn.apache.org/viewvc?rev=731614&view=rev Log: DERBY-3985: Update the website so that the build instructions reflect the recent changes to the build and the conversion of BUILDING.txt to BUILDING.html. Modified: db/derby/site/trunk/build/site/dev/derby_source.html db/derby/site/trunk/src/documentation/content/xdocs/dev/derby_source.xml Modified: db/derby/site/trunk/build/site/dev/derby_source.html URL: http://svn.apache.org/viewvc/db/derby/site/trunk/build/site/dev/derby_source.html?rev=731614&r1=731613&r2=731614&view=diff ============================================================================== --- db/derby/site/trunk/build/site/dev/derby_source.html (original) +++ db/derby/site/trunk/build/site/dev/derby_source.html Mon Jan 5 08:39:07 2009 @@ -301,23 +301,20 @@ Derby is designed to work in JSR 169, JDBC 3.0, and JDBC 4.0 environments. In addition, optional run-time code may take advantage of features introduced by Java 5. -For this reason both JDK1.4 and Java 5 are required for the build environment. -The build is set up so that most of the code is compiled against JDK 1.4 -libraries so that there are no dependencies on classes from higher -levels of Java. A significant exception to this is the JDBC 4.0 code.

The software required to build the Derby mainline is summarized in the table below. However, doublecheck the -BUILDING.txt -instructions for installation locations before downloading the software. If +BUILDING.html +instructions for installation locations before downloading the software. +(Note: if your browser shows HTML source for this page instead of +displaying it, +save the file locally with File -> Save Page As, +then open the file you saved.) +If you need to build an earlier version of Derby, please consult the -BUILDING.txt in the appropriate code branch. -As of this writing, and with the exception of the JDKs and Ant, -the Derby build procedure expects most software to be installed in -${derby.source}/tools/java -(where ${derby.source} is the root location of the Derby source on -your system). +build instructions in the appropriate code branch. For 10.4 and earlier branches, +those instructions live in a file called BUILDING.txt rather than BUILDING.html.

@@ -331,7 +328,7 @@ - + @@ -348,60 +345,29 @@ - - - - - - - - - - - - - - -
Apache Ant 1.6.xApache Ant 1.7.x http://ant.apache.org/bindownload.cgi
Java Development Kit (JDK) release 1.4.x Any JDK 1.4.x, Java's reference implementation is at - http://java.sun.com/j2se/ -
Java Development Kit (JDK) release 6 (optional) Any Java 6 JDK, Java's reference implementation is at - http://java.sun.com/j2se/ -
- +

How to build Derby

Instructions for building Derby are in a file named -BUILDING.txt +BUILDING.html at the root of the source code tree.

-

-The previous link points to the BUILDING.TXT file in the -development trunk. -If you want to access the BUILDING.TXT file for a -specific branch, access the file directly by checking out the -branch -or the development trunk. -

- +

How to test Derby

Instructions for testing Derby are in the source code tree in java/testing/README.htm. -(Note: if your browser shows HTML source for this page instead of -displaying it, -save the file locally with File -> Save Page As, -then open the file you saved.)

The previous link points to java/testing/README.htm in the @@ -418,7 +384,7 @@

- +

How to submit a patch

@@ -432,7 +398,7 @@

-Last updated: October 16, 2007 +Last updated: January 5, 2009

Modified: db/derby/site/trunk/src/documentation/content/xdocs/dev/derby_source.xml URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/dev/derby_source.xml?rev=731614&r1=731613&r2=731614&view=diff ============================================================================== --- db/derby/site/trunk/src/documentation/content/xdocs/dev/derby_source.xml (original) +++ db/derby/site/trunk/src/documentation/content/xdocs/dev/derby_source.xml Mon Jan 5 08:39:07 2009 @@ -136,24 +136,21 @@ Derby is designed to work in JSR 169, JDBC 3.0, and JDBC 4.0 environments. In addition, optional run-time code may take advantage of features introduced by Java 5. -For this reason both JDK1.4 and Java 5 are required for the build environment. -The build is set up so that most of the code is compiled against JDK 1.4 -libraries so that there are no dependencies on classes from higher -levels of Java. A significant exception to this is the JDBC 4.0 code.

The software required to build the Derby mainline is summarized in the table below. However, doublecheck the -BUILDING.txt -instructions for installation locations before downloading the software. If +BUILDING.html +instructions for installation locations before downloading the software. +(Note: if your browser shows HTML source for this page instead of +displaying it, +save the file locally with File -> Save Page As, +then open the file you saved.) +If you need to build an earlier version of Derby, please consult the -BUILDING.txt in the appropriate code branch. -As of this writing, and with the exception of the JDKs and Ant, -the Derby build procedure expects most software to be installed in -${derby.source}/tools/java -(where ${derby.source} is the root location of the Derby source on -your system). +build instructions in the appropriate code branch. For 10.4 and earlier branches, +those instructions live in a file called BUILDING.txt rather than BUILDING.html.

@@ -163,7 +160,7 @@ - + @@ -176,19 +173,6 @@ - - - - - - - - -
Apache Ant 1.6.xApache Ant 1.7.x http://ant.apache.org/bindownload.cgi
Java Development Kit (JDK) release 1.4.x Any JDK 1.4.x, Java's reference implementation is at - http://java.sun.com/j2se/ -
Java Development Kit (JDK) release 6 (optional) Any Java 6 JDK, Java's reference implementation is at - http://java.sun.com/j2se/ -
@@ -198,19 +182,10 @@

Instructions for building Derby are in a file named -BUILDING.txt +BUILDING.html at the root of the source code tree.

-

-The previous link points to the BUILDING.TXT file in the -development trunk. -If you want to access the BUILDING.TXT file for a -specific branch, access the file directly by checking out the -branch -or the development trunk. -

-
@@ -219,10 +194,6 @@

Instructions for testing Derby are in the source code tree in java/testing/README.htm. -(Note: if your browser shows HTML source for this page instead of -displaying it, -save the file locally with File -> Save Page As, -then open the file you saved.)

@@ -253,7 +224,7 @@

-Last updated: October 16, 2007 +Last updated: January 5, 2009