Changeset 1100 for trunk/buildscripts

Timestamp:

05/28/2006 10:08:07 PM (3 years ago)

Author:

xue

Message:

Merge from 3.0 branch till 1099.

Files:

• trunk/buildscripts/jsbuilder/build.php (modified) (3 diffs)

trunk/buildscripts/jsbuilder/build.php

@@ -23 +23 @@
  * The root directory for storing all source js files
  */
-define('SOURCE_DIR',realpath(dirname(__FILE__).'/../../framework/Web/JavaScripts'));
+define('SOURCE_DIR',realpath(dirname(__FILE__).'/../../framework/Web/Javascripts'));
 /**
  * The directory for storing compressed js files
  */
-define('TARGET_DIR',realpath(dirname(__FILE__).'/../../framework/Web/JavaScripts/js'));
+define('TARGET_DIR',realpath(dirname(__FILE__).'/../../framework/Web/Javascripts/js'));
 /**
  * Location of the perl JS doc generator.
@@ -149 +149 @@
  * loop through all target files and build them one by one
  */
-foreach($libraries as $libFile => $sourceFiles)
+foreach($libraries as $jsFile => $sourceFiles)
 {
-        if(!empty($requestedLibs) && !in_array($libFile,$requestedLibs))
+        if(!empty($requestedLibs) && !in_array($jsFile,$requestedLibs))
                 continue;
-        $libFile=TARGET_DIR.'/'.$libFile;
-        echo "\nBuilding $libFile...\n";
+        $libFile=TARGET_DIR.'/'.$jsFile;
+        echo "\nBuilding $jsFile...\n";
         $contents='';
-        foreach($sourceFiles as $sourceFile)
+        foreach($sourceFiles as $sourceJsFile)
         {
-                $sourceFile=SOURCE_DIR.'/'.$sourceFile;
+                $sourceFile=SOURCE_DIR.'/'.$sourceJsFile;
                 if(!is_file($sourceFile))
                         echo "Source file not found: $sourceFile\n";
 
-                echo "...adding $sourceFile\n";
+                echo "...adding $sourceJsFile\n";
                 $contents.=file_get_contents($sourceFile)."\n\n";
         }
@@ -171 +171 @@
         unset($jsMin);
         @unlink($tempFile);
-        echo "Saving file {$libFile}\n";
+        echo "Saving file {$jsFile}\n"; 
         $builds++;
 }
-if(isset($argv[1]) && preg_match('/doc*/', $argv[1]))
+
+if(isset($argv[1]) && preg_match('/(doc)+/', $argv[1]))
 {
         $files = "";