From 10a3a5300c653e78b1ff8c2b5fa9aa8cc5c276b4 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Sun, 11 Apr 2010 02:22:15 +0000 Subject: [PATCH] Improved the hm command a little more (made argument handling easier) --- build/commands.py | 1322 ++++++++++++++++++++++++--------------------- hm.py | 73 +-- 2 files changed, 736 insertions(+), 659 deletions(-) diff --git a/build/commands.py b/build/commands.py index bca459d8..4f8bf1e1 100644 --- a/build/commands.py +++ b/build/commands.py @@ -1,683 +1,751 @@ +# TODO: split this file up, it's too long! + import sys, os, ConfigParser, subprocess, shutil +from getopt import getopt -if sys.platform == 'win32': - import _winreg +class InternalCommands: -project = 'synergy-plus' -setup_version = 3 -website_url = 'http://code.google.com/p/synergy-plus' + project = 'synergy-plus' + setup_version = 3 + website_url = 'http://code.google.com/p/synergy-plus' -this_cmd = 'hm' -cmake_cmd = 'cmake' + this_cmd = 'hm' + cmake_cmd = 'cmake' -make_cmd = 'make' -xcodebuild_cmd = 'xcodebuild' + make_cmd = 'make' + xcodebuild_cmd = 'xcodebuild' -source_dir = '..' # Source, relative to build. -cmake_dir = 'cmake' -bin_dir = 'bin' + source_dir = '..' # Source, relative to build. + cmake_dir = 'cmake' + bin_dir = 'bin' -sln_filename = '%s.sln' % project -xcodeproj_filename = '%s.xcodeproj' % project -config_filename = '%s.cfg' % this_cmd + sln_filename = '%s.sln' % project + xcodeproj_filename = '%s.xcodeproj' % project + config_filename = '%s.cfg' % this_cmd -# try_chdir(...) and restore_chdir() will use this -prevdir = '' + # try_chdir(...) and restore_chdir() will use this + prevdir = '' -win32_generators = { - '1' : 'Visual Studio 10', - '2' : 'Visual Studio 10 Win64', - '3' : 'Visual Studio 9 2008', - '4' : 'Visual Studio 9 2008 Win64', - '5' : 'Visual Studio 8 2005', - '6' : 'Visual Studio 8 2005 Win64', - '7' : 'Visual Studio 7', - '8' : 'Visual Studio 7 .NET 2003', - '9' : 'Visual Studio 6', - '10' : 'CodeBlocks - MinGW Makefiles', - '11' : 'CodeBlocks - Unix Makefiles', - '12': 'Eclipse CDT4 - MinGW Makefiles', - '13': 'Eclipse CDT4 - NMake Makefiles', - '14': 'Eclipse CDT4 - Unix Makefiles', - '15': 'MinGW Makefiles', - '16': 'NMake Makefiles', - '17': 'Unix Makefiles', - '18': 'Borland Makefiles', - '19': 'MSYS Makefiles', - '20': 'Watcom WMake', -} + win32_generators = { + '1' : 'Visual Studio 10', + '2' : 'Visual Studio 10 Win64', + '3' : 'Visual Studio 9 2008', + '4' : 'Visual Studio 9 2008 Win64', + '5' : 'Visual Studio 8 2005', + '6' : 'Visual Studio 8 2005 Win64', + '7' : 'Visual Studio 7', + '8' : 'Visual Studio 7 .NET 2003', + '9' : 'Visual Studio 6', + '10' : 'CodeBlocks - MinGW Makefiles', + '11' : 'CodeBlocks - Unix Makefiles', + '12': 'Eclipse CDT4 - MinGW Makefiles', + '13': 'Eclipse CDT4 - NMake Makefiles', + '14': 'Eclipse CDT4 - Unix Makefiles', + '15': 'MinGW Makefiles', + '16': 'NMake Makefiles', + '17': 'Unix Makefiles', + '18': 'Borland Makefiles', + '19': 'MSYS Makefiles', + '20': 'Watcom WMake', + } -unix_generators = { - '1' : 'Unix Makefiles', - '2' : 'CodeBlocks - Unix Makefiles', - '3' : 'Eclipse CDT4 - Unix Makefiles', - '4' : 'KDevelop3', - '5' : 'KDevelop3 - Unix Makefiles', -} + unix_generators = { + '1' : 'Unix Makefiles', + '2' : 'CodeBlocks - Unix Makefiles', + '3' : 'Eclipse CDT4 - Unix Makefiles', + '4' : 'KDevelop3', + '5' : 'KDevelop3 - Unix Makefiles', + } -darwin_generators = { - '1' : 'Xcode', - '2' : 'Unix Makefiles', - '3' : 'CodeBlocks - Unix Makefiles', - '4' : 'Eclipse CDT4 - Unix Makefiles', - '5' : 'KDevelop3', - '6' : 'KDevelop3 - Unix Makefiles', -} + darwin_generators = { + '1' : 'Xcode', + '2' : 'Unix Makefiles', + '3' : 'CodeBlocks - Unix Makefiles', + '4' : 'Eclipse CDT4 - Unix Makefiles', + '5' : 'KDevelop3', + '6' : 'KDevelop3 - Unix Makefiles', + } -def config_filepath(): - return '%s/%s' % (bin_dir, config_filename) + def config_filepath(self): + return '%s/%s' % (self.bin_dir, self.config_filename) -def sln_filepath(): - return '%s\%s' % (bin_dir, sln_filename) + def sln_filepath(self): + return '%s\%s' % (self.bin_dir, self.sln_filename) -def xcodeproj_filepath(): - return '%s/%s' % (bin_dir, xcodeproj_filename) - -def usage(argv): - app = sys.argv[0] - print ('Usage: %s [command]\n' - '\n' - 'Replace [command] with one of:\n' - ' about Show information about this script\n' - ' setup Runs the initial setup for this script\n' - ' configure Runs cmake (generates project files)\n' - ' open Attempts to open the generated project file\n' - ' build Builds using the platform build chain\n' - ' clean Cleans using the platform build chain\n' - ' destroy Destroy all temporary files (bin and build)\n' - ' kill Kills all synergy processes (run as admin)\n' - ' update Updates the source code from repository\n' - ' revision Display the current source code revision\n' - ' package Create a distribution package (e.g. tar.gz)\n' - ' install Installs the program\n' - ' hammer Golden hammer (config, build, package)\n' - ' reformat Reformat .cpp and .h files using AStyle\n' - ' usage Shows the help screen\n' - '\n' - 'Example: %s configure' - ) % (app, app) - -def configure(argv, generator = None): - - err = configure_internal(generator) - - if err == 0: - print ('Configure complete!\n\n' - 'Open project now: %s open\n' - 'Command line build: %s build' - ) % (this_cmd, this_cmd) - return True - else: - return False - -# TODO: handle svn not installed -# TODO: implement for other platforms -def persist_cmake(): - if sys.platform == 'win32': - - version = '2.8.0' - found_cmd = '' - for test_cmd in (cmake_cmd, r'tool\cmake\bin\%s' % cmake_cmd): - print 'Testing for CMake version %s at `%s`...' % (version, test_cmd) - p = subprocess.Popen([test_cmd, '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) - stdout, stderr = p.communicate() - if p.returncode == 0 and stdout == 'cmake version %s\r\n' % version: - # found one that works, hurrah! - print 'Found valid CMake version' - found_cmd = test_cmd - # HACK: gotta go out so just hacking this for now - if found_cmd == r'tool\cmake\bin\%s' % cmake_cmd: - found_cmd = r'..\tool\cmake\bin\%s' % cmake_cmd - break + def xcodeproj_filepath(self): + return '%s/%s' % (self.bin_dir, self.xcodeproj_filename) - if not found_cmd: - msg = 'CMake 2.8.0 not installed. Auto download now? [Y/n]' - print msg, + def usage(self): + app = sys.argv[0] + print ('Usage: %s [command]\n' + '\n' + 'Replace [command] with one of:\n' + ' about Show information about this script\n' + ' setup Runs the initial setup for this script\n' + ' conf Runs cmake (generates project files)\n' + ' open Attempts to open the generated project file\n' + ' build Builds using the platform build chain\n' + ' clean Cleans using the platform build chain\n' + ' destroy Destroy all temporary files (bin and build)\n' + ' kill Kills all synergy processes (run as admin)\n' + ' update Updates the source code from repository\n' + ' revision Display the current source code revision\n' + ' package Create a distribution package (e.g. tar.gz)\n' + ' install Installs the program\n' + ' hammer Golden hammer (config, build, package)\n' + ' reformat Reformat .cpp and .h files using AStyle\n' + ' usage Shows the help screen\n' + '\n' + 'Example: %s conf' + ) % (app, app) - yn = raw_input() - if yn in ['n', 'N']: - print 'Cannot continue without CMake, exiting.' - sys.exit(1) + def configure(self, generator): + err = self.configure_internal(generator) + + if err == 0: + print ('Configure complete!\n\n' + 'Open project now: %s open\n' + 'Command line build: %s build' + ) % (self.this_cmd, self.this_cmd) + return True + else: + return False + + # TODO: handle svn not installed + # TODO: implement for other platforms + def persist_cmake(self): + if sys.platform == 'win32': + + version = '2.8.0' + found_cmd = '' + for test_cmd in (self.cmake_cmd, r'tool\cmake\bin\%s' % self.cmake_cmd): + print 'Testing for CMake version %s at `%s`...' % (version, test_cmd) + p = subprocess.Popen([test_cmd, '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) + stdout, stderr = p.communicate() + if p.returncode == 0 and stdout == 'cmake version %s\r\n' % version: + # found one that works, hurrah! + print 'Found valid CMake version' + found_cmd = test_cmd + # HACK: gotta go out so just hacking this for now + if found_cmd == r'tool\cmake\bin\%s' % self.cmake_cmd: + found_cmd = r'..\tool\cmake\bin\%s' % self.cmake_cmd + break + + if not found_cmd: + msg = 'CMake 2.8.0 not installed. Auto download now? [Y/n]' + print msg, + + yn = raw_input() + if yn in ['n', 'N']: + print 'Cannot continue without CMake, exiting.' + sys.exit(1) + else: + if not os.path.exists('tool'): + os.mkdir('tool') + os.system(r'svn checkout https://synergy-plus.googlecode.com/svn/tools/win/cmake tool\cmake') + found_cmd = r'tool\cmake\bin\%s' % found_cmd + + return found_cmd + else: + return self.cmake_cmd + + def configure_internal(self, generator = None): + + self.ensure_setup_latest(generator) + _cmake_cmd = self.persist_cmake() + generator = self.get_generator() + + if generator != '': + cmake_args = '%s -G "%s"' % (self.source_dir, generator) + else: + cmake_args = self.source_dir + + cmake_cmd_string = '%s %s' % (_cmake_cmd, cmake_args) + + print "Configuring with CMake (%s)..." % cmake_cmd_string + + # Run from build dir so we have an out-of-source build. + self.try_chdir(self.bin_dir) + err = os.system(cmake_cmd_string) + self.restore_chdir() + + if err != 0: + print 'CMake encountered error:', err + else: + self.set_conf_run() + + return err; + + def build(self, mode = None): + + self.ensure_setup_latest() + + if not self.has_conf_run(): + if self.configure_internal() != 0: + return False + + generator = self.get_generator() + + if generator == "Unix Makefiles": + + print 'Building with GNU Make...' + self.try_chdir(self.bin_dir) + err = os.system(make_cmd) + self.restore_chdir() + + if err == 0: + return True else: - if not os.path.exists('tool'): - os.mkdir('tool') - os.system(r'svn checkout https://synergy-plus.googlecode.com/svn/tools/win/cmake tool\cmake') - found_cmd = r'tool\cmake\bin\%s' % found_cmd - - return found_cmd - else: - return cmake_cmd + print 'GNU Make failed:', err + return False -def configure_internal(generator = None): - - ensure_setup_latest(generator) - _cmake_cmd = persist_cmake() - generator = get_generator() - - if generator != '': - cmake_args = '%s -G "%s"' % (source_dir, generator) - else: - cmake_args = source_dir - - cmake_cmd_string = '%s %s' % (_cmake_cmd, cmake_args) - - print "Configuring with CMake (%s)..." % cmake_cmd_string - - # Run from build dir so we have an out-of-source build. - try_chdir(bin_dir) - err = os.system(cmake_cmd_string) - restore_chdir() - - if err != 0: - print 'CMake encountered error:', err - else: - set_conf_run() - - return err; - -def build(mode): - - ensure_setup_latest() - - if not has_conf_run(): - if configure_internal() != 0: - return False - - generator = get_generator() - - if generator == "Unix Makefiles": - - print 'Building with GNU Make...' - try_chdir(bin_dir) - err = os.system(make_cmd) - restore_chdir() - - if err == 0: - return True - else: - print 'GNU Make failed:', err - return False - - elif generator.startswith('Visual Studio 10') or generator.startswith('Visual Studio 8') or generator.startswith('Visual Studio 9'): - - ret = run_vcbuild(generator, mode) - - if ret == 0: - return True - else: - print 'VCBuild failed:', ret - return False - - elif generator == 'Xcode': - - print 'Building with Xcode...' - try_chdir(bin_dir) - err = os.system(xcodebuild_cmd) - restore_chdir() - - if err == 0: - return True - else: - print 'Xcode failed:', err - return False - - else: - print 'Not supported with generator:',generator - return False - -def clean(mode): - - generator = get_generator() - - if generator == "Unix Makefiles": - - print 'Cleaning with GNU Make...' - try_chdir(bin_dir) - err = os.system(make_cmd + ' clean') - restore_chdir() - - if err == 0: - return True - else: - print 'GNU Make failed: %s' % err - return False - - elif generator.startswith('Visual Studio 10'): - - ret = run_vcbuild(generator, mode, '/target:clean') - - if ret == 0: - return True - else: - print 'VCBuild failed:', ret - return False - - elif generator.startswith('Visual Studio 8') or generator.startswith('Visual Studio 9'): - - ret = run_vcbuild(generator, mode, '/clean') - - if ret == 0: - return True - else: - print 'VCBuild failed:', ret - return False - - elif generator == 'Xcode': - - print 'Cleaning with Xcode...' - try_chdir(bin_dir) - err = os.system(xcodebuild_cmd + ' clean') - restore_chdir() - - if err == 0: - return True - else: - print 'XCode failed:', err - return False - - else: - print 'clean: Not supported on platform:',sys.platform - return False - -def open_project(): - generator = get_generator() - if generator.startswith('Visual Studio'): - open_project_internal(sln_filepath()) - return True - elif generator.startswith('Xcode'): - open_project_internal(xcodeproj_filepath(), 'open') - return True - else: - print 'Not supported with generator:',generator - return False - -def update(): - print "Running Subversion update..." - os.system('svn update') - -def revision(): - # While this doesn't print out the revision specifically, it will do. - os.system('svn info') - -def destroy(argv): - msg = "Are you sure you want to remove the ./bin/ directory? [y/N]" - print msg, - - yn = raw_input() - if yn in ['y', 'Y']: - try: - shutil.rmtree(bin_dir) - except: - print "Warning: Could not remove ./bin/ directory." - -def kill(): - if sys.platform == 'win32': - os.system('taskkill /F /FI "IMAGENAME eq synergy*"') - return True - else: - print 'kill: Error: Command not implemented for current platform' - return False + elif generator.startswith('Visual Studio 10') or generator.startswith('Visual Studio 8') or generator.startswith('Visual Studio 9'): -def package(type): + ret = self.run_vcbuild(generator, mode) + + if ret == 0: + return True + else: + print 'VCBuild failed:', ret + return False - # Package is supported by default. - package_unsupported = False + elif generator == 'Xcode': - if type == None: - package_usage() - elif type == 'src': - if sys.platform in ['linux2', 'darwin']: - package_tgz() + print 'Building with Xcode...' + self.try_chdir(self.bin_dir) + err = os.system(xcodebuild_cmd) + self.restore_chdir() + + if err == 0: + return True + else: + print 'Xcode failed:', err + return False + else: - package_unsupported = True - elif type == 'rpm': - if sys.platform == 'linux2': - package_rpm() + print 'Not supported with generator:',generator + return False + + def clean(self, mode = None): + + generator = self.get_generator() + + if generator == "Unix Makefiles": + + print 'Cleaning with GNU Make...' + self.try_chdir(self.bin_dir) + err = os.system(make_cmd + ' clean') + self.restore_chdir() + + if err == 0: + return True + else: + print 'GNU Make failed: %s' % err + return False + + elif generator.startswith('Visual Studio 10'): + + ret = self.run_vcbuild(generator, mode, '/target:clean') + + if ret == 0: + return True + else: + print 'VCBuild failed:', ret + return False + + elif generator.startswith('Visual Studio 8') or generator.startswith('Visual Studio 9'): + + ret = self.run_vcbuild(generator, mode, '/clean') + + if ret == 0: + return True + else: + print 'VCBuild failed:', ret + return False + + elif generator == 'Xcode': + + print 'Cleaning with Xcode...' + self.try_chdir(self.bin_dir) + err = os.system(xcodebuild_cmd + ' clean') + self.restore_chdir() + + if err == 0: + return True + else: + print 'XCode failed:', err + return False + else: - package_unsupported = True - elif type == 'deb': - if sys.platform == 'linux2': - package_deb() + print 'clean: Not supported on platform:',sys.platform + return False + + def open(self): + generator = self.get_generator() + if generator.startswith('Visual Studio'): + print 'Opening with %s...' % generator + self.open_internal(self.sln_filepath()) + return True + elif generator.startswith('Xcode'): + print 'Opening with %s...' % generator + self.open_internal(xcodeproj_filepath(), 'open') + return True else: - package_unsupported = True - elif type == 'win': + print 'Not supported with generator:',generator + return False + + def update(self): + print "Running Subversion update..." + os.system('svn update') + + def revision(self): + # While this doesn't print out the revision specifically, it will do. + os.system('svn info') + + def destroy(argv): + msg = "Are you sure you want to remove the ./bin/ directory? [y/N]" + print msg, + + yn = raw_input() + if yn in ['y', 'Y']: + try: + shutil.rmtree(self.bin_dir) + except: + print "Warning: Could not remove ./bin/ directory." + + def kill(self): if sys.platform == 'win32': - package_win() + os.system('taskkill /F /FI "IMAGENAME eq synergy*"') + return True else: - package_unsupported = True - elif type == 'mac': - if sys.platform == 'darwin': - package_mac() + print 'kill: Error: Command not implemented for current platform' + return False + + def package(self, type): + + # Package is supported by default. + package_unsupported = False + + if type == None: + self.package_usage() + elif type == 'src': + if sys.platform in ['linux2', 'darwin']: + self.package_tgz() + else: + package_unsupported = True + elif type == 'rpm': + if sys.platform == 'linux2': + self.package_rpm() + else: + package_unsupported = True + elif type == 'deb': + if sys.platform == 'linux2': + self.package_deb() + else: + package_unsupported = True + elif type == 'win': + if sys.platform == 'win32': + self.package_win() + else: + package_unsupported = True + elif type == 'mac': + if sys.platform == 'darwin': + self.package_mac() + else: + package_unsupported = True else: - package_unsupported = True - else: - print 'Not yet implemented: package %s' % type + print 'Not yet implemented: package %s' % type - if package_unsupported: - print ('Package type, %s is not ' - 'supported for platform, %s') % (type, sys.platform) + if package_unsupported: + print ('Package type, %s is not ' + 'supported for platform, %s') % (type, sys.platform) -def package_tgz(): - try_chdir(bin_dir) - os.system('make package_source') - restore_chdir() + def package_tgz(self): + self.try_chdir(self.bin_dir) + os.system('make package_source') + self.restore_chdir() -def package_rpm(): - try_chdir(bin_dir) - os.system('cpack -G RPM') - restore_chdir() + def package_rpm(self): + self.try_chdir(self.bin_dir) + os.system('cpack -G RPM') + self.restore_chdir() -def package_deb(): - try_chdir(bin_dir) - os.system('cpack -G DEB') - restore_chdir() + def package_deb(self): + self.try_chdir(self.bin_dir) + os.system('cpack -G DEB') + self.restore_chdir() -def package_win(): - try_chdir(bin_dir) - os.system('cpack -G NSIS') - restore_chdir() + def package_win(self): + self.try_chdir(self.bin_dir) + os.system('cpack -G NSIS') + self.restore_chdir() -def package_mac(): - try_chdir(bin_dir) - os.system('cpack -G PackageMaker') - restore_chdir() + def package_mac(self): + self.try_chdir(self.bin_dir) + os.system('cpack -G PackageMaker') + self.restore_chdir() -def package_usage(): - print ('Usage: %s package [package-type]\n' - '\n' - 'Replace [package-type] with one of:\n' - ' src .tar.gz source (Posix only)\n' - ' rpm .rpm package (Red Hat)\n' - ' deb .deb paclage (Debian)\n' - ' win .exe installer (Windows)\n' - ' mac .dmg package (Mac OS X)\n' - '\n' - 'Example: %s package src-tgz') % (this_cmd, this_cmd) + def package_usage(self): + print ('Usage: %s package [package-type]\n' + '\n' + 'Replace [package-type] with one of:\n' + ' src .tar.gz source (Posix only)\n' + ' rpm .rpm package (Red Hat)\n' + ' deb .deb paclage (Debian)\n' + ' win .exe installer (Windows)\n' + ' mac .dmg package (Mac OS X)\n' + '\n' + 'Example: %s package src-tgz') % (self.this_cmd, self.this_cmd) -def about(): - print ('Help Me script, from the Synergy+ project.\n' - '%s\n' - '\n' - 'For help, run: %s help') % (website_url, this_cmd) + def about(self): + print ('Help Me script, from the Synergy+ project.\n' + '%s\n' + '\n' + 'For help, run: %s help') % (self.website_url, self.this_cmd) -# -# Important! -# -# From here on, it's just internal stuff, no need to -# change anything here unless adding new commands, or -# editing the way the script works. -# + def try_chdir(self, dir): + # Ensure temp build dir exists. + if not os.path.exists(dir): + os.mkdir(dir) + global prevdir + prevdir = os.path.abspath(os.curdir) -def try_chdir(dir): + # It will exist by this point, so it's safe to chdir. + os.chdir(dir) - # Ensure temp build dir exists. - if not os.path.exists(dir): - os.mkdir(dir) + def restore_chdir(self): + global prevdir + os.chdir(prevdir) - global prevdir - prevdir = os.path.abspath(os.curdir) + def open_internal(self, project_filename, application = ''): - # It will exist by this point, so it's safe to chdir. - os.chdir(dir) + if not os.path.exists(project_filename): + print 'Project file (%s) not found, run hm conf first.' % project_filename + return False + else: + path = project_filename + if application != '': + path = application + ' ' + path + os.system(path) + return True -def restore_chdir(): - global prevdir - os.chdir(prevdir) + def setup(self, generator = None): + print "Running setup..." -def open_project_internal(project_filename, application = ''): + # If no generator specified, prompt the user. + if generator == None: + if sys.platform == 'win32': + generator = self.get_setup_generator(self.win32_generators) + elif sys.platform in ['linux2', 'sunos5', 'freebsd7']: + generator = self.get_setup_generator(self.unix_generators) + elif sys.platform == 'darwin': + generator = self.get_setup_generator(self.darwin_generators) + else: + raise Exception('Unsupported platform: ' + sys.platform) - if not os.path.exists(project_filename): - print 'Project file (%s) not found, run hm conf first.' % project_filename - return False - else: - path = project_filename - if application != '': - path = application + ' ' + path - os.system(path) - return True + # Create build dir, since config file resides there. + if not os.path.exists(self.bin_dir): + os.mkdir(self.bin_dir) -def setup(generator = None): - print "Running setup..." + if os.path.exists(self.config_filepath()): + config = ConfigParser.ConfigParser() + config.read(self.config_filepath()) + else: + config = ConfigParser.ConfigParser() - # If no generator specified, prompt the user. - if generator == None: + if not config.has_section('hm'): + config.add_section('hm') + + if not config.has_section('cmake'): + config.add_section('cmake') + + config.set('hm', 'setup_version', self.setup_version) + config.set('cmake', 'generator', generator) + + self.write_config(config) + + cmakecache_filename = '%s/CMakeCache.txt' % self.bin_dir + if os.path.exists(cmakecache_filename): + print "Removing %s, since generator changed." % cmakecache_filename + os.remove(cmakecache_filename) + + print "\nSetup complete." + + def write_config(self, config): + configfile = open(self.config_filepath(), 'wb') + config.write(configfile) + + def get_generator(self): + config = ConfigParser.RawConfigParser() + config.read(self.config_filepath()) + return config.get('cmake', 'generator') + + def min_setup_version(self, version): + if os.path.exists(self.config_filepath()): + config = ConfigParser.RawConfigParser() + config.read(self.config_filepath()) + + try: + return config.getint('hm', 'setup_version') >= version + except: + return False + else: + return False + + def has_conf_run(self): + if self.min_setup_version(2): + config = ConfigParser.RawConfigParser() + config.read(self.config_filepath()) + try: + return config.getboolean('hm', 'has_conf_run') + except: + return False + else: + return False + + def set_conf_run(self): + if self.min_setup_version(3): + config = ConfigParser.RawConfigParser() + config.read(self.config_filepath()) + config.set('hm', 'has_conf_run', True) + self.write_config(config) + else: + raise Exception("User does not have correct setup version.") + + def get_setup_generator(self, generators): + + generator_options = '' + generators_sorted = sorted(generators.iteritems(), key=lambda t: int(t[0])) + + for id, generator in generators_sorted: + generator_options += '\n ' + id + ': ' + generator + + print ('\nChoose a CMake generator:%s' + ) % generator_options + + return self.setup_generator_prompt(generators) + + def setup_generator_prompt(self, generators): + + prompt = 'Enter a number:' + print prompt, + + generator_id = raw_input() + + if generator_id in generators: + print 'Selected generator:', generators[generator_id] + else: + print 'Invalid number, try again.' + self.setup_generator_prompt(generators) + + return generators[generator_id] + + def get_vcvarsall(self, generator): + import platform, _winreg + + # os_bits should be loaded with '32bit' or '64bit' + (os_bits, other) = platform.architecture() + + # visual studio is a 32-bit app, so when we're on 64-bit, we need to check the WoW dungeon + if os_bits == '64bit': + key_name = r'SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7' + else: + key_name = r'SOFTWARE\Microsoft\VisualStudio\SxS\VC7' + + key = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, key_name) + if generator.startswith('Visual Studio 8'): + value,type = _winreg.QueryValueEx(key, '8.0') + elif generator.startswith('Visual Studio 9'): + value,type = _winreg.QueryValueEx(key, '9.0') + elif generator.startswith('Visual Studio 10'): + value,type = _winreg.QueryValueEx(key, '10.0') + else: + raise Exception('Cannot determin vcvarsall.bat location for: ' + generator) + + # not sure why, but the value on 64-bit differs slightly to the original + if os_bits == '64bit': + path = value + r'vc\vcvarsall.bat' + else: + path = value + r'vcvarsall.bat' + + if not os.path.exists(path): + raise Exception("'%s' not found." % path) + return path + + def run_vcbuild(self, generator, mode, args=''): + import platform + + # os_bits should be loaded with '32bit' or '64bit' + (os_bits, other) = platform.architecture() + # Now we choose the parameters bases on OS 32/64 and our target 32/64 + # http://msdn.microsoft.com/en-us/library/x4d2c09s%28VS.80%29.aspx + + # valid options are only: ia64 amd64 x86_amd64 x86_ia64 + # but calling vcvarsall.bat does not garantee that it will work + # ret code from vcvarsall.bat is always 0 so the only way of knowing that I worked is by analysing the text output + # ms bugg: install VS9, FeaturePack, VS9SP1 and you'll obtain a vcvarsall.bat that fails. + if generator.find('Win64') != -1: + # target = 64bit + if os_bits == '32bit': + vcvars_platform = 'x86_amd64' # 32bit OS building 64bit app + else: + vcvars_platform = 'amd64' # 64bit OS building 64bit app + config_platform = 'x64' + else: # target = 32bit + vcvars_platform = 'x86' # 32/64bit OS building 32bit app + config_platform = 'Win32' + if mode == 'release': + config = 'Release' + else: + config = 'Debug' + + if generator.startswith('Visual Studio 10'): + cmd = ('@echo off\n' + 'call "%s" %s \n' + 'msbuild /nologo %s /p:Configuration="%s" /p:Platform="%s" "%s"' + ) % (self.get_vcvarsall(generator), vcvars_platform, args, config, config_platform, self.sln_filepath()) + else: + config = config + '|' + config_platform + cmd = ('@echo off\n' + 'call "%s" %s \n' + 'vcbuild /nologo %s "%s" "%s"' + ) % (self.get_vcvarsall(generator), vcvars_platform, args, self.sln_filepath(), config) + print cmd + # Generate a batch file, since we can't use environment variables directly. + temp_bat = self.bin_dir + r'\vcbuild.bat' + file = open(temp_bat, 'w') + file.write(cmd) + file.close() + + return os.system(temp_bat) + + def ensure_setup_latest(self, generator = None): + if not self.min_setup_version(self.setup_version): + self.setup(generator) + + class HammerBuild: + generator = None + target_dir = None + + def __init__(self, _generator, _target_dir, ic): + self.generator = _generator + self.target_dir = _target_dir + + def run(self): + ic.bin_dir = self.target_dir + configure(self.generator) + build(['debug']) + build(['release']) + + def hammer(self): + + hammer_builds = [] if sys.platform == 'win32': - generator = setup_generator_get(win32_generators) + hammer_builds += [ + HammerBuild('Visual Studio 9 2008', 'bin32', self), + HammerBuild('Visual Studio 9 2008 Win64', 'bin64', self)] elif sys.platform in ['linux2', 'sunos5', 'freebsd7']: - generator = setup_generator_get(unix_generators) + hammer_builds += [ + HammerBuild('Unix Makefiles', 'bin', self)] elif sys.platform == 'darwin': - generator = setup_generator_get(darwin_generators) - else: - raise Exception('Unsupported platform: ' + sys.platform) - - # Create build dir, since config file resides there. - if not os.path.exists(bin_dir): - os.mkdir(bin_dir) - - if os.path.exists(config_filepath()): - config = ConfigParser.ConfigParser() - config.read(config_filepath()) - else: - config = ConfigParser.ConfigParser() - - if not config.has_section('hm'): - config.add_section('hm') - - if not config.has_section('cmake'): - config.add_section('cmake') - - config.set('hm', 'setup_version', setup_version) - config.set('cmake', 'generator', generator) - - write_config(config) - - cmakecache_filename = '%s/CMakeCache.txt' % bin_dir - if os.path.exists(cmakecache_filename): - print "Removing %s, since generator changed." % cmakecache_filename - os.remove(cmakecache_filename) - - print "\nSetup complete." - -def write_config(config): - configfile = open(config_filepath(), 'wb') - config.write(configfile) - -def get_generator(): - config = ConfigParser.RawConfigParser() - config.read(config_filepath()) - return config.get('cmake', 'generator') - -def has_setup_version(version): - if os.path.exists(config_filepath()): - config = ConfigParser.RawConfigParser() - config.read(config_filepath()) - - try: - return config.getint('hm', 'setup_version') >= version - except: - return False - else: - return False - -def has_conf_run(): - if has_setup_version(2): - config = ConfigParser.RawConfigParser() - config.read(config_filepath()) - try: - return config.getboolean('hm', 'has_conf_run') - except: - return False - else: - return False - -def set_conf_run(): - if has_setup_version(3): - config = ConfigParser.RawConfigParser() - config.read(config_filepath()) - config.set('hm', 'has_conf_run', True) - write_config(config) - else: - raise Exception("User does not have correct setup version.") - -def setup_generator_get(generators): - - generator_options = '' - generators_sorted = sorted(generators.iteritems(), key=lambda t: int(t[0])) - - for id, generator in generators_sorted: - generator_options += '\n ' + id + ': ' + generator - - print ('\nChoose a CMake generator:%s' - ) % generator_options - - return setup_generator_prompt(generators) - -def setup_generator_prompt(generators): - - prompt = 'Enter a number:' - print prompt, - - generator_id = raw_input() - - if generator_id in generators: - print 'Selected generator:', generators[generator_id] - else: - print 'Invalid number, try again.' - setup_generator_prompt(generators) - - return generators[generator_id] - -def get_vcvarsall(generator): - import platform - - # os_bits should be loaded with '32bit' or '64bit' - (os_bits, other) = platform.architecture() - - # visual studio is a 32-bit app, so when we're on 64-bit, we need to check the WoW dungeon - if os_bits == '64bit': - key_name = r'SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7' - else: - key_name = r'SOFTWARE\Microsoft\VisualStudio\SxS\VC7' - - key = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, key_name) - if generator.startswith('Visual Studio 8'): - value,type = _winreg.QueryValueEx(key, '8.0') - elif generator.startswith('Visual Studio 9'): - value,type = _winreg.QueryValueEx(key, '9.0') - elif generator.startswith('Visual Studio 10'): - value,type = _winreg.QueryValueEx(key, '10.0') - else: - raise Exception('Cannot determin vcvarsall.bat location for: ' + generator) - - # not sure why, but the value on 64-bit differs slightly to the original - if os_bits == '64bit': - path = value + r'vc\vcvarsall.bat' - else: - path = value + r'vcvarsall.bat' - - if not os.path.exists(path): - raise Exception("'%s' not found." % path) - return path - -def run_vcbuild(generator, mode, args=''): - import platform - - # os_bits should be loaded with '32bit' or '64bit' - (os_bits, other) = platform.architecture() - # Now we choose the parameters bases on OS 32/64 and our target 32/64 - # http://msdn.microsoft.com/en-us/library/x4d2c09s%28VS.80%29.aspx - - # valid options are only: ia64 amd64 x86_amd64 x86_ia64 - # but calling vcvarsall.bat does not garantee that it will work - # ret code from vcvarsall.bat is always 0 so the only way of knowing that I worked is by analysing the text output - # ms bugg: install VS9, FeaturePack, VS9SP1 and you'll obtain a vcvarsall.bat that fails. - if generator.find('Win64') != -1: - # target = 64bit - if os_bits == '32bit': - vcvars_platform = 'x86_amd64' # 32bit OS building 64bit app - else: - vcvars_platform = 'amd64' # 64bit OS building 64bit app - config_platform = 'x64' - else: # target = 32bit - vcvars_platform = 'x86' # 32/64bit OS building 32bit app - config_platform = 'Win32' - if mode == 'release': - config = 'Release' - else: - config = 'Debug' + hammer_builds += [ + HammerBuild('Xcode', 'bin', self)] - if generator.startswith('Visual Studio 10'): - cmd = ('@echo off\n' - 'call "%s" %s \n' - 'msbuild /nologo %s /p:Configuration="%s" /p:Platform="%s" "%s"' - ) % (get_vcvarsall(generator), vcvars_platform, args, config, config_platform, sln_filepath()) - else: - config = config + '|' + config_platform - cmd = ('@echo off\n' - 'call "%s" %s \n' - 'vcbuild /nologo %s "%s" "%s"' - ) % (get_vcvarsall(generator), vcvars_platform, args, sln_filepath(), config) - print cmd - # Generate a batch file, since we can't use environment variables directly. - temp_bat = bin_dir + r'\vcbuild.bat' - file = open(temp_bat, 'w') - file.write(cmd) - file.close() + for hb in hammer_builds: + hb.run() + + package_types = [] + if sys.platform == 'win32': + package_types += ['win'] + elif sys.platform == 'linux2': + package_types += ['src', 'rpm', 'deb'] + elif sys.platform == 'darwin': + package_types += ['mac'] + + for pt in package_types: + package(pt) - return os.system(temp_bat) + def reformat(self): + # TODO: error handling + os.system( + r'tool\astyle\AStyle.exe ' + '--quiet --suffix=none --style=java --indent=force-tab=4 --recursive ' + 'lib/*.cpp lib/*.h cmd/*.cpp cmd/*.h') -def ensure_setup_latest(generator = None): - if not has_setup_version(setup_version): - setup(generator) +# the command handler should be called only from hm.py (i.e. directly +# from the command prompt). the purpose of this class is so that we +# don't need to do argument handling all over the place in the internal +# commands class. +class CommandHandler: + ic = InternalCommands() -class HammerBuild: - generator = None - target_dir = None + def __init__(self, argv, optarg_data): + self.opts, self.args = getopt(argv, optarg_data[0], optarg_data[1]) + + def get_build_mode(self): + mode = None + if len(self.args) > 0: + mode = self.args[0] + else: + for o, a in self.opts: + if o == '-d': + mode = 'debug' + elif o == '-r': + mode = 'release' + return mode - def __init__(self, _generator, _target_dir): - self.generator = _generator - self.target_dir = _target_dir - - def run(self): - global bin_dir - bin_dir = self.target_dir - configure(self.generator) - build('debug') - build('release') - -def hammer(): + def about(self): + self.ic.about() - hammer_builds = [] - if sys.platform == 'win32': - hammer_builds += [ - HammerBuild('Visual Studio 9 2008', 'bin32'), - HammerBuild('Visual Studio 9 2008 Win64', 'bin64')] - elif sys.platform in ['linux2', 'sunos5', 'freebsd7']: - hammer_builds += [ - HammerBuild('Unix Makefiles', 'bin')] - elif sys.platform == 'darwin': - hammer_builds += [ - HammerBuild('Xcode', 'bin')] - - for hb in hammer_builds: - hb.run() - - package_types = [] - if sys.platform == 'win32': - package_types += ['win'] - elif sys.platform == 'linux2': - package_types += ['src', 'rpm', 'deb'] - elif sys.platform == 'darwin': - package_types += ['mac'] - - for pt in package_types: - package(pt) - -def reformat(): - # TODO: error handling - os.system( - r'tool\astyle\AStyle.exe ' - '--quiet --suffix=none --style=java --indent=force-tab=4 --recursive ' - 'lib/*.cpp lib/*.h cmd/*.cpp cmd/*.h') + def setup(self): + self.ic.setup() + + def configure(self): + generator = None + if len(self.args) > 0: + generator = self.args[0] + self.ic.configure(generator) + + def build(self): + self.ic.build(self.get_build_mode()) + + def clean(self): + self.ic.clean(self.get_build_mode()) + + def update(self): + self.ic.update() + + def install(self): + print 'Not yet implemented: install' + + def package(self): + self.ic.package() + + def destroy(self): + self.ic.destroy() + + def package(self): + type = None + if len(self.args) > 0: + type = self.args[0] + self.ic.package(type) + + def kill(self): + self.ic.kill() + + def usage(self): + self.ic.usage() + + def revision(self): + self.ic.revision() + + def hammer(self): + self.ic.hammer() + + def reformat(self): + self.ic.reformat() + + def open(self): + self.ic.open() diff --git a/hm.py b/hm.py index 4e778d72..7d911201 100644 --- a/hm.py +++ b/hm.py @@ -17,29 +17,29 @@ import sys, os from build import commands -# Valid commands. -cmd_list = [ - 'about', - 'setup', - 'configure', - 'build', - 'clean', - 'update', - 'install', - 'package', - 'dist', - 'open', - 'destroy', - 'kill', - 'usage', - 'revision', - 'hammer', - 'reformat', -] +# list of valid commands as keys. the values are optarg strings, but most +# are None for now (this is mainly for extensibility) +cmd_dict = { + 'about' : [None, []], + 'setup' : [None, []], + 'configure' : [None, []], + 'build' : ['dr', []], + 'clean' : ['dr', []], + 'update' : [None, []], + 'install' : [None, []], + 'package' : [None, []], + 'destroy' : [None, []], + 'kill' : [None, []], + 'usage' : [None, []], + 'revision' : [None, []], + 'hammer' : [None, []], + 'reformat' : [None, []], + 'open' : [None, []], +} +# aliases to valid commands cmd_alias_dict = { - 'info' : 'usage', - 'about' : 'usage', + 'info' : 'about', 'help' : 'usage', 'dist' : 'package', 'make' : 'build', @@ -49,7 +49,7 @@ cmd_alias_dict = { def complete_command(arg): completions = [] - for cmd in cmd_list: + for cmd, optarg in cmd_dict.iteritems(): if cmd.startswith(arg): completions.append(cmd) @@ -60,6 +60,7 @@ def complete_command(arg): return completions def start_cmd(argv): + cmd_arg = '' if len(argv) > 1: cmd_arg = argv[1] @@ -70,18 +71,20 @@ def start_cmd(argv): completions = complete_command(cmd_arg) - if len(completions) > 0: + if cmd_arg and len(completions) > 0: if len(completions) == 1: # get the only completion (since in this case we have 1) cmd = completions[0] + # build up the first part of the map (for illustrative purposes) cmd_map = list() if cmd_arg != cmd: cmd_map.append(cmd_arg) cmd_map.append(cmd) + # map an alias to the command, and build up the map if cmd in cmd_alias_dict.keys(): alias = cmd if cmd_arg == cmd: @@ -89,20 +92,23 @@ def start_cmd(argv): cmd = cmd_alias_dict[cmd] cmd_map.append(cmd) + # show command map to avoid confusion if len(cmd_map) != 0: print 'Mapping command: %s' % ' -> '.join(cmd_map) - # use reflection to get the function pointer - cmd_func = getattr(commands, cmd) + # pass args and optarg data to command handler, which figures out + # how to handle the arguments + optarg_data = cmd_dict[cmd] + handler = commands.CommandHandler(argv[2:], optarg_data) - if cmd_func: - # run the function with all of the remaining args - cmd_func(argv[2:]) - else: - print 'Command not yet implemented:', cmd + # use reflection to get the function pointer + cmd_func = getattr(handler, cmd) + cmd_func() + return 0 else: - print ('Command `%s` too ambiguous, ' + print ( + 'Command `%s` too ambiguous, ' 'could mean any of: %s' ) % (cmd_arg, ', '.join(completions)) else: @@ -114,6 +120,9 @@ def start_cmd(argv): commands.usage(argv[2:]) + # generic error code if not returned sooner + return 1 + def main(argv): if sys.version_info < (2, 4): @@ -121,7 +130,7 @@ def main(argv): sys.exit(1) try: - start_cmd(argv) + sys.exit(start_cmd(argv)) except KeyboardInterrupt: print '\n\nUser aborted, exiting.'