Skip to content

Commit e2ccf37

Browse files
yadvrPrasanna Santhanam
authored andcommitted
waf: Remove old code that fails build
The code is unnecessary and fails a build if it could not locate tomcat or import MySQLdb Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com> Signed-off-by: Prasanna Santhanam <tsp@apache.org>
1 parent c5a25a2 commit e2ccf37

1 file changed

Lines changed: 0 additions & 13 deletions

File tree

wscript_configure

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -222,19 +222,6 @@ conf.check_tool('java')
222222
conf.check_tool("python")
223223
conf.check_python_version((2,4,0))
224224

225-
conf.check_message_1('Detecting Python MySQL module')
226-
try: import MySQLdb
227-
except ImportError,e:
228-
raise Configure.ConfigurationError, "The Python MySQLdb module could not be found.\nOn Linux: ./waf installrpmdeps or ./waf installdebdeps according to your distro's package format.\nOn Windows: Install MySQL 5.1 on your machine, then install the Python MySQLdb module for Python %s.\nThe module for Python 2.6 / win32 / MySQL 5.1 is available here: http://soemin.googlecode.com/files/MySQL-python-1.2.3c1.win32-py2.6.exe"%conf.env.PYTHON_VERSION
229-
conf.check_message_2('MySQLdb','GREEN')
230-
conf.check_message_1('Database info for developer setup')
231-
for a in "DBHOST DBUSER DBPW".split(): conf.env[a] = getattr(Options.options, a, '')
232-
conf.check_message_2("user: %r, password: %r, host: %r"%(conf.env.DBUSER,conf.env.DBPW,conf.env.DBHOST),'GREEN')
233-
234-
try: conf.check_tool("tomcat")
235-
except Configure.ConfigurationError,e:
236-
conf.fatal("Tomcat directory %r not found. Either install Tomcat using ./waf installrpmdeps or ./waf installdebdeps, or manually install Tomcat to a directory in your system and set the environment variable TOMCAT_HOME to point to it."%conf.env.TOMCATHOME)
237-
238225
conf.env.COMMONPATH = _join(conf.env.PACKAGE,"common")
239226
conf.env.AGENTPATH = _join(conf.env.PACKAGE,"agent")
240227
conf.env.CPPATH = _join(conf.env.PACKAGE,"console-proxy")

0 commit comments

Comments
 (0)