Skip to content

Commit

Permalink
Added FC3.4-RC1 url to buildouit.cfg, updated install script
Browse files Browse the repository at this point in the history
--HG--
extra : convert_revision : svn%3A882ca7fe-3cf8-0310-95c5-f9aabef819dd/fcrepo/trunk%4044000
  • Loading branch information
govert@882ca7fe-3cf8-0310-95c5-f9aabef819dd committed Jul 27, 2010
1 parent 2fd9fe7 commit d0d7335
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
12 changes: 10 additions & 2 deletions buildout.cfg
@@ -1,16 +1,24 @@
[buildout]
develop = .
parts = java-dependencies test py
#parts = fc3.3 test py
parts = fc3.4-RC1 test py
prefer-final = true
eggs = fcrepo

[java-dependencies]
[fc3.3]
recipe = hexagonit.recipe.download
md5sum = 5c8d79c4f576e38f745642276bb5a46c
url = http://downloads.sourceforge.net/project/fedora-commons/fedora/3.3/fcrepo-installer-3.3.jar
ignore-existing = true
download-only = true

[fc3.4-RC1]
recipe = hexagonit.recipe.download
md5sum = b1639ab6145b0a054c8d84e959d505b1
url = http://downloads.sourceforge.net/project/fedora-commons/fedora/3.4-RC1/fcrepo-installer-3.4-RC1.jar
ignore-existing = true
download-only = true

[test]
recipe = zc.recipe.testrunner
eggs = ${buildout:eggs}
Expand Down
6 changes: 5 additions & 1 deletion src/fcrepo/scripts.py
Expand Up @@ -35,9 +35,13 @@
FEDORA_PASSWD = 'fedoraAdmin'

def install_fedora():
jarfile = os.path.join(os.getcwd(), 'parts', 'java-dependencies',
jarfile = os.path.join(os.getcwd(), 'parts', 'fc3.3',
'fcrepo-installer-3.3.jar')

if not os.path.isfile(jarfile):
jarfile = os.path.join(os.getcwd(), 'parts', 'fc3.4-RC1',
'fcrepo-installer-3.4-RC1.jar')

if not os.path.isfile(jarfile):
print >> sys.stderr, ('fcrepo-installer-3.3.jar is missing, '
'run buildout first')
Expand Down

0 comments on commit d0d7335

Please sign in to comment.