Changeset 337

Timestamp:

Jul 9, 2011 10:45:30 AM (12 years ago)

Author:

toby

Message:

a bit of cleanup

File:

• trunk/fsource/SConstruct (modified) (4 diffs)

trunk/fsource/SConstruct

@@ -57 +57 @@
 # help
 if 'help' in COMMAND_LINE_TARGETS:
-    print """Building Fortran routines for use with GSAS-II
+    print """
+----------------------------------------------
+Building Fortran routines for use with GSAS-II
 ----------------------------------------------
 
@@ -80 +82 @@
 The following options override defaults set in the scons script:
 
-FCompiler=<path>   -- define the name of the fortran compiler; default is to use
-   g77 on Windows and gfortran elsewhere. If you use something other than g77 or
-   gfortran, you must also specify F2PYflags
+FCompiler=<name>  -- define the name of the fortran compiler, typically g77
+   or gfortran; default is to use g77 on Windows and gfortran elsewhere. If
+   you use something other than these, you must also specify F2PYflags.
 
 FORTpath=<path>    -- define a path to the fortran program; default is to use
@@ -112 +114 @@
        (builds with a non-default [e.g. older] version of python)
     """
-    sys.exit()
+    #sys.exit()
 #==========================================================================================
 # override from command-line options
@@ -241 +243 @@
 print 80*'='
 for var in ['FCompiler','FORTpath','FORTflags','F2PYflags','F2PYpath','F2PYsuffix','LDFLAGS']:
-    print 'Variable ',var,'is',eval(var)
-print 'Required fortran libraries:',
-for lib in liblist: print " " + lib,
-print ""
-print 'f2py modules:',
-for mod in modlist: print " " + mod,
-print ""
+    print 'Variable',var,'is',eval(var)
 print 'Using python at', pythonprogram
 print 'Python/f2py version =',version,PlatformBits
 print 'Install directory is',InstallLoc
+print 'Will build object libraries:',
+for lib in liblist: print " " + lib,
+print ""
+print 'f2py will build these modules:',
+for mod in modlist: print " " + mod,
+print ""
 print 80*'='
 #print env.Dump()
+if 'help' in COMMAND_LINE_TARGETS: sys.exit()