Ticket #3597: 3597_ckpackager.patch

_source/includes/ckpackager.js

@@ -11 +11 @@
 
         getPackPath : function( relativePath )
         {
-                var file = new File( CKPACKAGER.packDir, relativePath );
+                var file;
+
+                if ( relativePath )
+                        file = new File( CKPACKAGER.packDir, relativePath );
+                else
+                        file = new File( CKPACKAGER.packDir );
+
                 return file.getAbsolutePath();
         },
 

_source/includes/packagefile.js

@@ -47 +47 @@
 
                 print( 'Packaging file ' + CKPACKAGER.tools.getFileName( this.output ) + '\n' );
 
+                if ( CKPACKAGER.verbose )
+                        var packPath = CKPACKAGER.getPackPath();
+                
                 for ( var i = 0 ; i < this.files.length ; i++ )
                 {
                         var file = this.files[ i ];
 
                         if ( CKPACKAGER.verbose )
-                                print( '    Adding ' + CKPACKAGER.tools.getFileName( file ) );
+                                print( '    Adding ' + file.replace( packPath, '' ) );
 
                         source.push( CKPACKAGER.tools.readFile( file ), '\n' );
                 }
@@ -80 +83 @@
                         throw e;
                 }
 
-                print( '' );
+                print( '\n' );
                 print( '    Number of files processed: ' + this.files.length );
                 print( '    Original size............: ' + source.length + ' bytes' );
                 print( '    Output file size.........: ' + compressed.length + ' bytes ('

_source/includes/scriptcompressor.js

@@ -1231 +1231 @@
 
                         if ( !noCheck )
                         {
-                                print( '' );
-                                print( '    Checking compressed code...' );
+                                System.out.print( '\r    Checking compressed code...' );
                                 parser.parse( compressed/*.replace( /;/g, ';\n' )*/, null, 1 );
                         }