Changeset 18977

Show
Ignore:
Timestamp:
07/02/06 13:55:12 (2 years ago)
Author:
allenb
Message:

- Fix syntax error where wrong method was being called to automatically find visual studio
- Add additional status information output while searching for visual studio installation
- Change search order to search for more recent releases first.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • juggler/trunk/build_windows.py

    r18824 r18977  
    8686         vs_ver = '2005' 
    8787 
    88       printStatus("It appears that we will be using Visual Studio " + vs_ver) 
     88      printStatus("It appears that we will be using Visual Studio %s"%vs_ver) 
     89      #printStatus("   compiler version: %s.%s"%(cl_major,cl_minor)) 
    8990 
    9091   in_status  = cl_stdin.close() 
     
    100101      # installation. 
    101102      if not reattempt: 
     103         printStatus("Visual studio not in path, attempting to find...") 
    102104         # Common installation directories for Visual Studio 7.x. 
    103          vs_dirs = [r'C:\Program Files\Microsoft Visual Studio .NET', 
     105         vs_dirs = [r'C:\Program Files\Microsoft Visual Studio 8', 
    104106                    r'C:\Program Files\Microsoft Visual Studio .NET 2003', 
    105                     r'C:\Program Files\Microsoft Visual Studio 8' 
     107                    r'C:\Program Files\Microsoft Visual Studio .NET', 
    106108                   ] 
    107109 
    108110         for d in vs_dirs: 
    109             if os.path.exists(d): 
    110                printStatus("NOTE: Using Visual Studio installation in") 
     111            printStatus("Trying path: %s"%d) 
     112            if not os.path.exists(d): 
     113               printStatus("  does not exist.") 
     114            else: 
     115               printStatus("   Existings.  Using: %s"%d) 
    111116               printStatus("      " + d) 
    112117               vs_path = [os.path.join(d, r'Common7\IDE'), 
     
    120125 
    121126               # Try again to guess the Visual Studio version. 
    122                return guessBoostToolset(True) 
     127               return detectVisualStudioVersion(True)                
    123128 
    124129         # If execution reaches this point, our attempts to guess the 
     
    21202125 
    21212126if __name__ == '__main__': 
     2127   main() 
     2128    
     2129if __name__ == '__main__' and False: 
    21222130   try: 
    21232131      main()