rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added doxygen and manpage stuff to 1.3 and 1.4

This commit is contained in:
Nick Bolton 2011-01-16 19:06:04 +00:00
parent b0f1470db0
commit 46a4926122
3 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -44,6 +44,7 @@ SET(root_dir ${CMAKE_SOURCE_DIR})
SET(cmake_dir ${root_dir}/cmake) SET(cmake_dir ${root_dir}/cmake)
SET(bin_dir ${root_dir}/bin) SET(bin_dir ${root_dir}/bin)
SET(doc_dir ${root_dir}/doc) SET(doc_dir ${root_dir}/doc)
SET(doc_dir ${root_dir}/doc)
# Now for the stuff to generate config.h (and setup defines). # Now for the stuff to generate config.h (and setup defines).
INCLUDE(${cmake_dir}/CMakeLists_config.txt) INCLUDE(${cmake_dir}/CMakeLists_config.txt)

47
build/commands.py
View File

@ -64,34 +64,34 @@ class InternalCommands:
'4' : 'Visual Studio 9 2008 Win64', '4' : 'Visual Studio 9 2008 Win64',
'5' : 'Visual Studio 8 2005', '5' : 'Visual Studio 8 2005',
'6' : 'Visual Studio 8 2005 Win64', '6' : 'Visual Studio 8 2005 Win64',
'10' : 'CodeBlocks - MinGW Makefiles', # '10' : 'CodeBlocks - MinGW Makefiles',
'11' : 'CodeBlocks - Unix Makefiles', # '11' : 'CodeBlocks - Unix Makefiles',
'12': 'Eclipse CDT4 - MinGW Makefiles', # '12': 'Eclipse CDT4 - MinGW Makefiles',
'13': 'Eclipse CDT4 - NMake Makefiles', # '13': 'Eclipse CDT4 - NMake Makefiles',
'14': 'Eclipse CDT4 - Unix Makefiles', # '14': 'Eclipse CDT4 - Unix Makefiles',
'15': 'MinGW Makefiles', # '15': 'MinGW Makefiles',
'16': 'NMake Makefiles', # '16': 'NMake Makefiles',
'17': 'Unix Makefiles', # '17': 'Unix Makefiles',
'18': 'Borland Makefiles', # '18': 'Borland Makefiles',
'19': 'MSYS Makefiles', # '19': 'MSYS Makefiles',
'20': 'Watcom WMake', # '20': 'Watcom WMake',
} }
unix_generators = { unix_generators = {
'1' : 'Unix Makefiles', '1' : 'Unix Makefiles',
'2' : 'CodeBlocks - Unix Makefiles', # '2' : 'CodeBlocks - Unix Makefiles',
'3' : 'Eclipse CDT4 - Unix Makefiles', # '3' : 'Eclipse CDT4 - Unix Makefiles',
'4' : 'KDevelop3', # '4' : 'KDevelop3',
'5' : 'KDevelop3 - Unix Makefiles', # '5' : 'KDevelop3 - Unix Makefiles',
} }
darwin_generators = { darwin_generators = {
'1' : 'Xcode', '1' : 'Xcode',
'2' : 'Unix Makefiles', '2' : 'Unix Makefiles',
'3' : 'CodeBlocks - Unix Makefiles', # '3' : 'CodeBlocks - Unix Makefiles',
'4' : 'Eclipse CDT4 - Unix Makefiles', # '4' : 'Eclipse CDT4 - Unix Makefiles',
'5' : 'KDevelop3', # '5' : 'KDevelop3',
'6' : 'KDevelop3 - Unix Makefiles', # '6' : 'KDevelop3 - Unix Makefiles',
} }
def getBinDir(self, target=''): def getBinDir(self, target=''):
@ -125,7 +125,7 @@ class InternalCommands:
' revision Display the current source code revision\n' ' revision Display the current source code revision\n'
' package Create a distribution package (e.g. tar.gz)\n' ' package Create a distribution package (e.g. tar.gz)\n'
' install Installs the program\n' ' install Installs the program\n'
' doxygen Builds doxygen documentation\n' ' doxygen Builds doxygen documentation\n'
' reformat Reformat .cpp and .h files using AStyle\n' ' reformat Reformat .cpp and .h files using AStyle\n'
' usage Shows the help screen\n' ' usage Shows the help screen\n'
'\n' '\n'
@ -159,8 +159,9 @@ class InternalCommands:
if generator != '': if generator != '':
cmake_args += ' -G "' + generator + '"' cmake_args += ' -G "' + generator + '"'
# always specify a build type (debug, release, etc) # for non-vs always specify a build type (debug, release, etc)
cmake_args = ' -DCMAKE_BUILD_TYPE=' + target.capitalize() if not generator.startswith('Visual Studio'):
cmake_args = ' -DCMAKE_BUILD_TYPE=' + target.capitalize()
# if not visual studio, use parent dir # if not visual studio, use parent dir
sourceDir = self.source_dir sourceDir = self.source_dir
@ -869,7 +870,7 @@ class CommandHandler:
def configure(self): def configure(self):
target = '' target = ''
if (len(build_targets) > 0): if (len(self.build_targets) > 0):
target = self.build_targets[0] target = self.build_targets[0]
self.ic.configure(target) self.ic.configure(target)

38
hm.py
View File

@ -44,31 +44,31 @@ build_options_long = ['debug', 'release']
# list of valid commands as keys. the values are optarg strings, but most # list of valid commands as keys. the values are optarg strings, but most
# are None for now (this is mainly for extensibility) # are None for now (this is mainly for extensibility)
cmd_opt_dict = { cmd_opt_dict = {
'about' : ['', []], 'about' : ['', []],
'setup' : ['', []], 'setup' : ['', []],
'configure' : ['', []], 'configure' : ['', []],
'build' : [build_options, build_options_long], 'build' : [build_options, build_options_long],
'clean' : [build_options, build_options_long], 'clean' : [build_options, build_options_long],
'update' : ['', []], 'update' : ['', []],
'install' : ['', []], 'install' : ['', []],
'doxygen' : ['', []], 'doxygen' : ['', []],
'dist' : ['', []], 'dist' : ['', []],
'distftp' : ['', ['host=', 'user=', 'pass=', 'dir=']], 'distftp' : ['', ['host=', 'user=', 'pass=', 'dir=']],
'kill' : ['', []], 'kill' : ['', []],
'usage' : ['', []], 'usage' : ['', []],
'revision' : ['', []], 'revision' : ['', []],
'reformat' : ['', []], 'reformat' : ['', []],
'open' : ['', []], 'open' : ['', []],
} }
# aliases to valid commands # aliases to valid commands
cmd_alias_dict = { cmd_alias_dict = {
'info' : 'about', 'info' : 'about',
'help' : 'usage', 'help' : 'usage',
'package' : 'dist', 'package' : 'dist',
'docs' : 'doxygen', 'docs' : 'doxygen',
'make' : 'build', 'make' : 'build',
'cmake' : 'configure', 'cmake' : 'configure',
} }
def complete_command(arg): def complete_command(arg):