/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2075 by jpye, Mon Sep 7 12:09:59 2009 UTC revision 2076 by jpye, Mon Sep 7 13:15:36 2009 UTC
# Line 110  if platform.system()=="Windows": Line 110  if platform.system()=="Windows":
110  elif platform.system()=="Darwin":  elif platform.system()=="Darwin":
111    
112      default_install_prefix = ''      default_install_prefix = ''
113      default_install_bin = "$INSTALL_PREFIX/Applications/ASCEND"      default_install_bin = "$INSTALL_PREFIX/Applications/ASCEND.app"
114      default_install_lib = "$INSTALL_PREFIX/Applications/ASCEND"      default_install_lib = "$INSTALL_BIN"
115      default_install_models = "$INSTALL_PREFIX/Library/ASCEND/Models"      default_install_models = "$INSTALL_PREFIX/Library/ASCEND/Models"
116      default_install_solvers = "$INSTALL_PREFIX/Library/ASCEND/Solvers"      default_install_solvers = "$INSTALL_PREFIX/Library/ASCEND/Solvers"
117      default_install_include = "$INSTALL_PREFIX/Applications/ASCEND/Headers"      default_install_include = "$INSTALL_BIN/Headers"
118      default_install_ascdata = "$INSTALL_PREFIX/Applications/ASCEND/Resources"      default_install_ascdata = "$INSTALL_BIN/Resources"
119      default_install_python = "$INSTALL_BIN/Python"      default_install_python = "$INSTALL_BIN/Python"
120    
121      # still need to work out the Tcl/Tk side of things...      # still need to work out the Tcl/Tk side of things...
# Line 2650  SConsEnvironment.InstallPerm = InstallPe Line 2650  SConsEnvironment.InstallPerm = InstallPe
2650  SConsEnvironment.InstallProgram = lambda env, dest, files: InstallPerm(env, dest, files, 0755)    SConsEnvironment.InstallProgram = lambda env, dest, files: InstallPerm(env, dest, files, 0755)  
2651  SConsEnvironment.InstallHeader = lambda env, dest, files: InstallPerm(env, dest, files, 0644)  SConsEnvironment.InstallHeader = lambda env, dest, files: InstallPerm(env, dest, files, 0644)
2652  SConsEnvironment.InstallShared = lambda env, dest, files: InstallPerm(env, dest, files, 0644)  SConsEnvironment.InstallShared = lambda env, dest, files: InstallPerm(env, dest, files, 0644)
2653    SConsEnvironment.InstallSharedAs = lambda env, dest, files: InstallPermAs(env, dest, files, 0644)
2654  SConsEnvironment.InstallLibraryAs = lambda env, dest, files: InstallPermAs(env, dest, files, 0644)  SConsEnvironment.InstallLibraryAs = lambda env, dest, files: InstallPermAs(env, dest, files, 0644)
2655    
2656  #------------------------------------------------------  #------------------------------------------------------
# Line 2836  if env.get('CAN_INSTALL'): Line 2837  if env.get('CAN_INSTALL'):
2837      install_dirs = [Dir(env.subst("$INSTALL_ROOT$"+d)) for d in dirs]      install_dirs = [Dir(env.subst("$INSTALL_ROOT$"+d)) for d in dirs]
2838      install_dirs += modeldirs + [Dir(env.subst("$INSTALL_ROOT$INSTALL_SOLVERS"))]      install_dirs += modeldirs + [Dir(env.subst("$INSTALL_ROOT$INSTALL_SOLVERS"))]
2839    
     # TODO: add install options  
     env.Alias('install',install_dirs)  
   
2840      #env.InstallShared(Dir(env.subst("$INSTALL_ROOT$INSTALL_LIB")),libascend)      #env.InstallShared(Dir(env.subst("$INSTALL_ROOT$INSTALL_LIB")),libascend)
2841    
2842      libname = "${INSTALL_LIB}/%s%s" % (soname_full,soname_minor)      libname = "${INSTALL_LIB}/%s%s" % (soname_full,soname_minor)
# Line 2866  if env.get('CAN_INSTALL'): Line 2864  if env.get('CAN_INSTALL'):
2864    
2865      env.InstallProgram(Dir(env.subst("$INSTALL_ROOT$INSTALL_BIN")),ascendconfig)      env.InstallProgram(Dir(env.subst("$INSTALL_ROOT$INSTALL_BIN")),ascendconfig)
2866    
2867        # MAC OS X INSTALL STUFF
2868    
2869        if platform.system()=="Darwin":
2870            print "ITS DARWIN"
2871            env.InstallSharedAs(env.subst("$INSTALL_ROOT${INSTALL_BIN}")+"Info.plist","mac/ascend.plist")
2872            env.InstallShared(env.subst("$INSTALL_ROOT$INSTALL_BIN/Resources/"),"mac/ascend.icns")
2873    
2874        # ALIAS FOR ALL INSTALLATION
2875        env.Alias('install',install_dirs)
2876    
2877  #------------------------------------------------------  #------------------------------------------------------
2878  # WINDOWS INSTALLER  # WINDOWS INSTALLER
2879    
Legend:
Removed from v.2075  
changed lines
  Added in v.2076
john.pye@anu.edu.au
 ViewVC Help
Powered by ViewVC 1.1.22