Changeset 1756

Timestamp:

11/09/08 15:56:44 (2 months ago)

Author:

Chuck.Esterbrook

Message:

Attempt to use gacutil.exe if Publish().gacInstall throws NotImplementedException?.

Files:

• cobra/trunk/Source/InstallFromWorkspace.cobra (modified) (2 diffs)

cobra/trunk/Source/InstallFromWorkspace.cobra

@@ -285 +285 @@
                 assert 'Usage' in output
 
-        def locateGacUtil
-                .startStage('Locate gacutil.exe')
+        def locateGacUtil(startStage as bool)
+                if startStage, .startStage('Locate gacutil.exe')
                 slash = .slash
                 gacutil = 'gacutil'
@@ -382 +382 @@
         def installCobraLibraryToGAC
                 .startStage('Install Cobra standard library to the GAC')
-                if false
-                        # use gacutil.exe
+                print 'Invoking Publish.GacInstall...'
+                try
+                        Publish().gacInstall('Cobra.Lang.dll')
+                        print 'Done.'
+                catch NotImplementedException
+                        print 'Not implemented exception.'
+                        print 'Will attempt to use gacutil.exe.'
+                        .locateGacUtil(false)
                         .runCommand(_gacutil, '-i Cobra.Lang.dll -f')
-        
                         output = .runCommand(_gacutil, '-l Cobra.Lang')
-        
                         if 'Cobra.Lang, Version=' not in output
                                 .error('Cannot see Cobra.Lang in the gacutil output to list it above.')
                         # TODO: verify the version number: Cobra.Lang, Version=0.0.1.0
-                else
-                        print 'Invoking Publish.GacInstall...'
-                        Publish().gacInstall('Cobra.Lang.dll')
-                        print 'Done.'
                 print