Changeset 2244

Timestamp:

2008-07-21 14:18:36 (6 months ago)

Author:

fredck

Message:

Updated to the latest FCKpackager.

Location:

FCKreleaser/trunk

Files:

• _dev/gensinglefile.bat (added)
• fckreleaser.php (modified) (2 diffs)

FCKreleaser/trunk/fckreleaser.php

@@ -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(
@@ -990 +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 ) ;
         }