/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1442 by jpye, Sat May 26 07:31:34 2007 UTC revision 1443 by jpye, Sat May 26 09:00:53 2007 UTC
# Line 141  opts.Add(ListOption( Line 141  opts.Add(ListOption(
141  # Where will the local copy of the help files be kept?  # Where will the local copy of the help files be kept?
142  opts.Add(BoolOption(  opts.Add(BoolOption(
143      'WITH_DOC'      'WITH_DOC'
144      , "Should help files be built and installed? If not, ASCEND will access online help files"      , "Should we try to build and install help files? If not, ASCEND will access online help files"
145      , True      , True
146  ))  ))
147    
148    opts.Add(BoolOption(
149        'WITH_DOC_BUILD'
150        , "If true, we'll attempt to build docs. Set false, we'll assume we already have then (eg from the tarball)"
151        , "$WITH_DOC"
152    ))
153    
154    opts.Add(BoolOption(
155        'WITH_DOC_INSTALL'
156        , "If true, SCons will install the documentation file(s). If false, assume rpm or dpkg is going to do it."
157        , "$WITH_DOC"
158    ))
159    
160  opts.Add(  opts.Add(
161      'HELP_ROOT'      'HELP_ROOT'
162      , "Location of the main help file"      , "Location of the main help file"
# Line 703  without_signals_reason = "disabled by op Line 715  without_signals_reason = "disabled by op
715  with_doc = env.get('WITH_DOC')  with_doc = env.get('WITH_DOC')
716  without_doc_reason = "disabled by options/config.py"  without_doc_reason = "disabled by options/config.py"
717    
718    with_doc_build = env.get('WITH_DOC_BUILD');
719    without_doc_build = "disabled by options/config.py"
720    if not with_doc:
721        without_doc_build = "disabled by with_doc"
722    
723  with_latex2html = False  with_latex2html = False
724    
725  if platform.system()=="Windows":  if platform.system()=="Windows":
# Line 2208  if env.get('CAN_INSTALL'): Line 2225  if env.get('CAN_INSTALL'):
2225      dirs = ['INSTALL_BIN','INSTALL_ASCDATA','INSTALL_LIB', 'INSTALL_INCLUDE','INSTALL_DOC']      dirs = ['INSTALL_BIN','INSTALL_ASCDATA','INSTALL_LIB', 'INSTALL_INCLUDE','INSTALL_DOC']
2226      install_dirs = [Dir(env.subst("$INSTALL_ROOT$"+d)) for d in dirs]      install_dirs = [Dir(env.subst("$INSTALL_ROOT$"+d)) for d in dirs]
2227      install_dirs += modeldirs      install_dirs += modeldirs
     for d in install_dirs:  
         print d  
2228    
2229      # TODO: add install options      # TODO: add install options
2230      env.Alias('install',install_dirs)      env.Alias('install',install_dirs)
# Line 2250  if platform.system()=="Linux": Line 2265  if platform.system()=="Linux":
2265    
2266  env['DISTTAR_FORMAT']='bz2'  env['DISTTAR_FORMAT']='bz2'
2267  env.Append(  env.Append(
2268      DISTTAR_EXCLUDEEXTS=['.o','.os','.so','.a','.dll','.lib','.cc','.cache','.pyc','.cvsignore','.dblite','.log','.pl','.out','.exe','.aux','.idx','.toc','.lof','.lot','.mm','.warnings','.tm2']      DISTTAR_EXCLUDEEXTS=['.o','.os','.so','.a','.dll','.lib','.cc','.cache','.pyc','.cvsignore','.dblite','.log','.pl','.out','.exe','.aux','.idx','.toc','.lof','.lot','.mm','.warnings','.tm2','.swp',',tmp','.gz','.bz2','.7z']
2269      , DISTTAR_EXCLUDEDIRS=['CVS','.svn','.sconf_temp', 'dist','debian']      , DISTTAR_EXCLUDEDIRS=['CVS','.svn','.sconf_temp', 'dist','debian']
2270  )  )
2271    
# Line 2292  if with_installer: Line 2307  if with_installer:
2307      default_targets.append('installer')      default_targets.append('installer')
2308  if with_extfns:  if with_extfns:
2309      default_targets.append('extfns')      default_targets.append('extfns')
2310  if with_doc:  if with_doc_build:
2311      default_targets.append('doc')      default_targets.append('doc')
2312    
2313  env.Default(default_targets)  env.Default(default_targets)

Legend:
Removed from v.1442  
changed lines
  Added in v.1443

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22