Ticket #3546: 3546.patch

_source/includes/ckreleaser.js

@@ -12 +12 @@
         verbose : 0,
         os : System.getProperty( "os.name" ).substring( 0, 3 ).toLowerCase(),
         path : "",
+        revisionNumber : 0,
 
         timestamp : ( function()
         {

_source/includes/releaser.js

@@ -254 +254 @@
                 }
                 if ( text.indexOf( "%REV%" ) != -1 )
                 {
-                        var o =
+                        if ( !CKRELEASER.revisionNumber )
                         {
-                                output : ""
-                        };
+                                try
+                                {
+                                        var o =
+                                        {
+                                                        output : ""
+                                        };
 
-                        runCommand( "svn", "info", CKRELEASER.sourceDir, o );
+                                        runCommand( "svn", "info", CKRELEASER.sourceDir, o );
 
-                        if ( o.output.indexOf( "Revision:" ) != -1 )
-                        {
-                                var rev = regexLib.packagerRev.matcher( o.output ).replaceAll( '$1' );
-                                text = text.replace( /%REV%/g, rev );
+                                        if ( o.output.indexOf( "Revision:" ) != -1 )
+                                        {
+                                                CKRELEASER.revisionNumber = regexLib.packagerRev.matcher( o.output ).replaceAll( '$1' );
+                                        }
+                                        else
+                                        {
+                                                if ( o.output.indexOf( "not a working" ) != -1 )
+                                                        print( "\nWARNING: Unable to fetch the revision number, source directory is not under version control: "
+                                                                        + CKRELEASER.sourceDir );
+                                                else
+                                                        print( "\nWARNING: Unable to fetch the revision number, make sure that Subversion's bin directory is in your system path." );           
+                                        }
+                                }
+                                catch( e )
+                                {
+                                        print( "\nWARNING: Unable to run \"svn\" command to get the revision number, make sure that Subversion is installed and that Subversion's bin directory is in your system path." );
+                                }
+                                
+                                if ( !CKRELEASER.revisionNumber )
+                                        CKRELEASER.revisionNumber = "UNKNOWN";
                         }
-                        else
-                        {
-                                if ( o.output.indexOf( "not a working" ) != -1 )
-                                        print( "WARNING: Unable to fetch the revision number, source directory is not under version control: "
-                                                        + CKRELEASER.sourceDir );
-                                else
-                                        print( "WARNING: Unable to fetch the revision number, make sure that Subversion’s bin directory is in your system path." );
-                                text = text.replace( /%REV%/g, "UNKNOWN" );
-                        }
 
+                        text = text.replace( /%REV%/g, CKRELEASER.revisionNumber );
+
                         replaced = true;
                 }
                 if ( text.indexOf( "%TIMESTAMP%" ) != -1 )