From 8c2126e1f0a860ed85ad74d5a0b2aa8b3485789f Mon Sep 17 00:00:00 2001 From: Pedro Ferreira Date: Fri, 2 Dec 2011 15:33:14 +0100 Subject: [PATCH] [FIX] Generation script --- generate.sh | 4 ++-- indico/MaKaC/consoleScripts/installBase.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/generate.sh b/generate.sh index e1f15e19d..adc33055f 100755 --- a/generate.sh +++ b/generate.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Generates Python eggs for 2.4, 2.5 and 2.6 +# Generates Python eggs for 2.6 and 2.7 # -d can be passed for 'nighly builds', so that the current date is appended DATEOPT= @@ -12,7 +12,7 @@ do esac done -for EXECUTABLE in python2.6 python2.5 python2.4; do +for EXECUTABLE in python2.6 python2.7; do $EXECUTABLE setup.py egg_info $DATEOPT bdist_egg EGG_NAME=dist/`$EXECUTABLE setup.py egg_filename | tail -n 1`.egg md5sum $EGG_NAME | sh -c 'read a; echo ${a%% *}' > $EGG_NAME.md5 diff --git a/indico/MaKaC/consoleScripts/installBase.py b/indico/MaKaC/consoleScripts/installBase.py index aa3beb2d1..9e4c7d21b 100644 --- a/indico/MaKaC/consoleScripts/installBase.py +++ b/indico/MaKaC/consoleScripts/installBase.py @@ -206,7 +206,7 @@ def jsCompress(): '''Packs and minifies javascript files''' try: - pkg_resources.require('jstools') + pkg_resources.require('JSTools') except pkg_resources.DistributionNotFound: print """ JSTools not found! JSTools is needed for JavaScript compression, if you're building Indico from source. Please install it. -- 2.11.4.GIT