You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2010/10/13 12:29:14 UTC
svn commit: r1022060 - in /lucene/dev/nightly: hudson-lucene-3.x.sh
hudson-lucene-trunk.sh hudson-lusolr-tests-3.x.sh
hudson-lusolr-tests-trunk.sh hudson-settings.sh hudson-solr-3.x.sh
hudson-solr-trunk.sh
Author: uschindler
Date: Wed Oct 13 10:29:13 2010
New Revision: 1022060
URL: http://svn.apache.org/viewvc?rev=1022060&view=rev
Log:
unify the folder names and move to config
Modified:
lucene/dev/nightly/hudson-lucene-3.x.sh
lucene/dev/nightly/hudson-lucene-trunk.sh
lucene/dev/nightly/hudson-lusolr-tests-3.x.sh
lucene/dev/nightly/hudson-lusolr-tests-trunk.sh
lucene/dev/nightly/hudson-settings.sh
lucene/dev/nightly/hudson-solr-3.x.sh
lucene/dev/nightly/hudson-solr-trunk.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=1022060&r1=1022059&r2=1022060&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-3.x.sh (original)
+++ lucene/dev/nightly/hudson-lucene-3.x.sh Wed Oct 13 10:29:13 2010
@@ -4,22 +4,14 @@ set -x
. $WORKSPACE/nightly/hudson-settings.sh
-SVN_BRANCH_DIR=branch_3x/lucene
-
#Update the Version # when doing a release
VERSION=3.1-$BUILD_ID
MAVEN_ARTIFACT_VERSION=3.1-SNAPSHOT
-ARTIFACTS=$WORKSPACE/artifacts
-MAVEN_ARTIFACTS=$WORKSPACE/maven_artifacts
-JAVADOCS_ARTIFACTS=$WORKSPACE/javadocs
-
mkdir -p $ARTIFACTS
mkdir -p $MAVEN_ARTIFACTS
mkdir -p $JAVADOCS_ARTIFACTS
-cd $WORKSPACE/$SVN_BRANCH_DIR
-
-echo "Workspace: $WORKSPACE"
+cd $WORKSPACE/$CORE_DIR
#Package the Source and compile Binaries
#(this assumes that during the JDK 1.5 compile all tests are built, which is currently the case)
Modified: lucene/dev/nightly/hudson-lucene-trunk.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-trunk.sh?rev=1022060&r1=1022059&r2=1022060&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-trunk.sh (original)
+++ lucene/dev/nightly/hudson-lucene-trunk.sh Wed Oct 13 10:29:13 2010
@@ -4,23 +4,14 @@ set -x
. $WORKSPACE/nightly/hudson-settings.sh
-CORE_DIR=trunk/lucene
-MODULES_DIR=trunk/modules
-
#Update the Version # when doing a release
VERSION=4.0-$BUILD_ID
MAVEN_ARTIFACT_VERSION=4.0-SNAPSHOT
-ARTIFACTS=$WORKSPACE/artifacts
-MAVEN_ARTIFACTS=$WORKSPACE/maven_artifacts
-JAVADOCS_ARTIFACTS=$WORKSPACE/javadocs
-
mkdir -p $ARTIFACTS
mkdir -p $MAVEN_ARTIFACTS
mkdir -p $JAVADOCS_ARTIFACTS
-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
Modified: lucene/dev/nightly/hudson-lusolr-tests-3.x.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lusolr-tests-3.x.sh?rev=1022060&r1=1022059&r2=1022060&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lusolr-tests-3.x.sh (original)
+++ lucene/dev/nightly/hudson-lusolr-tests-3.x.sh Wed Oct 13 10:29:13 2010
@@ -4,12 +4,6 @@ set -x
. $WORKSPACE/nightly/hudson-settings.sh
-ROOT_DIR=branch_3x
-CORE_DIR=$ROOT_DIR/lucene
-SOLR_DIR=$ROOT_DIR/solr
-
-echo "Workspace: $WORKSPACE"
-
cd $WORKSPACE/$ROOT_DIR
JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \
clean
@@ -19,7 +13,7 @@ cd $WORKSPACE/$CORE_DIR
JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \
compile compile-test build-contrib
- # builds whole solr + contrib with JDK 1.5
+# builds whole solr + contrib with JDK 1.5
cd $WORKSPACE/$SOLR_DIR
JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \
compile compileTests build-contrib
Modified: lucene/dev/nightly/hudson-lusolr-tests-trunk.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lusolr-tests-trunk.sh?rev=1022060&r1=1022059&r2=1022060&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lusolr-tests-trunk.sh (original)
+++ lucene/dev/nightly/hudson-lusolr-tests-trunk.sh Wed Oct 13 10:29:13 2010
@@ -4,13 +4,6 @@ set -x
. $WORKSPACE/nightly/hudson-settings.sh
-ROOT_DIR=trunk
-CORE_DIR=$ROOT_DIR/lucene
-MODULES_DIR=$ROOT_DIR/modules
-SOLR_DIR=$ROOT_DIR/solr
-
-echo "Workspace: $WORKSPACE"
-
cd $WORKSPACE/$ROOT_DIR
JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \
clean
Modified: lucene/dev/nightly/hudson-settings.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-settings.sh?rev=1022060&r1=1022059&r2=1022060&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-settings.sh (original)
+++ lucene/dev/nightly/hudson-settings.sh Wed Oct 13 10:29:13 2010
@@ -11,3 +11,13 @@ JAVA_HOME_16=/home/hudson/tools/java/lat
#config:
TESTS_MULTIPLIER=3
+
+#dirs
+ROOT_DIR=checkout
+CORE_DIR=$ROOT_DIR/lucene
+MODULES_DIR=$ROOT_DIR/modules
+SOLR_DIR=$ROOT_DIR/solr
+
+ARTIFACTS=$WORKSPACE/artifacts
+MAVEN_ARTIFACTS=$WORKSPACE/maven_artifacts
+JAVADOCS_ARTIFACTS=$WORKSPACE/javadocs
Modified: lucene/dev/nightly/hudson-solr-3.x.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-solr-3.x.sh?rev=1022060&r1=1022059&r2=1022060&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-solr-3.x.sh (original)
+++ lucene/dev/nightly/hudson-solr-3.x.sh Wed Oct 13 10:29:13 2010
@@ -6,12 +6,7 @@ set -x
VERSION=3.1-$BUILD_ID
-SVN_SOLR_BRANCH_DIR=branch_3x/solr
-SVN_LUCENE_BRANCH_DIR=branch_3x/lucene
-
-cd $WORKSPACE/$SVN_SOLR_BRANCH_DIR
-
-echo "Workspace: $WORKSPACE"
+cd $WORKSPACE/$SOLR_DIR
#(this assumes that during the JDK 1.5 compile all tests are built, which is currently the case except for solr/contrib)
JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \
@@ -35,11 +30,11 @@ JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/an
clean generate-maven-artifacts
# just clean up lucene build to also instrument with clover:
-cd $WORKSPACE/$SVN_LUCENE_BRANCH_DIR
+cd $WORKSPACE/$CORE_DIR
$ANT_HOME/bin/ant clean
# back to solr...
-cd $WORKSPACE/$SVN_SOLR_BRANCH_DIR
+cd $WORKSPACE/$SOLR_DIR
JAVA_HOME=$JAVA_HOME_16 ANT_OPTS="-Xmx896M" $ANT_HOME/bin/ant \
-Dversion=$VERSION \
Modified: lucene/dev/nightly/hudson-solr-trunk.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-solr-trunk.sh?rev=1022060&r1=1022059&r2=1022060&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-solr-trunk.sh (original)
+++ lucene/dev/nightly/hudson-solr-trunk.sh Wed Oct 13 10:29:13 2010
@@ -6,15 +6,11 @@ set -x
VERSION=4.0-$BUILD_ID
-SVN_SOLR_BRANCH_DIR=trunk/solr
-SVN_LUCENE_BRANCH_DIR=trunk/lucene
+cd $WORKSPACE/$SOLR_DIR
+
JAVA_HOME=$JAVA_HOME_16
export JAVA_HOME
-cd $WORKSPACE/$SVN_SOLR_BRANCH_DIR
-
-echo "Workspace: $WORKSPACE"
-
$ANT_HOME/bin/ant \
-Dversion=$VERSION \
-Dlucene_version=$VERSION \
@@ -30,11 +26,11 @@ $ANT_HOME/bin/ant \
clean generate-maven-artifacts
# just clean up lucene build to also instrument with clover:
-cd $WORKSPACE/$SVN_LUCENE_BRANCH_DIR
+cd $WORKSPACE/$CORE_DIR
$ANT_HOME/bin/ant clean
# back to solr...
-cd $WORKSPACE/$SVN_SOLR_BRANCH_DIR
+cd $WORKSPACE/$SOLR_DIR
ANT_OPTS="-Xmx896M" $ANT_HOME/bin/ant \
-Dversion=$VERSION \