Skip to content

Commit

Permalink
Remove IMPORTER from lib/composite.py
Browse files Browse the repository at this point in the history
  • Loading branch information
joshmoore committed Jan 4, 2013
1 parent a71b04d commit 86a72a4
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions lib/composite.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -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:
Expand Down

0 comments on commit 86a72a4

Please sign in to comment.