diff --git a/build.py b/build.py
index e6e75b7de3c..b6ecd315376 100755
--- a/build.py
+++ b/build.py
@@ -1,110 +1,111 @@
-#!/usr/bin/env python
-#
-# $Id$
-#
-# Copyright 2009 Glencoe Software, Inc. All rights reserved.
-# Use is subject to license terms supplied in LICENSE.txt
-#
-# General build scripts.
-
-import os
-import sys
-import subprocess
-
-def build_hudson():
- """
- Top-level build called by hudson for testing the
- """
- #
- # Cleaning to prevent strange hudson errors about
- # stale tests and general weirdness.
- #
- java_omero("clean")
-
- # Build & Test
- java_omero("build-all")
- java_omero("test-integration")
- java_omero("test-dist")
-
- #
- # Documentation and build reports
- #
- java_omero("release-docs")
- java_omero("release-findbugs")
- ## java_omero("release-jdepend") ## Doesn't yet work. Running from hudson
-
- #
- # Prepare a distribution
- #
- "rm -f OMERO.server-build*.zip"
- java_omero(["-f","components/tools/OmeroImporter/build.xml","release-win-zip"])
- java_omero(["-f","components/tools/OmeroImporter/build.xml","release-osx-zip"])
- java_omero("release-zip")
-
- # Install into the hudson repository
- ## Disabling until 4.1 with more work
- ## on integration
- ##java_omero("release-hudson")
-
-
-def java_omero(args):
- command = [ find_java() ]
- command.extend( calculate_memory_args() )
- command.extend(["omero"])
- command.extend(choose_omero_version())
- if isinstance(args,str):
- command.append(args)
- else:
- command.extend(args)
- execute(command)
-
-def find_java():
- return "java"
-
-def calculate_memory_args():
- return "-Xmx600M -Djavac.maxmem=600M -Djavadoc.maxmem=600M -XX:MaxPermSize=256m".split(" ")
-
-def choose_omero_version():
- """
- Returns an array specifying the build parameter for
- 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}"
- otherwise nothing.
- """
- try:
- omero_build = os.environ["OMERO_BUILD"]
- command = [ find_java() ]
- command.extend( calculate_memory_args() )
- command.extend(["omero","-q","version"])
- p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- omero_version,err = p.communicate()
- omero_version = omero_version.split()[1]
- return [ "-Domero.version=%s-%s" % (omero_version, omero_build) ]
- except KeyError, ke:
- return [] # Use default
-
-def execute(args):
- rc = subprocess.call(args)
- if rc != 0:
- sys.exit(rc)
-
-
-if __name__ == "__main__":
- #
- # If this is a hudson build, then call the special build_hudson
- # method. Otherwise, use java_omero which will specially configure
- # the build system.
- #
- args = list(sys.argv)
- args.pop(0)
-
- try:
- if len(args) > 0 and args[0] == "-hudson":
- build_hudson()
- else:
- java_omero(args)
- except KeyboardInterrupt:
- sys.stderr.write("\nCancelled by user\n")
- sys.exit(2)
+#!/usr/bin/env python
+#
+# $Id$
+#
+# Copyright 2009 Glencoe Software, Inc. All rights reserved.
+# Use is subject to license terms supplied in LICENSE.txt
+#
+# General build scripts.
+
+import os
+import sys
+import subprocess
+
+def build_hudson():
+ """
+ Top-level build called by hudson for testing the
+ """
+ #
+ # Cleaning to prevent strange hudson errors about
+ # stale tests and general weirdness.
+ #
+ java_omero("clean")
+
+ # Build & Test
+ java_omero("build-all")
+ java_omero("test-integration")
+ java_omero("test-dist")
+
+ #
+ # Documentation and build reports
+ #
+ java_omero("release-docs")
+ java_omero("release-findbugs")
+ ## java_omero("release-jdepend") ## Doesn't yet work. Running from hudson
+
+ #
+ # Prepare a distribution
+ #
+ "rm -f OMERO.server-build*.zip"
+ java_omero(["-f","components/tools/OmeroImporter/build.xml","release-win-zip"])
+ java_omero(["-f","components/tools/OmeroImporter/build.xml","release-osx-zip"])
+ java_omero("release-zip")
+
+ # Install into the hudson repository
+ ## Disabling until 4.1 with more work
+ ## on integration
+ ##java_omero("release-hudson")
+
+
+def java_omero(args):
+ command = [ find_java() ]
+ command.extend( calculate_memory_args() )
+ command.extend(["omero"])
+ command.extend(choose_omero_version())
+ if isinstance(args,str):
+ command.append(args)
+ else:
+ command.extend(args)
+ execute(command)
+
+def find_java():
+ return "java"
+
+def calculate_memory_args():
+ return "-Xmx600M -Djavac.maxmem=600M -Djavadoc.maxmem=600M -XX:MaxPermSize=256m".split(" ")
+
+def choose_omero_version():
+ """
+ Returns an array specifying the build parameter for
+ 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}"
+ otherwise nothing.
+ """
+ try:
+ omero_build = os.environ["OMERO_BUILD"]
+ command = [ find_java() ]
+ command.extend( calculate_memory_args() )
+ command.extend(["omero","-q","version"])
+ p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ omero_version,err = p.communicate()
+ omero_version = omero_version.split()[1]
+ return [ "-Domero.version=%s-%s" % (omero_version, omero_build) ]
+ except KeyError, ke:
+ return [] # Use default
+
+def execute(args):
+ rc = subprocess.call(args)
+ if rc != 0:
+ sys.exit(rc)
+
+
+
+if __name__ == "__main__":
+ #
+ # If this is a hudson build, then call the special build_hudson
+ # method. Otherwise, use java_omero which will specially configure
+ # the build system.
+ #
+ args = list(sys.argv)
+ args.pop(0)
+
+ try:
+ if len(args) > 0 and args[0] == "-hudson":
+ build_hudson()
+ else:
+ java_omero(args)
+ except KeyboardInterrupt:
+ sys.stderr.write("\nCancelled by user\n")
+ sys.exit(2)
diff --git a/components/blitz/build.xml b/components/blitz/build.xml
index fed17b50ab0..95c099d7837 100644
--- a/components/blitz/build.xml
+++ b/components/blitz/build.xml
@@ -1,219 +1,221 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/tools/OmeroPy/build.xml b/components/tools/OmeroPy/build.xml
index f51088603ff..99d9efd82f2 100644
--- a/components/tools/OmeroPy/build.xml
+++ b/components/tools/OmeroPy/build.xml
@@ -40,9 +40,9 @@
-
+
diff --git a/components/tools/OmeroWeb/ez_setup.py b/components/tools/OmeroWeb/ez_setup.py
new file mode 100755
index 00000000000..d24e845e58d
--- /dev/null
+++ b/components/tools/OmeroWeb/ez_setup.py
@@ -0,0 +1,276 @@
+#!python
+"""Bootstrap setuptools installation
+
+If you want to use setuptools in your package's setup.py, just include this
+file in the same directory with it, and add this to the top of your setup.py::
+
+ from ez_setup import use_setuptools
+ use_setuptools()
+
+If you want to require a specific version of setuptools, set a download
+mirror, or use an alternate download directory, you can do so by supplying
+the appropriate options to ``use_setuptools()``.
+
+This file can also be run as a script to install or upgrade setuptools.
+"""
+import sys
+DEFAULT_VERSION = "0.6c9"
+DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
+
+md5_data = {
+ 'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
+ 'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
+ 'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
+ 'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
+ 'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
+ 'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
+ 'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
+ 'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
+ 'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
+ 'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
+ 'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
+ 'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
+ 'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
+ 'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
+ 'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
+ 'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f',
+ 'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2',
+ 'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc',
+ 'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
+ 'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
+ 'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
+ 'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20',
+ 'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab',
+ 'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
+ 'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2',
+ 'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e',
+ 'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372',
+ 'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902',
+ 'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de',
+ 'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b',
+ 'setuptools-0.6c9-py2.3.egg': 'a83c4020414807b496e4cfbe08507c03',
+ 'setuptools-0.6c9-py2.4.egg': '260a2be2e5388d66bdaee06abec6342a',
+ 'setuptools-0.6c9-py2.5.egg': 'fe67c3e5a17b12c0e7c541b7ea43a8e6',
+ 'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a',
+}
+
+import sys, os
+try: from hashlib import md5
+except ImportError: from md5 import md5
+
+def _validate_md5(egg_name, data):
+ if egg_name in md5_data:
+ digest = md5(data).hexdigest()
+ if digest != md5_data[egg_name]:
+ print >>sys.stderr, (
+ "md5 validation of %s failed! (Possible download problem?)"
+ % egg_name
+ )
+ sys.exit(2)
+ return data
+
+def use_setuptools(
+ version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
+ download_delay=15
+):
+ """Automatically find/download setuptools and make it available on sys.path
+
+ `version` should be a valid setuptools version number that is available
+ as an egg for download under the `download_base` URL (which should end with
+ a '/'). `to_dir` is the directory where setuptools will be downloaded, if
+ it is not already available. If `download_delay` is specified, it should
+ be the number of seconds that will be paused before initiating a download,
+ should one be required. If an older version of setuptools is installed,
+ this routine will print a message to ``sys.stderr`` and raise SystemExit in
+ an attempt to abort the calling script.
+ """
+ was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules
+ def do_download():
+ egg = download_setuptools(version, download_base, to_dir, download_delay)
+ sys.path.insert(0, egg)
+ import setuptools; setuptools.bootstrap_install_from = egg
+ try:
+ import pkg_resources
+ except ImportError:
+ return do_download()
+ try:
+ pkg_resources.require("setuptools>="+version); return
+ except pkg_resources.VersionConflict, e:
+ if was_imported:
+ print >>sys.stderr, (
+ "The required version of setuptools (>=%s) is not available, and\n"
+ "can't be installed while this script is running. Please install\n"
+ " a more recent version first, using 'easy_install -U setuptools'."
+ "\n\n(Currently using %r)"
+ ) % (version, e.args[0])
+ sys.exit(2)
+ else:
+ del pkg_resources, sys.modules['pkg_resources'] # reload ok
+ return do_download()
+ except pkg_resources.DistributionNotFound:
+ return do_download()
+
+def download_setuptools(
+ version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
+ delay = 15
+):
+ """Download setuptools from a specified location and return its filename
+
+ `version` should be a valid setuptools version number that is available
+ as an egg for download under the `download_base` URL (which should end
+ with a '/'). `to_dir` is the directory where the egg will be downloaded.
+ `delay` is the number of seconds to pause before an actual download attempt.
+ """
+ import urllib2, shutil
+ egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
+ url = download_base + egg_name
+ saveto = os.path.join(to_dir, egg_name)
+ src = dst = None
+ if not os.path.exists(saveto): # Avoid repeated downloads
+ try:
+ from distutils import log
+ if delay:
+ log.warn("""
+---------------------------------------------------------------------------
+This script requires setuptools version %s to run (even to display
+help). I will attempt to download it for you (from
+%s), but
+you may need to enable firewall access for this script first.
+I will start the download in %d seconds.
+
+(Note: if this machine does not have network access, please obtain the file
+
+ %s
+
+and place it in this directory before rerunning this script.)
+---------------------------------------------------------------------------""",
+ version, download_base, delay, url
+ ); from time import sleep; sleep(delay)
+ log.warn("Downloading %s", url)
+ src = urllib2.urlopen(url)
+ # Read/write all in one block, so we don't create a corrupt file
+ # if the download is interrupted.
+ data = _validate_md5(egg_name, src.read())
+ dst = open(saveto,"wb"); dst.write(data)
+ finally:
+ if src: src.close()
+ if dst: dst.close()
+ return os.path.realpath(saveto)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+def main(argv, version=DEFAULT_VERSION):
+ """Install or upgrade setuptools and EasyInstall"""
+ try:
+ import setuptools
+ except ImportError:
+ egg = None
+ try:
+ egg = download_setuptools(version, delay=0)
+ sys.path.insert(0,egg)
+ from setuptools.command.easy_install import main
+ return main(list(argv)+[egg]) # we're done here
+ finally:
+ if egg and os.path.exists(egg):
+ os.unlink(egg)
+ else:
+ if setuptools.__version__ == '0.0.1':
+ print >>sys.stderr, (
+ "You have an obsolete version of setuptools installed. Please\n"
+ "remove it from your system entirely before rerunning this script."
+ )
+ sys.exit(2)
+
+ req = "setuptools>="+version
+ import pkg_resources
+ try:
+ pkg_resources.require(req)
+ except pkg_resources.VersionConflict:
+ try:
+ from setuptools.command.easy_install import main
+ except ImportError:
+ from easy_install import main
+ main(list(argv)+[download_setuptools(delay=0)])
+ sys.exit(0) # try to force an exit
+ else:
+ if argv:
+ from setuptools.command.easy_install import main
+ main(argv)
+ else:
+ print "Setuptools version",version,"or greater has been installed."
+ print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
+
+def update_md5(filenames):
+ """Update our built-in md5 registry"""
+
+ import re
+
+ for name in filenames:
+ base = os.path.basename(name)
+ f = open(name,'rb')
+ md5_data[base] = md5(f.read()).hexdigest()
+ f.close()
+
+ data = [" %r: %r,\n" % it for it in md5_data.items()]
+ data.sort()
+ repl = "".join(data)
+
+ import inspect
+ srcfile = inspect.getsourcefile(sys.modules[__name__])
+ f = open(srcfile, 'rb'); src = f.read(); f.close()
+
+ match = re.search("\nmd5_data = {\n([^}]+)}", src)
+ if not match:
+ print >>sys.stderr, "Internal error!"
+ sys.exit(2)
+
+ src = src[:match.start(1)] + repl + src[match.end(1):]
+ f = open(srcfile,'w')
+ f.write(src)
+ f.close()
+
+
+if __name__=='__main__':
+ if len(sys.argv)>2 and sys.argv[1]=='--md5update':
+ update_md5(sys.argv[2:])
+ else:
+ main(sys.argv[1:])
+
+
+
+
+
+
diff --git a/components/tools/OmeroWeb/setup.py b/components/tools/OmeroWeb/setup.py
new file mode 100755
index 00000000000..9a090559264
--- /dev/null
+++ b/components/tools/OmeroWeb/setup.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+"""
+ Copyright 2008 Glencoe Software, Inc. All rights reserved.
+ Use is subject to license terms supplied in LICENSE.txt
+
+"""
+
+from ez_setup import use_setuptools
+use_setuptools()
+from setuptools import setup
+from omero_version import omero_version as ov
+
+setup(name="OmeroWeb",
+ version=ov,
+ description="OmeroWeb",
+ long_description="""\
+OmeroWeb is the container of the web clients for OMERO."
+""",
+ author="Aleksandra Tarkowska",
+ author_email="",
+ url="https://trac.openmicroscopy.org.uk/omero/wiki/OmeroWeb",
+ download_url="https://trac.openmicroscopy.org.uk/omero/wiki/OmeroWeb",
+ packages=[''],
+ test_suite='test.suite'
+)
+
diff --git a/components/tools/python.xml b/components/tools/python.xml
index 8b080c2a57f..d363f42bca7 100644
--- a/components/tools/python.xml
+++ b/components/tools/python.xml
@@ -1,97 +1,97 @@
-
-
-
- Entering ${basedir}...
-
-
-
-
-
-
- omero_version="${omero.version}"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Not yet implemented
-
-
-
+
+
+
+ Entering ${basedir}...
+
+
+
+
+
+
+ omero_version="${omero.version}"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Not yet implemented
+
+
+