diff --git a/build.py b/build.py index 96eaa4f2f70..7b54dd203a9 100755 --- a/build.py +++ b/build.py @@ -110,13 +110,13 @@ def choose_omero_version(): ant. Returned as an array so that an empty value can be extended into the build command. - If OMERO_BULID is set, then "-Domero.version=${omero-version}-${OMERO_BUILD}" + If BUILD_NUMER is set, then "-Domero.version=${omero.version}-b${BUILD_NUMBER}" otherwise nothing. """ - omero_build = os.environ.get("OMERO_BUILD", "") + omero_build = os.environ.get("BUILD_NUMBER", "") if omero_build: - omero_build = "-%s" % omero_build + omero_build = "-b%s" % omero_build command = [ find_java(), "omero","-q","version" ] err = "" @@ -135,7 +135,7 @@ def choose_omero_version(): "-DEV", omero_version) return [ "-Domero.version=%s%s" % (omero_version, omero_build) ] except: - print "Error getting version for OMERO_BUILD=%s" % omero_build + print "Error getting version for BUILD_NUMBER=%s" % omero_build if err: print err sys.exit(1) diff --git a/docs/hudson/OMERO-cpp-dll.bat b/docs/hudson/OMERO-cpp-dll.bat index 35b8e9612fe..878f808cbac 100644 --- a/docs/hudson/OMERO-cpp-dll.bat +++ b/docs/hudson/OMERO-cpp-dll.bat @@ -5,7 +5,6 @@ set ICE_CONFIG=%CD%\ice.config call "C:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86 if errorlevel 1 exit /b 1 -set OMERO_BUILD=r%SVN_REVISION%-d%BUILD_NUMBER% set OMERO_CONFIG=%JOB_NAME% set ICE_HOME=c:\Ice-3.3.1-VC90 set CXXFLAGS=/DBOOST_TEST_SOURCE diff --git a/docs/hudson/OMERO-cpp.bat b/docs/hudson/OMERO-cpp.bat index 473c80a24bc..ac3de8e5c75 100644 --- a/docs/hudson/OMERO-cpp.bat +++ b/docs/hudson/OMERO-cpp.bat @@ -2,7 +2,6 @@ call "C:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86 if errorlevel 1 exit /b 1 -set OMERO_BUILD=r%SVN_REVISION%-d%BUILD_NUMBER% set OMERO_CONFIG=%JOB_NAME% set ICE_HOME=c:\Ice-3.3.1-VC90 set CXXFLAGS=/DBOOST_TEST_SOURCE diff --git a/docs/hudson/OMERO-start.sh b/docs/hudson/OMERO-start.sh index 5e3f8ff733b..6a73488e056 100644 --- a/docs/hudson/OMERO-start.sh +++ b/docs/hudson/OMERO-start.sh @@ -17,7 +17,6 @@ export ROUTER="$ROUTERPREFIX"4064 export ICE_CONFIG=`pwd`/$OMERO_BRANCH.config export OMERO_DATA=`pwd`/target/datadir -echo omero.version=$OMERO_BUILD > $ICE_CONFIG echo omero.user=hudson >> $ICE_CONFIG echo omero.pass=ome >> $ICE_CONFIG echo omero.host=$OMERO_HOST >> $ICE_CONFIG diff --git a/docs/hudson/OMERO-windows-integration.bat b/docs/hudson/OMERO-windows-integration.bat index 1e8bfcadc51..c3b0f466586 100644 --- a/docs/hudson/OMERO-windows-integration.bat +++ b/docs/hudson/OMERO-windows-integration.bat @@ -4,7 +4,6 @@ sc stop OMERO.hudson REM For fingerprinting what caused this job, we download ice.config wget ice.config -set OMERO_BUILD=r%SVN_REVISION%_w%BUILD_NUMBER% set OMERO_CONFIG=%JOB_NAME% set ICE_HOME=c:\Ice-3.3.1-VC90 set ICE_CONFIG= diff --git a/docs/hudson/OMERO-windows-matlab.bat b/docs/hudson/OMERO-windows-matlab.bat index 7a5876dc9c2..999f1ec6a9f 100644 --- a/docs/hudson/OMERO-windows-matlab.bat +++ b/docs/hudson/OMERO-windows-matlab.bat @@ -1,7 +1,6 @@ set sc stop OMERO.hudson -set OMERO_BUILD=r%SVN_REVISION%_w%BUILD_NUMBER% set OMERO_CONFIG=%JOB_NAME% set ICE_HOME=c:\Ice-3.3.1-VC90 set ICE_CONFIG= diff --git a/docs/hudson/OMERO.sh b/docs/hudson/OMERO.sh index ba619b7923d..1bd3318e3ba 100644 --- a/docs/hudson/OMERO.sh +++ b/docs/hudson/OMERO.sh @@ -10,7 +10,6 @@ set -u set -x source docs/hudson/functions.sh -export OMERO_BUILD=`git_short_rev`-b$BUILD_NUMBER echo Building $OMERO_BRANCH ./build.py clean @@ -22,7 +21,7 @@ echo Building $OMERO_BRANCH cp -f docs/styleForAPI.css /hudson/.hudson/userContent/styleForAPI.css # Log information -echo OMERO_BUILD=$OMERO_BUILD > target/$OMERO_BRANCH.log +echo BUILD_NUMBER=$BUILD_NUMBER > target/$OMERO_BRANCH.log echo OMERO_BRANCH=$OMERO_BRANCH >> target/$OMERO_BRANCH.log git_info > target/GIT_INFO env | sort >> target/GIT_INFO diff --git a/docs/hudson/README.txt b/docs/hudson/README.txt index 680ff0a645e..0ebe7c8c307 100644 --- a/docs/hudson/README.txt +++ b/docs/hudson/README.txt @@ -36,5 +36,3 @@ products. Execution is as follows: o OMERO_PREFIX - the prefix of the ports to use (e.g. 1 for 14064) - - o OMERO_BUILD - the git revision number.