Changeset 2267 for FCKeditor/branches/features/new_samples/_dev/releaser/fckreleaser.php

Timestamp:

2008-07-23 12:03:16 (6 months ago)

Author:

martinkou

Message:

Merged all changes in trunk up to r2266.

Files:

• FCKeditor/branches/features/new_samples/_dev/releaser/fckreleaser.php (modified) (8 diffs)

FCKeditor/branches/features/new_samples/_dev/releaser/fckreleaser.php

@@ -82 +82 @@
 {
         $dirPath = str_replace( '\\', '/', $dirPath ) ;
-
+        
         if ( substr( $dirPath, -1, 1 ) != '/' )
                 $dirPath .= '/' ;
-
+        
         return $dirPath ;
 }
@@ -170 +170 @@
                 if ( isset( $releaseNode->Children[ 'IGNOREFILE' ] ) )
                 {
-                        $ignoreNodes = $releaseNode->Children[ 'IGNOREFILE' ] ;
+                        $ignoreNodes = $releaseNode->Children[ 'IGNOREFILE' ] ; 
                         foreach ( $ignoreNodes as $ignoreNode )
                         {
@@ -181 +181 @@
                 if ( isset( $releaseNode->Children[ 'ORIGINALFILE' ] ) )
                 {
-                        $originalNodes = $releaseNode->Children[ 'ORIGINALFILE' ] ;
+                        $originalNodes = $releaseNode->Children[ 'ORIGINALFILE' ] ;     
                         foreach ( $originalNodes as $originalNode )
                         {
-                                $this->OriginalFiles[] = (object)array(
+                                $this->OriginalFiles[] = (object)array( 
                                         'Source' => $originalNode->Attributes[ 'SOURCEPATH' ],
                                         'Target' => $originalNode->Attributes[ 'TARGETPATH' ] ) ;
@@ -239 +239 @@
                 while ( $file = readdir( $sourceDirHandler ) )
                 {
-                        // Skip ".", ".." and hidden fields (Unix).
+                        // Skip ".", ".." and hidden fields (Unix). 
                         if ( substr( $file, 0, 1 ) == '.' )
                                 continue ;
@@ -327 +327 @@
                 // Project start time (registration at SourceForge, actually = 2003-03-01 18:20).
                 $startTime = gmmktime( 18, 20, 0, 3, 1, 2003 ) ;
-
+                
                 $currentTime = time() ;
-
+                
                 // Get the number of seconds since the project startup.
                 $seconds = $currentTime - $startTime ;
@@ -597 +597 @@
                 $script = $stringsProc->ProtectStrings( $script ) ;
 
+                // Remove "/* */" comments
+                $script = preg_replace(
+                        '/(?<!\/)\/\*.*?\*\//s',
+                        '', $script ) ;
+
                 // Remove "//" comments
                 $script = preg_replace(
-                        '/\/\/.*$/m',
-                        '', $script ) ;
-
-                // Remove "/* */" comments
-                $script = preg_replace(
-                        '/(?m-s:^\s*\/\*).*?\*\//s',
-                        '', $script ) ;
-
+                                '/\/\/.*$/m',
+                                '', $script ) ;
+                
                 // Remove spaces before the ";" at the end of the lines
                 $script = preg_replace(
@@ -966 +966 @@
                 }
 
+                // Fix invalid line breaks (must be all CRLF).
+                $data = preg_replace(
+                        '/(?:(?<!\r)\n)|(?:\r(?!\n))/im',
+                        "\r\n", $data ) ;
+
                 return $data ;
         }
@@ -985 +990 @@
         function ProtectStrings( $source )
         {
+                // Catches string literals, regular expressions and conditional comments.
                 return preg_replace_callback(
-                        '/(?:("|\').*?(?<!\\\\)\1|(?<![\/\\\\])\/[^\/\*].*?(?<!\\\\)\/)/',
+                        '/(?:("|\').*?(?<!\\\\)\1)|(?:(?<![\*\/\\\\])\/[^\/\*].*?(?<!\\\\)\/(?=([\.\w])|(\s*[,;}\)])))|(?s:\/\*@(?:cc_on|if|elif|else|end).*?@\*\/)/',
                         array( &$this, '_ProtectStringsMatch' ), $source ) ;
         }