From 86a72a4828ea06436d7652c66b6d3e4855d0249f Mon Sep 17 00:00:00 2001 From: jmoore Date: Fri, 4 Jan 2013 09:09:48 +0100 Subject: [PATCH] Remove IMPORTER from lib/composite.py --- lib/composite.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lib/composite.py b/lib/composite.py index 55c2eb62741..630c56b429e 100644 --- a/lib/composite.py +++ b/lib/composite.py @@ -41,15 +41,10 @@ TARGET_PREFIX = 'OMERO.clients-%s' % VERSION -IMPORTER = 'OMERO.importer' - INSIGHT = 'OMERO.insight' EDITOR = 'OMERO.editor' -# The following libraries are duplicated in Insight and Importer: -# IGNORE = "bio-formats.jar jai_imageio.jar loci-common.jar mdbtools-java.jar ome-xml.jar poi-loci.jar".split() -# IGNORE'ing them, however, causes Insight to not start. IGNORE = [] def find(pattern): @@ -124,7 +119,6 @@ def compress(target, base): target_artifacts = list() target_artifacts += find(EDITOR + "*win.zip") target_artifacts += find(INSIGHT + "*win.zip") -target_artifacts += find(IMPORTER + "*win.zip") target = '%s.win' % TARGET_PREFIX ignore = ['omero_client.jar', 'omero-clients-util-r\d+-b\d+.jar'] + IGNORE @@ -140,7 +134,6 @@ def compress(target, base): target_artifacts = list() target_artifacts += find(EDITOR + "*mac.zip") target_artifacts += find(INSIGHT + "*mac.zip") -target_artifacts += find(IMPORTER + "*mac.zip") target = '%s.mac' % TARGET_PREFIX os.makedirs(target) @@ -153,11 +146,7 @@ def compress(target, base): # target_artifacts = list() target_artifacts += find("%s-%s.zip" % (INSIGHT, VERSION)) -target_artifacts += find("%s-%s.zip" % (IMPORTER, VERSION)) target = '%s.linux' % TARGET_PREFIX -# Since Insight relies on its MANIFEST to start via the JAR, we're leaving -# libs/OmeroImporter-Beta-4.1.0-DEV.jar in the ZIP. -ignore = ['omero-clients-util-r\d+-b\d+.jar'] + IGNORE os.makedirs(target) for artifact in target_artifacts: