/[escript]/branches/windows_from_1456_trunk_1544_merged_in/SConstruct
ViewVC logotype

Diff of /branches/windows_from_1456_trunk_1544_merged_in/SConstruct

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

revision 1082 by phornby, Fri Mar 16 08:42:17 2007 UTC revision 1083 by ksteube, Thu Apr 12 01:15:01 2007 UTC
# Line 59  else: Line 59  else:
59  # These are defaults and can be overridden using command line arguments or an options file.  # These are defaults and can be overridden using command line arguments or an options file.
60  # if the options_file or ARGUMENTS do not exist then the ones listed as default here are used  # if the options_file or ARGUMENTS do not exist then the ones listed as default here are used
61  # DO NOT CHANGE THEM HERE  # DO NOT CHANGE THEM HERE
62    
63    # Where to install?
64    prefix = ARGUMENTS.get('prefix', Dir('#.').abspath)
65    print "Install prefix is: ", prefix
66    
67  if ARGUMENTS.get('options_file',0):  if ARGUMENTS.get('options_file',0):
68     options_file = ARGUMENTS.get('options_file',0)     options_file = ARGUMENTS.get('options_file',0)
69  else:  else:
# Line 78  else: Line 83  else:
83  opts = Options(options_file, ARGUMENTS)  opts = Options(options_file, ARGUMENTS)
84  opts.AddOptions(  opts.AddOptions(
85  # Where to install esys stuff  # Where to install esys stuff
86    ('incinstall', 'where the esys headers will be installed', Dir('#.').abspath+'/include'),    ('incinstall', 'where the esys headers will be installed', prefix+'/include'),
87    ('libinstall', 'where the esys libraries will be installed', Dir('#.').abspath+'/lib'),    ('libinstall', 'where the esys libraries will be installed', prefix+'/lib'),
88    ('pyinstall', 'where the esys python modules will be installed', Dir('#.').abspath),    ('pyinstall', 'where the esys python modules will be installed', prefix),
89    ('src_zipfile', 'the source zip file will be installed.', Dir('#.').abspath+"/release/escript_src.zip"),    ('src_zipfile', 'the source zip file will be installed.', prefix+"/release/escript_src.zip"),
90    ('test_zipfile', 'the test zip file will be installed.', Dir('#.').abspath+"/release/escript_tests.zip"),    ('test_zipfile', 'the test zip file will be installed.', prefix+"/release/escript_tests.zip"),
91    ('src_tarfile', 'the source tar file will be installed.', Dir('#.').abspath+"/release/escript_src.tar.gz"),    ('src_tarfile', 'the source tar file will be installed.', prefix+"/release/escript_src.tar.gz"),
92    ('test_tarfile', 'the test tar file will be installed.', Dir('#.').abspath+"/release/escript_tests.tar.gz"),    ('test_tarfile', 'the test tar file will be installed.', prefix+"/release/escript_tests.tar.gz"),
93    ('examples_tarfile', 'the examples tar file will be installed.', Dir('#.').abspath+"/release/doc/escript_examples.tar.gz"),    ('examples_tarfile', 'the examples tar file will be installed.', prefix+"/release/doc/escript_examples.tar.gz"),
94    ('examples_zipfile', 'the examples zip file will be installed.', Dir('#.').abspath+"/release/doc/escript_examples.zip"),    ('examples_zipfile', 'the examples zip file will be installed.', prefix+"/release/doc/escript_examples.zip"),
95    ('guide_pdf', 'name of the user guide in pdf format', Dir('#.').abspath+"/release/doc/user/guide.pdf"),    ('guide_pdf', 'name of the user guide in pdf format', prefix+"/release/doc/user/guide.pdf"),
96    ('api_epydoc', 'name of the epydoc api docs directory',Dir('#.').abspath+"/release/doc/epydoc"),    ('api_epydoc', 'name of the epydoc api docs directory',prefix+"/release/doc/epydoc"),
97    ('guide_html', 'name of the directory for user guide in html format', Dir('#.').abspath+"/release/doc/user/html"),    ('guide_html', 'name of the directory for user guide in html format', prefix+"/release/doc/user/html"),
98  # Compilation options  # Compilation options
99    BoolOption('dodebug', 'Do you want a debug build?', 'no'),    BoolOption('dodebug', 'Do you want a debug build?', 'no'),
100    ('options_file', "Optional file containing preferred options. Ignored if it doesn't exist (default: scons/hostname_options.py)", options_file),    ('options_file', "Optional file containing preferred options. Ignored if it doesn't exist (default: scons/hostname_options.py)", options_file),
# Line 212  except KeyError: Line 217  except KeyError:
217     incinstall = None     incinstall = None
218  try:  try:
219     libinstall = env['libinstall']     libinstall = env['libinstall']
220     env.Append(LIBPATH = [libinstall,])     env.Append(LIBPATH = [libinstall,]) # ksteube adds -L for building of libescript.so libfinley.so escriptcpp.so finleycpp.so
221     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)
222     if env['PLATFORM'] == "win32":     if env['PLATFORM'] == "win32":
223        env.PrependENVPath('PATH', libinstall)        env.PrependENVPath('PATH', libinstall)

Legend:
Removed from v.1082  
changed lines
  Added in v.1083

  ViewVC Help
Powered by ViewVC 1.1.26