Ticket #5431: 5431.patch

_source/includes/ckreleaser.js

@@ -14 +14 @@
         path : "",
         revisionNumber : 0,
 
-        timestamp : ( function()
-        {
-                var time = new Date();
+        timestamp : 0,
 
-                var timestamp = Integer.toString( time.getUTCFullYear() % 1000, 36 )
-                                + Integer.toString( time.getUTCMonth(), 36 ) + Integer.toString( time.getUTCDate(), 36 )
-                                + Integer.toString( time.getUTCHours(), 36 );
-
-                return timestamp.toUpperCase();
-        } )(),
-
         load : function( className )
         {
                 if ( CKRELEASER.isCompiled )

_source/includes/releaser.js

@@ -292 +292 @@
                 }
                 if ( text.indexOf( "%REV%" ) != -1 )
                 {
-                        if ( !CKRELEASER.revisionNumber )
-                        {
-                                try
-                                {
-                                        var o =
-                                        {
-                                                        output : ""
-                                        };
-
-                                        runCommand( "svn", "info", CKRELEASER.sourceDir, o );
-
-                                        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";
-                        }
-
                         text = text.replace( /%REV%/g, CKRELEASER.revisionNumber );
 
                         replaced = true;
@@ -478 +445 @@
                                         throw "Target directory must be located outside the source directory";
                         }
 
+                        if ( !CKRELEASER.revisionNumber )
+                        {
+                                try
+                                {
+                                        var o =
+                                        {
+                                                        output : ""
+                                        };
+
+                                        runCommand( "svn", "info", CKRELEASER.sourceDir, o );
+
+                                        if ( o.output.indexOf( "Revision:" ) != -1 )
+                                                CKRELEASER.revisionNumber = parseInt( 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";
+                        }
+
+                        if ( !CKRELEASER.timestamp )
+                        {
+                                var now = new Date();
+                                var timestamp = Integer.toString( now.getUTCFullYear() % 1000, 36 )
+                                                + Integer.toString( now.getUTCMonth(), 36 ) + Integer.toString( now.getUTCDate(), 36 )
+                                                + Integer.toString( now.getUTCHours(), 36 );
+
+                                if ( typeof CKRELEASER.revisionNumber == 'number' )
+                                        timestamp += Integer.toString( CKRELEASER.revisionNumber, 36 );
+
+                                print( '\nGenerating timestamp (base36 encode of YYMMDDHH[revision_number]): ' + timestamp.toUpperCase() );
+
+                                CKRELEASER.timestamp = timestamp.toUpperCase();
+                        }
+
                         if ( !releaseDir.mkdirs() )
                                 throw "Cannot create release directory (" + releaseDir + ")";