Updated phpbuilder and the file list. Added pradolite.php.

2 files changed, 68 insertions, 6 deletions

diff --git a/tools/phpbuilder/build.php b/tools/phpbuilder/build.php
index 24626b85..6df74923 100644
--- a/tools/phpbuilder/build.php
+++ b/tools/phpbuilder/build.php
@@ -38,7 +38,7 @@ $lines=file(SCRIPT_FILES);
 foreach($lines as $line)

 {

 	$line=trim($line);

-	if($line==='')

+	if($line==='' || $line[0]==='#')

 		continue;

 	echo 'adding '.FRAMEWORK_DIR.'/'.$line."\n";

 	$input=file_get_contents(FRAMEWORK_DIR.'/'.$line);

@@ -50,7 +50,7 @@ foreach($lines as $line)
 	$input=preg_replace('/^(include|include_once)\s*\(.*?;/mu','',$input);

 

 	//remove internal logging

-	$input=preg_replace('/^\s*Prado::coreLog.*\s*;\s*$/mu','',$input);

+	$input=preg_replace('/^\s*Prado::trace.*\s*;\s*$/mu','',$input);

 

 	$output.=$input;

 }

@@ -80,8 +80,8 @@ function strip_comments($source)
     } else {

       // token array

       list($id, $text) = $token;

-      switch ($id) { 

-        case T_COMMENT: 

+      switch ($id) {

+        case T_COMMENT:

         case T_ML_COMMENT: // we've defined this

         case T_DOC_COMMENT: // and this

           // no action on comments

diff --git a/tools/phpbuilder/files.txt b/tools/phpbuilder/files.txt
index 011259de..3a82116b 100644
--- a/tools/phpbuilder/files.txt
+++ b/tools/phpbuilder/files.txt
@@ -4,6 +4,8 @@ Collections/TList.php
 Collections/TMap.php

 Data/TXmlDocument.php

 Web/THttpUtility.php

+Data/TCache.php

+Log/TLogger.php

 core.php

 prado.php

 TApplication.php

@@ -13,6 +15,7 @@ Web/THttpResponse.php
 Web/THttpSession.php

 Security/TAuthorizationRule.php

 Web/Services/TPageService.php

+Web/UI/THtmlWriter.php

 Web/UI/TTemplateManager.php

 Web/UI/TThemeManager.php

 Web/UI/TAssetManager.php

@@ -21,5 +24,64 @@ Web/UI/TControl.php
 Web/UI/TTemplateControl.php

 Web/UI/TForm.php

 Web/UI/TClientScriptManager.php

-Web/UI/THtmlWriter.php

-Web/UI/TPage.php
\ No newline at end of file
+Web/UI/TPage.php

+Web/UI/WebControls/TFont.php

+Web/UI/WebControls/TStyle.php

+Web/UI/WebControls/TWebControl.php

+Web/UI/WebControls/TPlaceHolder.php

+Web/UI/WebControls/TLiteral.php

+Web/UI/WebControls/TLabel.php

+Web/UI/WebControls/TImage.php

+Web/UI/WebControls/TImageButton.php

+Web/UI/WebControls/TButton.php

+Web/UI/WebControls/TCheckBox.php

+Web/UI/WebControls/TRadioButton.php

+Web/UI/WebControls/TTextBox.php

+# Web/UI/WebControls/TTextHighlighter.php

+Web/UI/WebControls/TPanel.php

+Web/UI/WebControls/TContent.php

+Web/UI/WebControls/TContentPlaceHolder.php

+Web/UI/WebControls/TExpression.php

+Web/UI/WebControls/TStatements.php

+Web/UI/WebControls/TFileUpload.php

+Web/UI/WebControls/THead.php

+Web/UI/WebControls/THiddenField.php

+Web/UI/WebControls/THyperLink.php

+Web/UI/WebControls/TTable.php

+

+Web/UI/WebControls/TDataSourceControl.php

+Web/UI/WebControls/TDataSourceView.php

+

+Web/UI/WebControls/TDataBoundControl.php

+Web/UI/WebControls/TCheckBoxList.php

+Web/UI/WebControls/TRadioButtonList.php

+Web/UI/WebControls/TBulletedList.php

+

+Web/UI/WebControls/TListControl.php

+Web/UI/WebControls/TListBox.php

+Web/UI/WebControls/TDropDownList.php

+

+Web/UI/WebControls/TJavascriptLogger.php

+Web/UI/WebControls/TLinkButton.php

+

+Web/UI/WebControls/TBaseValidator.php

+Web/UI/WebControls/TRequiredFieldValidator.php

+Web/UI/WebControls/TCompareValidator.php

+Web/UI/WebControls/TRegularExpressionValidator.php

+Web/UI/WebControls/TEmailAddressValidator.php

+Web/UI/WebControls/TCustomValidator.php

+Web/UI/WebControls/TValidationSummary.php

+

+Web/UI/WebControls/TRepeatInfo.php

+Web/UI/WebControls/TRepeater.php

+

+Web/UI/WebControls/TBaseDataList.php

+Web/UI/WebControls/TDataList.php

+Collections/TPagedDataSource.php

+Web/UI/WebControls/TDataGrid.php

+Web/UI/WebControls/TDataGridColumn.php

+Web/UI/WebControls/TBoundColumn.php

+Web/UI/WebControls/TButtonColumn.php

+Web/UI/WebControls/TEditCommandColumn.php

+Web/UI/WebControls/THyperLinkColumn.php

+Web/UI/WebControls/TTemplateColumn.php