From db3439ce777a614f6e78527016b8c2efd4cc365b Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Mon, 27 Aug 2007 04:00:14 +0000 Subject: [PATCH] Scons cleanup 7: remove saved C compiler, remove blank lines and obsolete comments git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19823 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/scons/SConstruct | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/development/scons/SConstruct b/development/scons/SConstruct index fede93fdf4..20113f0dbe 100644 --- a/development/scons/SConstruct +++ b/development/scons/SConstruct @@ -36,10 +36,6 @@ import scons_utils as utils # import all file lists from scons_manifest import * -#---------------------------------------------------------- -# Required runtime environment -#---------------------------------------------------------- - # scons asks for 1.5.2, lyx requires 2.3 EnsurePythonVersion(2, 3) # Please use at least 0.96.92 (not 0.96.1) @@ -426,13 +422,6 @@ CCFLAGS_required = [] LINKFLAGS_required = [] CCFLAGS_default = [] -# under windows, scons is confused by .C/.c and uses gcc instead of -# g++. I am forcing the use of g++ here. This is expected to change -# after lyx renames all .C files to .cpp -# -# save the old c compiler and CCFLAGS (used by libintl) -C_COMPILER = env.subst('$CC') -C_CCFLAGS = env.subst('$CCFLAGS').split() # if we use ms vc, the commands are fine (cl.exe and link.exe) if use_vc: # C4819: The file contains a character that cannot be represented @@ -1407,8 +1396,6 @@ if frontend == 'qt4': # # Report results # - - print env['VERSION_INFO'] # @@ -1436,7 +1423,6 @@ if logfile != '' or platform_name == 'win32': Help(opts.GenerateHelpText(env)) - #---------------------------------------------------------- # Start building #---------------------------------------------------------- @@ -1503,10 +1489,6 @@ if (included_gettext and not libExists('included_intl')) or 'intl' in BUILD_TARG ) Alias('intl', intl) - -# -# Now, src code under src/ -# # # src/support # @@ -2068,8 +2050,6 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS: postinstall_path = os.path.join(dest_dir, 'etc', 'postinstall') env.Install(postinstall_path, tmp_script) Alias('install', postinstall_path) - - # man env.InstallAs(os.path.join(man_dest_dir, 'lyx' + version_suffix + '.1'), env.subst('$TOP_SRCDIR/lyx.man'))