Ticket #56: insFromWS.diff

D:/CobraSource/cobra/Source/InstallFromWorkspace.cobra

@@ -294 +294 @@
             CobraCore.runAndCaptureAllOutput(p)
             found = true
             print 'found in system PATH'
-        catch exc as Exception
-            if 'cannot find the file' not in exc.message
-                throw
+        catch exc as FileNotFoundException #Should runAndCaptureAllOutput throw this instead?
+            print exc.message
+        catch exc2 as ComponentModel.Win32Exception # .no-warnings.
+            #print exc2.message
+            pass
+        catch
+            throw
         
         if not found
             # try to find the gacutil
             print 'Searching for gacutil...'
             gacutil = 'gacutil.exe'
+            
             dirs = [
-                r'\Program Files\Microsoft.NET\SDK\v2.0\bin',        # VS 2005 / SDK .NET 2.0
-                r'\Program Files\Microsoft SDKs\Windows\v6.0A\bin',  # VS 2008
+                r'\Microsoft.NET\SDK\v2.0\bin',        # VS 2005 / SDK .NET 2.0
+                r'\Microsoft SDKs\Windows\v6.0A\bin',  # VS 2008
+                r'\Microsoft Visual Studio 8\SDK\v2.0\Bin',
             ]
+            
             for dir in dirs
+                #search drives
                 for drive in Directory.getLogicalDrives
                     drive = drive[:1]  # normalize to just one character
                     if drive <= 'B', continue
-                    path = '[drive]:[dir][.slash][gacutil]'
+                    path = '[drive]:\Program Files[dir][.slash][gacutil]'
                     if File.exists(path)
                         print 'found:', path
                         gacutil = path
                         found = true
                         break
+                    #else
+                        #print path
                 if found, break
+                
+                #search international %ProgramFiles%
+                path = Environment.getFolderPath(Environment.SpecialFolder.ProgramFiles) + '[dir][.slash][gacutil]'
+                if File.exists(path)
+                    print 'found:', path
+                    gacutil = path
+                    found = true
+                #else
+                    #print path
+                if found, break
 
         if not found
             .error('Cannot locate a gacutil. Maybe you can try again using the "Visual Studio Command Prompt" or ".NET SDK Command Prompt".')
@@ -422 +442 @@
             print
 
         # record "svn info" in the installation directory
-        output = .runCommand('svn', 'info', false)
-        svnInfo = '[versionDir][slash]svn_info.text'
-        print 'writing  :', svnInfo
-        print
-        File.writeAllText(svnInfo, output)
+        try 
+            output = .runCommand('svn', 'info', false)
+            svnInfo = '[versionDir][slash]svn_info.text'
+            print 'writing  :', svnInfo
+            print
+            File.writeAllText(svnInfo, output)
+        catch ex as Exception
+            print 'svn is not installed or it is not in the PATH. ' + ex.message
 
     def verifyNewlyInstalledCobra
         .startStage('Verify newly installed Cobra compiler')