/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2534 by jpye, Tue Jan 24 17:44:27 2012 UTC revision 2566 by jpye, Sat Feb 4 00:42:53 2012 UTC
# Line 2814  if not env.get('NSIS'): Line 2814  if not env.get('NSIS'):
2814      without_installer_reason = "NSIS not found"      without_installer_reason = "NSIS not found"
2815    
2816  if with_installer:  if with_installer:
2817        pyarch = ""
2818        ipoptdllline = ""
2819        inst64 = 0
2820        if platform.architecture()[0] == "64bit":
2821            pyarch = ".amd64"
2822            inst64 = 1
2823        if env['IPOPT_DLL']:
2824            ipoptdllline = "File: %s"%os.path.normpath(env['IPOPT_DLL'])
2825      env.Append(NSISDEFINES={      env.Append(NSISDEFINES={
2826          'OUTFILE':"#dist/"+env['WIN_INSTALLER_NAME']          'OUTFILE':"#dist/$WIN_INSTALLER_NAME"
2827          ,"VERSION":version          ,"VERSION":version
2828          ,'PYVERSION':pyversion          ,'PYVERSION':pyversion
2829          ,'IPOPTDLL':os.path.normpath(env['IPOPT_DLL'])          ,'IPOPTDLL_LINE':ipoptdllline
2830            ,'PYARCH':pyarch
2831            ,'INST64':inst64
2832      })      })
2833      installer = env.Installer('nsis/installer.nsi')      installer = env.Installer('nsis/installer.nsi')
2834      env.Depends(installer,["pygtk","ascxx","tcltk","ascend.dll","models","solvers","ascend-config",'pygtk/ascend'])      env.Depends(installer,["pygtk","ascxx","tcltk","ascend.dll","models","solvers","ascend-config",'pygtk/ascend'])
2835      env.Depends(installer,[os.path.normpath(env['IPOPT_DLL'])])      if env['IPOPT_DLL']:
2836            env.Depends(installer,[os.path.normpath(env['IPOPT_DLL'])])
2837      env.Alias('installer',installer)      env.Alias('installer',installer)
2838  else:  else:
2839      print "Skipping... Windows installer isn't being built:",without_installer_reason      print "Skipping... Windows installer isn't being built:",without_installer_reason
# Line 2848  env.Append( Line 2859  env.Append(
2859      DISTTAR_EXCLUDEEXTS=['.o','.os','.so','.a','.dll','.lib','.cc','.cache',      DISTTAR_EXCLUDEEXTS=['.o','.os','.so','.a','.dll','.lib','.cc','.cache',
2860          '.pyc','.cvsignore','.dblite','.log','.pl','.out','.exe','.aux','.idx',          '.pyc','.cvsignore','.dblite','.log','.pl','.out','.exe','.aux','.idx',
2861          '.toc','.lof','.lot','.mm','.warnings','.tm2','.swp',',tmp','.gz',          '.toc','.lof','.lot','.mm','.warnings','.tm2','.swp',',tmp','.gz',
2862          '.bz2','.7z','.deb','.dsc','.changes','.bak','.tex','.tmp']          '.bz2','.7z','.deb','.dsc','.changes','.bak','.tex','.tmp','.def']
2863      , DISTTAR_EXCLUDEDIRS=['CVS','.svn','.sconf_temp', 'dist','debian','doxy']      , DISTTAR_EXCLUDEDIRS=['CVS','.svn','.sconf_temp', 'dist','debian','doxy']
2864      , DISTTAR_EXCLUDERES=[r"_wrap\.cc?$", r"~$", r"ascxx/ascpy\.py","ascxx/testipopt$"      , DISTTAR_EXCLUDERES=[r"_wrap\.cc?$", r"~$", r"ascxx/ascpy\.py","ascxx/testipopt$"
2865          ,r"/lib.*\.so\.[.0-9]+$", r"tcltk/asc4dev$", r"tcltk/interface/typelex\.c$"          ,r"/lib.*\.so\.[.0-9]+$", r"tcltk/asc4dev$", r"tcltk/interface/typelex\.c$"
# Line 2916  if with_python: Line 2927  if with_python:
2927      default_targets.append('ascxx')      default_targets.append('ascxx')
2928      default_targets.append('pygtk')      default_targets.append('pygtk')
2929      default_targets.append('pyfprops')      default_targets.append('pyfprops')
 #if with_installer:  
 #   default_targets.append('installer')  
2930  if with_extfns:  if with_extfns:
2931      default_targets.append('extfns')      default_targets.append('extfns')
2932  if with_doc_build:  if with_doc_build:

Legend:
Removed from v.2534  
changed lines
  Added in v.2566

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