sharpetronics/geany
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add compiler flags to supress Scintilla warnings.

Browse Source 
Fix old usage of build.env.
Make configure-only options only available when actually configure is used.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2695 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2008-06-15 17:55:19 +00:00
parent bdac40d369
commit 63ca76a822
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -3,6 +3,11 @@
* tagmanager/python.c: * tagmanager/python.c:
Fix a regression introduced in latest bug fixes and fix some Fix a regression introduced in latest bug fixes and fix some
indentation and comments. indentation and comments.
* wscript:
Add compiler flags to supress Scintilla warnings.
Fix old usage of build.env.
Make configure-only options only available when actually configure
is used.
2008-06-11 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> 2008-06-11 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>

38
wscript
View File

@ -219,7 +219,8 @@ def configure(conf):
conf.env.append_value('CCFLAGS', '-g -DGEANY_DEBUG') conf.env.append_value('CCFLAGS', '-g -DGEANY_DEBUG')
conf.env.append_value('CCFLAGS', '-DHAVE_CONFIG_H') conf.env.append_value('CCFLAGS', '-DHAVE_CONFIG_H')
conf.env.append_value('CXXFLAGS', '-DNDEBUG -Os -DGTK -DGTK2 -DSCI_LEXER -DG_THREADS_IMPL_NONE') conf.env.append_value('CXXFLAGS', '-DNDEBUG -Os -DGTK -DGTK2 -DSCI_LEXER -DG_THREADS_IMPL_NONE \
-Wno-missing-braces -Wno-char-subscripts') # Scintilla flags
def set_options(opt): def set_options(opt):
@ -227,22 +228,23 @@ def set_options(opt):
opt.tool_options('compiler_cxx') opt.tool_options('compiler_cxx')
opt.tool_options('intltool') opt.tool_options('intltool')
# Features if 'configure' in sys.argv:
opt.add_option('--disable-plugins', action='store_true', default=False, # Features
help='compile without plugin support [default: No]', dest='no_plugins') opt.add_option('--disable-plugins', action='store_true', default=False,
opt.add_option('--disable-socket', action='store_true', default=False, help='compile without plugin support [default: No]', dest='no_plugins')
help='compile without support to detect a running instance [[default: No]', dest='no_socket') opt.add_option('--disable-socket', action='store_true', default=False,
opt.add_option('--disable-vte', action='store_true', default=False, help='compile without support to detect a running instance [[default: No]', dest='no_socket')
help='compile without support for an embedded virtual terminal [[default: No]', dest='no_vte') opt.add_option('--disable-vte', action='store_true', default=False,
opt.add_option('--enable-gnu-regex', action='store_true', default=False, help='compile without support for an embedded virtual terminal [[default: No]', dest='no_vte')
help='compile with included GNU regex library [default: No]', dest='gnu_regex') opt.add_option('--enable-gnu-regex', action='store_true', default=False,
# Paths help='compile with included GNU regex library [default: No]', dest='gnu_regex')
opt.add_option('--mandir', type='string', default='', # Paths
help='man documentation', dest='mandir') opt.add_option('--mandir', type='string', default='',
opt.add_option('--docdir', type='string', default='', help='man documentation', dest='mandir')
help='documentation root', dest='docdir') opt.add_option('--docdir', type='string', default='',
opt.add_option('--libdir', type='string', default='', help='documentation root', dest='docdir')
help='object code libraries', dest='libdir') opt.add_option('--libdir', type='string', default='',
help='object code libraries', dest='libdir')
# Actions # Actions
opt.add_option('--htmldoc', action='store_true', default=False, opt.add_option('--htmldoc', action='store_true', default=False,
help='generate HTML documentation', dest='htmldoc') help='generate HTML documentation', dest='htmldoc')
@ -408,7 +410,7 @@ def shutdown():
if Params.g_options.apidoc: if Params.g_options.apidoc:
doxyfile = os.path.join(Params.g_build.m_srcnode.abspath( \ doxyfile = os.path.join(Params.g_build.m_srcnode.abspath( \
Params.g_build.env()), 'doc', 'Doxyfile') Params.g_build.env), 'doc', 'Doxyfile')
os.chdir('doc') os.chdir('doc')
launch('doxygen ' + doxyfile, 'Generating API reference documentation') launch('doxygen ' + doxyfile, 'Generating API reference documentation')