# HG changeset patch # User prock@33b003aa-7bff-0310-803a-e67f0ece8222 # Date 1263327421 0 # Node ID e00d9af76f0a838b4268af77b4babacd02b03e85 # Parent 2a1259ce2b95625ca3e17773bf4db03e6ce12acd Removed the --release command line option and replaced it with --enable-debug. Release binaries are now built by default. diff -r 2a1259ce2b95 -r e00d9af76f0a SConstruct --- a/SConstruct Tue Jan 12 17:22:43 2010 +0000 +++ b/SConstruct Tue Jan 12 20:17:01 2010 +0000 @@ -4,6 +4,10 @@ _sep = os.path.sep +#************************************************************************** +#add any command line options here +#************************************************************************** + vars = Variables() vars.Add(PathVariable('DESTDIR', 'Destination directory (prepended to prefix)', @@ -17,13 +21,10 @@ env.EnsureSConsVersion(1,2) -#************************************************************************** -#add any command line options here -#************************************************************************** -AddOption('--release', - dest='release', +AddOption('--enable-debug', + dest='enable-debug', action="store_true", - help='Builds the release version of the binaries', + help='Builds the debug version of the binaries', default=False) AddOption('--disable-opengl', @@ -79,10 +80,10 @@ #************************************************************************** #save command line options here #************************************************************************** -if GetOption('release'): +if GetOption('enable-debug'): + debug = 1 +else: debug = 0 -else: - debug = 1 if GetOption('disable-opengl'): opengl = 0 diff -r 2a1259ce2b95 -r e00d9af76f0a build/win32/build_environments/scons/build_engine.bat --- a/build/win32/build_environments/scons/build_engine.bat Tue Jan 12 17:22:43 2010 +0000 +++ b/build/win32/build_environments/scons/build_engine.bat Tue Jan 12 20:17:01 2010 +0000 @@ -11,7 +11,7 @@ :: Goto TRUNK and call SCons cd \ cd "%_%\..\..\..\.." -python build\win32\applications\scons\scons.py --release fife-python +python build\win32\applications\scons\scons.py fife-python :: Return us to the directory we started from cd %_% diff -r 2a1259ce2b95 -r e00d9af76f0a build/win32/build_environments/scons/build_engine_debug.bat --- a/build/win32/build_environments/scons/build_engine_debug.bat Tue Jan 12 17:22:43 2010 +0000 +++ b/build/win32/build_environments/scons/build_engine_debug.bat Tue Jan 12 20:17:01 2010 +0000 @@ -11,7 +11,7 @@ :: Goto TRUNK and call SCons cd \ cd "%_%\..\..\..\.." -python build\win32\applications\scons\scons.py fife-python +python build\win32\applications\scons\scons.py --enable-debug fife-python :: Return us to the directory we started from cd %_% diff -r 2a1259ce2b95 -r e00d9af76f0a build/win32/build_environments/scons/install_engine.bat --- a/build/win32/build_environments/scons/install_engine.bat Tue Jan 12 17:22:43 2010 +0000 +++ b/build/win32/build_environments/scons/install_engine.bat Tue Jan 12 20:17:01 2010 +0000 @@ -11,7 +11,7 @@ :: Goto TRUNK and call SCons cd \ cd "%_%\..\..\..\.." -python build\win32\applications\scons\scons.py --release install-python +python build\win32\applications\scons\scons.py install-python :: Return us to the directory we started from cd %_% diff -r 2a1259ce2b95 -r e00d9af76f0a build/win32/build_environments/scons/logbuild_engine.bat --- a/build/win32/build_environments/scons/logbuild_engine.bat Tue Jan 12 17:22:43 2010 +0000 +++ b/build/win32/build_environments/scons/logbuild_engine.bat Tue Jan 12 20:17:01 2010 +0000 @@ -14,7 +14,7 @@ :: Goto TRUNK and call SCons cd \ cd "%_%\..\..\..\.." -python build\win32\applications\scons\scons.py --debug=presub --release fife-python >> "%_%\engine_build_log.txt" 2>&1 +python build\win32\applications\scons\scons.py fife-python >> "%_%\engine_build_log.txt" 2>&1 :: Return us to the directory we started from cd %_% diff -r 2a1259ce2b95 -r e00d9af76f0a build/win32/build_environments/scons/logbuild_engine_debug.bat --- a/build/win32/build_environments/scons/logbuild_engine_debug.bat Tue Jan 12 17:22:43 2010 +0000 +++ b/build/win32/build_environments/scons/logbuild_engine_debug.bat Tue Jan 12 20:17:01 2010 +0000 @@ -14,7 +14,7 @@ :: Goto TRUNK and call SCons cd \ cd "%_%\..\..\..\.." -python build\win32\applications\scons\scons.py fife-python >> "%_%\engine_build_log.txt" 2>&1 +python build\win32\applications\scons\scons.py --enable-debug fife-python >> "%_%\engine_build_log.txt" 2>&1 :: Return us to the directory we started from cd %_% diff -r 2a1259ce2b95 -r e00d9af76f0a build/win32/build_environments/scons/logbuild_engine_nolog.bat --- a/build/win32/build_environments/scons/logbuild_engine_nolog.bat Tue Jan 12 17:22:43 2010 +0000 +++ b/build/win32/build_environments/scons/logbuild_engine_nolog.bat Tue Jan 12 20:17:01 2010 +0000 @@ -14,7 +14,7 @@ :: Goto TRUNK and call SCons cd \ cd "%_%\..\..\..\.." -python build\win32\applications\scons\scons.py --release --disable-log fife-python >> "%_%\engine_build_log.txt" 2>&1 +python build\win32\applications\scons\scons.py --disable-log fife-python >> "%_%\engine_build_log.txt" 2>&1 :: Return us to the directory we started from cd %_% diff -r 2a1259ce2b95 -r e00d9af76f0a build/win32/build_environments/scons/loginstall_engine.bat --- a/build/win32/build_environments/scons/loginstall_engine.bat Tue Jan 12 17:22:43 2010 +0000 +++ b/build/win32/build_environments/scons/loginstall_engine.bat Tue Jan 12 20:17:01 2010 +0000 @@ -11,7 +11,7 @@ :: Goto TRUNK and call SCons cd \ cd "%_%\..\..\..\.." -python build\win32\applications\scons\scons.py --release install-python > "%_%\engine_install_log.txt" 2>&1 +python build\win32\applications\scons\scons.py install-python > "%_%\engine_install_log.txt" 2>&1 :: Return us to the directory we started from cd %_%