Ticket #1527: 1527_ckreleaser.patch

_source/includes/releaser.js

@@ -223 +223 @@
         var regexLib =
         {
                 packagerRemove : Pattern.compile( '(?m-s:^.*?%REMOVE_START%).*?(?m-s:%REMOVE_END%.*?$)', Pattern.DOTALL ),
-                packagerRemoveLine : Pattern.compile( '.*%REMOVE_LINE%.*(?:\\r\\n|\\r|\\n)?' )
+                packagerRemoveLine : Pattern.compile( '.*%REMOVE_LINE%.*(?:\\r\\n|\\r|\\n)?' ),
+                packagerRev : Pattern.compile( '.*Revision: (\\d+).*', Pattern.DOTALL )
         };
 
         /*
          * %VERSION%: 
          *     the "version" string passed to the CKReleaser execution command.
+         * %REVISION%: 
+         *     the SVN revision number of the source directory.
          * %TIMESTAMP%: 
          *     a four characters string containing the
          *     concatenation of the "Base 36" value of each of the following components
@@ -249 +252 @@
                         text = text.replace( /%VERSION%/g, CKRELEASER.version );
                         replaced = true;
                 }
+                if ( text.indexOf( "%REVISION%" ) != -1 )
+                {
+                        var o =
+                        {
+                                output : ""
+                        };
+
+                        runCommand( "svn", "info", CKRELEASER.sourceDir, o );
+
+                        if ( o.output.indexOf( "Revision:" ) != -1 )
+                        {
+                                var rev = regexLib.packagerRev.matcher( o.output ).replaceAll( '$1' );
+                                text = text.replace( /%REVISION%/g, rev );
+                        }
+                        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( /%REVISION%/g, "UNKNOWN" );
+                        }
+
+                        replaced = true;
+                }
                 if ( text.indexOf( "%TIMESTAMP%" ) != -1 )
                 {
                         text = text.replace( /%TIMESTAMP%/g, CKRELEASER.timestamp );