Author: gates
Date: Fri Sep 17 22:18:44 2010
New Revision: 998353
URL: http://svn.apache.org/viewvc?rev=998353&view=rev
Log:
PIG-1508 Make 'docs' target (forrest) work with Java 1.6
Modified:
hadoop/pig/trunk/CHANGES.txt
hadoop/pig/trunk/build.xml
hadoop/pig/trunk/src/docs/forrest.properties
hadoop/pig/trunk/test/bin/test-patch.sh
Modified: hadoop/pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=998353&r1=998352&r2=998353&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Fri Sep 17 22:18:44 2010
@@ -24,6 +24,8 @@ INCOMPATIBLE CHANGES
IMPROVEMENTS
+PIG-1508: Make 'docs' target (forrest) work with Java 1.6 (cwsteinbach via
gates)
+
PIG-1608: pig should always include pig-default.properties and pig.properties
in the pig.jar (nrai via daijy)
OPTIMIZATIONS
Modified: hadoop/pig/trunk/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/build.xml?rev=998353&r1=998352&r2=998353&view=diff
==============================================================================
--- hadoop/pig/trunk/build.xml (original)
+++ hadoop/pig/trunk/build.xml Fri Sep 17 22:18:44 2010
@@ -397,25 +397,18 @@
<!-- ================================================================== -->
<target name="docs" depends="forrest.check, javadoc-all"
description="Generate forrest-based documentation.
To use, specify -Dforrest.home=<base of Apache Forrest
installation> on the command line." if="forrest.home">
- <exec dir="${docs.dir}" executable="${forrest.home}/bin/forrest"
- failonerror="true">
- <env key="JAVA_HOME" value="${java5.home}"/>
+ <exec dir="${docs.dir}" executable="${forrest.home}/bin/forrest"
failonerror="true">
</exec>
<copy todir="${build.docs}">
<fileset dir="${docs.dir}/build/site/" />
</copy>
</target>
- <target name="forrest.check" unless="forrest.home" depends="java5.check">
+ <target name="forrest.check" unless="forrest.home">
<fail message="'forrest.home' is not defined.
Please pass -Dforrest.home=<base of Apache Forrest
installation> to Ant on the command-line." />
</target>
- <target name="java5.check" unless="java5.home">
- <fail message="'java5.home' is not defined. Forrest requires Java 5.
- Please pass -Djava5.home=<base of Java 5 distribution> to
Ant on the command-line." />
- </target>
-
<target name="source-jar" depends="cc-compile">
<jar duplicate="preserve" jarfile="${output.jarfile.sources}"
basedir="${src.dir}">
<manifest>
@@ -943,7 +936,6 @@
<arg value="${findbugs.home}"/>
<arg value="${forrest.home}"/>
<arg value="${basedir}"/>
- <arg value="${java5.home}"/>
<arg value="${ant.project.name}"/>
</exec>
</target>
@@ -967,7 +959,6 @@
<arg value="${basedir}"/>
<arg value="${trigger.url}"/>
<arg value="${jira.passwd}"/>
- <arg value="${java5.home}"/>
<arg value="${curl.cmd}"/>
<arg value="${defect}"/>
<arg value="${ant.project.name}"/>
Modified: hadoop/pig/trunk/src/docs/forrest.properties
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/docs/forrest.properties?rev=998353&r1=998352&r2=998353&view=diff
==============================================================================
--- hadoop/pig/trunk/src/docs/forrest.properties (original)
+++ hadoop/pig/trunk/src/docs/forrest.properties Fri Sep 17 22:18:44 2010
@@ -92,7 +92,11 @@
#forrest.validate=true
#forrest.validate.xdocs=${forrest.validate}
#forrest.validate.skinconf=${forrest.validate}
-#forrest.validate.sitemap=${forrest.validate}
+
+# PIG-1508: Workaround for http://issues.apache.org/jira/browse/FOR-984
+# Remove when forrest-0.9 is available
+forrest.validate.sitemap=false
+
#forrest.validate.stylesheets=${forrest.validate}
#forrest.validate.skins=${forrest.validate}
#forrest.validate.skins.stylesheets=${forrest.validate.skins}
Modified: hadoop/pig/trunk/test/bin/test-patch.sh
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/test/bin/test-patch.sh?rev=998353&r1=998352&r2=998353&view=diff
==============================================================================
--- hadoop/pig/trunk/test/bin/test-patch.sh (original)
+++ hadoop/pig/trunk/test/bin/test-patch.sh Fri Sep 17 22:18:44 2010
@@ -12,8 +12,8 @@ parseArgs() {
HUDSON)
### Set HUDSON to true to indicate that this script is being run by
Hudson
HUDSON=true
- if [[ $# != 20 ]] ; then
- echo "ERROR: usage $0 HUDSON <PATCH_DIR> <SUPPORT_DIR> <PS_CMD>
<WGET_CMD> <JIRACLI> <SVN_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME>
<FORREST_HOME> <ECLIPSE_HOME> <PYTHON_HOME> <WORKSPACE_BASEDIR> <TRIGGER_BUILD>
<JIRA_PASSWD> <JAVA5_HOME> <CURL_CMD> <DEFECT> <PROJECT NAME>"
+ if [[ $# != 19 ]] ; then
+ echo "ERROR: usage $0 HUDSON <PATCH_DIR> <SUPPORT_DIR> <PS_CMD>
<WGET_CMD> <JIRACLI> <SVN_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME>
<FORREST_HOME> <ECLIPSE_HOME> <PYTHON_HOME> <WORKSPACE_BASEDIR> <TRIGGER_BUILD>
<JIRA_PASSWD> <CURL_CMD> <DEFECT> <PROJECT NAME>"
cleanupAndExit 0
fi
PATCH_DIR=$2
@@ -31,10 +31,9 @@ parseArgs() {
BASEDIR=${14}
TRIGGER_BUILD_URL=${15}
JIRA_PASSWD=${16}
- JAVA5_HOME=${17}
- CURL=${18}
- defect=${19}
- PROJECT_NAME=${20}
+ CURL=${17}
+ defect=${18}
+ PROJECT_NAME=${19}
### Retrieve the defect number
if [ -z "$defect" ] ; then
@@ -52,8 +51,8 @@ parseArgs() {
DEVELOPER)
### Set HUDSON to false to indicate that this script is being run by a
developer
HUDSON=false
- if [[ $# != 11 ]] ; then
- echo "ERROR: usage $0 DEVELOPER <PATCH_FILE> <SCRATCH_DIR> <SVN_CMD>
<GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> <FORREST_HOME> <WORKSPACE_BASEDIR>
<JAVA5_HOME> <PROJECT NAME>"
+ if [[ $# != 10 ]] ; then
+ echo "ERROR: usage $0 DEVELOPER <PATCH_FILE> <SCRATCH_DIR> <SVN_CMD>
<GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> <FORREST_HOME> <WORKSPACE_BASEDIR>
<PROJECT NAME>"
cleanupAndExit 0
fi
### PATCH_FILE contains the location of the patchfile
@@ -79,8 +78,7 @@ parseArgs() {
FINDBUGS_HOME=$7
FORREST_HOME=$8
BASEDIR=$9
- JAVA5_HOME=${10}
- PROJECT_NAME=${11}
+ PROJECT_NAME=${10}
### Obtain the patch filename to append it to the ver number
defect=`basename $PATCH_FILE`
;;
@@ -162,16 +160,16 @@ setup () {
echo "======================================================================"
echo ""
echo ""
- echo "$ANT_HOME/bin/ant -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= releaseaudit >
$PATCH_DIR/trunkReleaseAuditWarnings.txt 2>&1"
- $ANT_HOME/bin/ant -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= releaseaudit >
$PATCH_DIR/trunkReleaseAuditWarnings.txt 2>&1
- echo "$ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000"
$ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt
2>&1"
- $ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY
-Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt
2>&1
+ echo "$ANT_HOME/bin/ant -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= releaseaudit >
$PATCH_DIR/trunkReleaseAuditWarnings.txt 2>&1"
+ $ANT_HOME/bin/ant -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= releaseaudit >
$PATCH_DIR/trunkReleaseAuditWarnings.txt 2>&1
+ echo "$ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000"
$ECLIPSE_PROPERTY -Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess=
clean tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1"
+ $ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY
-Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= clean tar >
$PATCH_DIR/trunkJavacWarnings.txt 2>&1
if [[ $? != 0 ]] ; then
echo "Trunk compilation is broken?"
cleanupAndExit 1
fi
- echo "$ANT_HOME/bin/ant -Dfindbugs.home=$FINDBUGS_HOME
-Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= findbugs > /dev/null 2>&1"
- $ANT_HOME/bin/ant -Dfindbugs.home=$FINDBUGS_HOME -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= findbugs >
/dev/null 2>&1
+ echo "$ANT_HOME/bin/ant -Dfindbugs.home=$FINDBUGS_HOME
-Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= findbugs >
/dev/null 2>&1"
+ $ANT_HOME/bin/ant -Dfindbugs.home=$FINDBUGS_HOME
-Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= findbugs >
/dev/null 2>&1
if [[ $? != 0 ]] ; then
echo "Trunk findbugs is broken?"
cleanupAndExit 1
@@ -307,8 +305,8 @@ checkJavacWarnings () {
echo "======================================================================"
echo ""
echo ""
- echo "$ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000"
$ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= clean tar > $PATCH_DIR/patchJavacWarnings.txt
2>&1"
- $ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY
-Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= clean tar > $PATCH_DIR/patchJavacWarnings.txt
2>&1
+ echo "$ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000"
$ECLIPSE_PROPERTY -Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess=
clean tar > $PATCH_DIR/patchJavacWarnings.txt 2>&1"
+ $ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY
-Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= clean tar >
$PATCH_DIR/patchJavacWarnings.txt 2>&1
### Compare trunk and patch javac warning numbers
if [[ -f $PATCH_DIR/patchJavacWarnings.txt ]] ; then
@@ -342,8 +340,8 @@ checkReleaseAuditWarnings () {
echo "======================================================================"
echo ""
echo ""
- echo "$ANT_HOME/bin/ant -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= releaseaudit >
$PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1"
- $ANT_HOME/bin/ant -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= releaseaudit >
$PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1
+ echo "$ANT_HOME/bin/ant -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= releaseaudit >
$PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1"
+ $ANT_HOME/bin/ant -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= releaseaudit >
$PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1
### Compare trunk and patch release audit warning numbers
if [[ -f $PATCH_DIR/patchReleaseAuditWarnings.txt ]] ; then
@@ -420,8 +418,8 @@ checkFindbugsWarnings () {
echo "======================================================================"
echo ""
echo ""
- echo "$ANT_HOME/bin/ant -Dfindbugs.home=$FINDBUGS_HOME
-Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= findbugs"
- $ANT_HOME/bin/ant -Dfindbugs.home=$FINDBUGS_HOME -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= findbugs
+ echo "$ANT_HOME/bin/ant -Dfindbugs.home=$FINDBUGS_HOME
-Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= findbugs"
+ $ANT_HOME/bin/ant -Dfindbugs.home=$FINDBUGS_HOME
-Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= findbugs
if [ $? != 0 ] ; then
JIRA_COMMENT="$JIRA_COMMENT
@@ -479,8 +477,8 @@ runCoreTests () {
PreTestTarget="create-c++-configure"
fi
- echo "$ANT_HOME/bin/ant -D${PROJECT_NAME}PatchProcess=
-Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes
-Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME $PreTestTarget test-core"
- $ANT_HOME/bin/ant -D${PROJECT_NAME}PatchProcess=
-Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes
-Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME $PreTestTarget test-core
+ echo "$ANT_HOME/bin/ant -D${PROJECT_NAME}PatchProcess=
-Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes
-Dforrest.home=$FORREST_HOME $PreTestTarget test-core"
+ $ANT_HOME/bin/ant -D${PROJECT_NAME}PatchProcess=
-Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes
-Dforrest.home=$FORREST_HOME $PreTestTarget test-core
if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT
