You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/11/21 16:42:16 UTC

svn commit: r1204547 - in /lucene/dev/branches/branch_3x: build.xml dev-tools/scripts/smokeTestRelease.py

Author: rmuir
Date: Mon Nov 21 15:42:15 2011
New Revision: 1204547

URL: http://svn.apache.org/viewvc?rev=1204547&view=rev
Log:
test javadocs in smoketester

Modified:
    lucene/dev/branches/branch_3x/build.xml
    lucene/dev/branches/branch_3x/dev-tools/scripts/smokeTestRelease.py

Modified: lucene/dev/branches/branch_3x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/build.xml?rev=1204547&r1=1204546&r2=1204547&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/build.xml (original)
+++ lucene/dev/branches/branch_3x/build.xml Mon Nov 21 15:42:15 2011
@@ -29,6 +29,17 @@
       </subant>
     </sequential>
   </target>
+  <target name="javadocs" description="Generate Lucene and Solr javadocs">
+    <sequential>
+      <subant target="javadocs" inheritall="false" failonerror="true">
+        <fileset dir="lucene" includes="build.xml" />
+      </subant>
+
+      <subant target="javadocs" inheritall="false" failonerror="true">
+        <fileset dir="solr" includes="build.xml" />
+      </subant>
+    </sequential>
+  </target>
   <target name="validate" description="Validate dependencies, licenses, etc.">
     <sequential><subant target="validate" inheritall="false" failonerror="true">
         <fileset dir="lucene" includes="build.xml" />

Modified: lucene/dev/branches/branch_3x/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/scripts/smokeTestRelease.py?rev=1204547&r1=1204546&r2=1204547&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/branch_3x/dev-tools/scripts/smokeTestRelease.py Mon Nov 21 15:42:15 2011
@@ -375,11 +375,41 @@ def verifyUnpacked(project, artifact, un
       run('export JAVA_HOME=%s; ant test' % JAVA5_HOME, '%s/test.log' % unpackPath)
       run('export JAVA_HOME=%s; ant jar' % JAVA5_HOME, '%s/compile.log' % unpackPath)
       testDemo(isSrc, version)
+      # test javadocs
+      print '    generate javadocs w/ Java 5...'
+      run('export JAVA_HOME=%s; ant javadocs' % JAVA5_HOME, '%s/javadocs.log' % unpackPath)
     else:
       print '    run tests w/ Java 6...'
       run('export JAVA_HOME=%s; ant test' % JAVA6_HOME, '%s/test.log' % unpackPath)
+
+      # test javadocs
+      print '    generate javadocs w/ Java 6...'
+      # uncomment this after 3.5.0 and delete the hack below
+      # run('export JAVA_HOME=%s; ant javadocs' % JAVA6_HOME, '%s/javadocs.log' % unpackPath)
+      os.chdir('lucene')
+      run('export JAVA_HOME=%s; ant javadocs' % JAVA6_HOME, '%s/javadocs.log' % unpackPath)
+      os.chdir(unpackPath)
+
+      os.chdir('solr')
+      run('export JAVA_HOME=%s; ant javadocs' % JAVA6_HOME, '%s/javadocs.log' % unpackPath)
+      os.chdir(unpackPath)
+      # end hackidy-hack     
+
       print '    run tests w/ Java 7...'
       run('export JAVA_HOME=%s; ant test' % JAVA7_HOME, '%s/test.log' % unpackPath)
+ 
+      # test javadocs
+      print '    generate javadocs w/ Java 7...'
+      # uncomment this after 3.5.0 and delete the hack below
+      # run('export JAVA_HOME=%s; ant javadocs' % JAVA7_HOME, '%s/javadocs.log' % unpackPath)
+      os.chdir('lucene')
+      run('export JAVA_HOME=%s; ant javadocs' % JAVA7_HOME, '%s/javadocs.log' % unpackPath)
+      os.chdir(unpackPath)
+
+      os.chdir('solr')
+      run('export JAVA_HOME=%s; ant javadocs' % JAVA7_HOME, '%s/javadocs.log' % unpackPath)
+      os.chdir(unpackPath)
+      # end hackidy-hack   
   else:
     if project == 'lucene':
       testDemo(isSrc, version)