@@ -16,7 +16,7 @@ function help() { echo str_repeat(" ", 26) . "WHITESPACE_ONLY\n"; echo str_repeat(" ", 26) . "SIMPLE_OPTIMIZATIONS (default)\n"; echo str_repeat(" ", 26) . "ADVANCED_OPTIMIZATIONS\n"; - echo str_pad(" -j, --join", 26, " ") . "if folder is given js files are joined in all.min.js\n"; + echo str_pad(" -c, --combine", 26, " ") . "if folder is given js files are combined in all.min.js\n"; echo str_pad(" -h, --help", 26, " ") . "show this\n"; exit; @@ -44,9 +44,9 @@ foreach ($arguments as $arg) { $options[] = 'supress_warnings'; break; - case '--join': - case '-j': - $options[] = 'join'; + case '--combine': + case '-c': + $options[] = 'combine'; break; case '--quiet': compile.php @@ -10,7 +10,7 @@ Class compiler { $quiet = in_array('quiet', $options); $pretend = in_array('pretend', $options); $recursive = in_array('recursive', $options); - $join = in_array('join', $options); + $combine = in_array('combine', $options); $supress_warnings = in_array('supress_warnings', $options); $compilation_level = in_array('compilation_level', $options) ? $options['compilation_level'] : 'SIMPLE_OPTIMIZATIONS'; @@ -25,7 +25,7 @@ Class compiler { // is the path is a folder, we get all javascript files on these folder if (is_dir($path)) - self::folder($curl, $path, $quiet, $pretend, $recursive, $join, $supress_warnings, $compilation_level); + self::folder($curl, $path, $quiet, $pretend, $recursive, $combine, $supress_warnings, $compilation_level); else self::file($curl, $path, $quiet, $pretend, $supress_warnings, $compilation_level); @@ -33,7 +33,7 @@ Class compiler { curl_close($curl); } - private static function folder($curl, $folder_path, $quiet, $pretend, $recursive, $join, $supress_warnings, $compilation_level) { + private static function folder($curl, $folder_path, $quiet, $pretend, $recursive, $combine, $supress_warnings, $compilation_level) { // loop through all files on the folder to get javascript files $it = new DirectoryIterator($folder_path); @@ -45,7 +45,7 @@ Class compiler { // if it's a folder, scan it too if ($file->isDir()) { if ($recursive) - self::folder($curl, $path, $quiet, $pretend, $recursive, $join, $supress_warnings, $compilation_level); + self::folder($curl, $path, $quiet, $pretend, $recursive, $combine, $supress_warnings, $compilation_level); } elseif (preg_match('/(?<!\.min)\.js$/i', $path)) $files[] = $path; @@ -53,7 +53,7 @@ Class compiler { if (count($files) > 0) // combine the files before sending the code to google - if ($join) { + if ($combine) { foreach ($files as $path) $code[] = file_get_contents($path); compiler.php 82b4413cb96261087441b7355e6833826d970118 ecentinela ecentinela@gmail.com http://github.com/ecentinela/compiler/commit/fd44b9f4463f055210a4e2c655c7bbee1e35aa9f fd44b9f4463f055210a4e2c655c7bbee1e35aa9f 2009-11-09T02:52:03-08:00 2009-11-09T02:52:03-08:00 changed the option -j --join to -c --combine aa770b615452ab8d5c156ee5ff03b8c6c2c19fff ecentinela ecentinela@gmail.com