lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r1005480 - in /lucene/dev/nightly: hudson-lucene-3.x.sh hudson-lucene-trunk.sh hudson-settings.sh
Date Thu, 07 Oct 2010 15:02:25 GMT
Author: uschindler
Date: Thu Oct  7 15:02:25 2010
New Revision: 1005480

URL: http://svn.apache.org/viewvc?rev=1005480&view=rev
Log:
build modules in lucene-trunk

Modified:
    lucene/dev/nightly/hudson-lucene-3.x.sh
    lucene/dev/nightly/hudson-lucene-trunk.sh
    lucene/dev/nightly/hudson-settings.sh

Modified: lucene/dev/nightly/hudson-lucene-3.x.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-3.x.sh?rev=1005480&r1=1005479&r2=1005480&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-3.x.sh (original)
+++ lucene/dev/nightly/hudson-lucene-3.x.sh Thu Oct  7 15:02:25 2010
@@ -35,7 +35,7 @@ JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/an
   -Dsvn.exe=$SVN_EXE \
   -Dversion=$VERSION \
   -Dtests.threadspercpu=0 \
-  -Dtests.multiplier=3 \
+  -Dtests.multiplier=$TESTS_MULTIPLIER \
   test
 # release it
 cp dist/*.tar.gz $ARTIFACTS

Modified: lucene/dev/nightly/hudson-lucene-trunk.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-trunk.sh?rev=1005480&r1=1005479&r2=1005480&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-trunk.sh (original)
+++ lucene/dev/nightly/hudson-lucene-trunk.sh Thu Oct  7 15:02:25 2010
@@ -4,7 +4,8 @@ set -x
 
 . $WORKSPACE/nightly/hudson-settings.sh
 
-SVN_BRANCH_DIR=lucene
+CORE_DIR=lucene
+MODULES_DIR=modules
 
 #Update the Version # when doing a release
 VERSION=4.0-$BUILD_ID
@@ -15,12 +16,12 @@ MAVEN_ARTIFACTS=$WORKSPACE/maven_artifac
 
 mkdir -p $ARTIFACTS
 mkdir -p $MAVEN_ARTIFACTS
-cd $WORKSPACE/$SVN_BRANCH_DIR
 
 echo "Workspace: $WORKSPACE"
 
 #Package the Source and compile Binaries
 #(this assumes that during the JDK 1.5 compile all tests are built, which is currently the
case)
+cd $WORKSPACE/$CORE_DIR
 JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant -Dversion=$VERSION \
   -Dsvnversion.exe=$SVNVERSION_EXE \
   -Dsvn.exe=$SVN_EXE \
@@ -28,18 +29,37 @@ JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/an
 # release it
 cp dist/*-src.tar.gz $ARTIFACTS
 
+cd $WORKSPACE/$MODULES_DIR
+JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant -Dversion=$VERSION \
+  -Dsvnversion.exe=$SVNVERSION_EXE \
+  -Dsvn.exe=$SVN_EXE \
+  compile
+# release it
+#cp dist/*-src.tar.gz $ARTIFACTS
+
 # run tests
+cd $WORKSPACE/$CORE_DIR
 JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/ant \
   -Dsvnversion.exe=$SVNVERSION_EXE \
   -Dsvn.exe=$SVN_EXE \
   -Dversion=$VERSION \
   -Dtests.threadspercpu=0 \
-  -Dtests.multiplier=3 \
+  -Dtests.multiplier=$TESTS_MULTIPLIER \
   test
 # release it
 cp dist/*.tar.gz $ARTIFACTS
 
+cd $WORKSPACE/$MODULES_DIR
+JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/ant \
+  -Dsvnversion.exe=$SVNVERSION_EXE \
+  -Dsvn.exe=$SVN_EXE \
+  -Dversion=$VERSION \
+  -Dtests.threadspercpu=0 \
+  -Dtests.multiplier=$TESTS_MULTIPLIER \
+  test
+
 #Generate the Maven snapshot
+cd $WORKSPACE/$CORE_DIR
 JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \
   -Dsvnversion.exe=$SVNVERSION_EXE \
   -Dsvn.exe=$SVN_EXE \
@@ -50,8 +70,11 @@ echo "Copying Maven artifacts to $MAVEN_
 cp -R dist/maven/org/apache/lucene $MAVEN_ARTIFACTS
 echo "Done Copying Maven Artifacts"
 
+#TODO: add maven stuff here *LOL*
+
 #Rerun testsuite with clover on
 set +e
+cd $WORKSPACE/$CORE_DIR
 JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/ant \
   -lib $CLOVER \
   -Dsvnversion.exe=$SVNVERSION_EXE \
@@ -65,6 +88,7 @@ RET=$?
 set -e
 
 #generate the clover reports and javadocs even when tests failed before
+cd $WORKSPACE/$CORE_DIR
 JAVA_HOME=$JAVA_HOME_16 ANT_OPTS="-Xmx896M" $ANT_HOME/bin/ant \
   -lib $CLOVER \
   -Dsvnversion.exe=$SVNVERSION_EXE \
@@ -74,6 +98,7 @@ JAVA_HOME=$JAVA_HOME_16 ANT_OPTS="-Xmx89
   generate-clover-reports
 
 #build javadocs & changes again
+cd $WORKSPACE/$CORE_DIR
 JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant -Dversion=$VERSION \
   -Dsvnversion.exe=$SVNVERSION_EXE \
   -Dsvn.exe=$SVN_EXE \

Modified: lucene/dev/nightly/hudson-settings.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-settings.sh?rev=1005480&r1=1005479&r2=1005480&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-settings.sh (original)
+++ lucene/dev/nightly/hudson-settings.sh Thu Oct  7 15:02:25 2010
@@ -8,3 +8,6 @@ CLOVER=/home/hudson/tools/clover/clover2
 # we sometimes ignore hudson-supplied Java version and enforce 1.5 for compilation, but run
tests in 1.6:
 JAVA_HOME_15=/home/hudson/tools/java/latest1.5
 JAVA_HOME_16=/home/hudson/tools/java/latest1.6
+
+#config:
+TESTS_MULTIPLIER=3



Mime
View raw message