From e1e034ced29b0b9bf11a49798b4fba4d3dd0164d Mon Sep 17 00:00:00 2001
From: wei <>
Date: Fri, 21 Apr 2006 11:41:21 +0000
Subject: Update javascript libraries, rewrote client-side validators, removed
 some js files, simplified javascript compression.

---
 buildscripts/jsbuilder/build.php | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'buildscripts/jsbuilder/build.php')

diff --git a/buildscripts/jsbuilder/build.php b/buildscripts/jsbuilder/build.php
index 6689d2c6..d5d04713 100644
--- a/buildscripts/jsbuilder/build.php
+++ b/buildscripts/jsbuilder/build.php
@@ -6,9 +6,6 @@
  * This script compresses a list of javascript source files
  * and merges them into a few for redistribution.
  *
- * This script should be run from command line with PHP.
- * JRE 1.4 or above is required in order to run the js compression program.
- *
  * By default, all libraries will be built.
  * You may, however, specify one or several to be built (to save time during development).
  * To do so, pass the library names (without .js) as command line arguments.
@@ -22,12 +19,6 @@
  * @package Tools
  */
 
-//compress using a script, has more options but lesss robut
-//define('COMPRESS_COMMAND','java -jar '.dirname(__FILE__).'/custom_rhino.jar packer.js %s > %s');
-
-//compress using build-in engine, very robust.
-define('COMPRESS_COMMAND','java -jar '.dirname(__FILE__).'/custom_rhino.jar -c %s > %s');
-
 /**
  * The root directory for storing all source js files
  */
@@ -51,7 +42,6 @@ $libraries = array(
 		//base javascript functions
 		'prototype/prototype.js',
 		'prototype/base.js',
-		'extended/util.js',
 		'extended/base.js',
 		'prototype/string.js',
 		'extended/string.js',
@@ -62,12 +52,14 @@ $libraries = array(
 
 		//dom functions
 		'prototype/dom.js',
-		'extended/dom.js',
 		'prototype/form.js',
 		'prototype/event.js',
 		'extended/event.js',
 		'prototype/position.js',
 
+		//element selectors
+		'prototype/selector.js',
+
 		//build dom elements with DIV, A, UL, etc functions
 		'effects/builder.js',
 		'extended/builder.js',
@@ -114,8 +106,8 @@ $libraries = array(
 
 	//validator
 	'validator.js' => array(
-		'prado/validation.js',
-		'prado/validators.js'
+		'prado/validation3.js'
+		//'prado/validators.js'
 	),
 
 	//date picker
@@ -157,15 +149,24 @@ foreach($libraries as $libFile => $sourceFiles)
 		echo "...adding $sourceFile\n";
 		$contents.=file_get_contents($sourceFile)."\n\n";		
 	}
-	$tempFile=$libFile.'.tmp';
-	file_put_contents($tempFile,$contents);
-	$command=sprintf(COMPRESS_COMMAND,$tempFile,$libFile);
-	system($command);
-	@unlink($tempFile);
+
+	file_put_contents($libFile,compress_js($contents));
+	echo "Saving file {$libFile}\n"; 
 	$builds++;
 }
 if($builds > 0)	
 	echo "\nJavascript build complete, {$builds} file(s) compressed.";
 else
 	echo "No files to build.";
+
+//remove comments from javascript files.
+function compress_js($string)
+{
+	$string = preg_replace('/\/\/[^\n\r]*[\n\r]/', ' ', $string);
+	$string = preg_replace('/\/\*[^*]*\*+([^\/][^*]*\*+)*\//', ' ', $string);
+	$string = preg_replace('/  |\t|\r/', '', $string);
+	$string = preg_replace('/(\n[ \t]*){2,}/', "\n", $string);
+	return $string;
+}
+
 ?>
\ No newline at end of file
-- 
cgit v1.2.3