diff options
| author | Ciro Mattia Gonano <ciromattia@gmail.com> | 2013-11-26 10:02:21 +0100 |
|---|---|---|
| committer | Ciro Mattia Gonano <ciromattia@gmail.com> | 2013-11-26 10:02:21 +0100 |
| commit | 94462d073853874e9c52b7863f05b9787de6d8d0 (patch) | |
| tree | 4b9fd8d1529f48ae327f1f157803158ffb7bd541 | |
| parent | f668d239e4d897aecb4d8ff25c7080ea152c0e54 (diff) | |
| parent | 7f2ffe05d5f5fa2001f97790aecf2e68f91bbe6a (diff) | |
Merge branch 'master' of github.com:pradosoft/prado
| -rwxr-xr-x | bin/prado-cli.php | 2 | ||||
| -rw-r--r-- | build.xml | 12 | ||||
| -rw-r--r-- | buildscripts/classtree/build.php | 1 | ||||
| -rw-r--r-- | framework/pradolite.php | 2 |
4 files changed, 2 insertions, 15 deletions
diff --git a/bin/prado-cli.php b/bin/prado-cli.php index 4fa70c08..b4b43062 100755 --- a/bin/prado-cli.php +++ b/bin/prado-cli.php @@ -569,7 +569,7 @@ class PradoCommandLineUnitTest extends PradoCommandLineAction if($match==null||($match!=null && $this->hasMatch($match,$entry))) $test->addTestFile($path.'/'.$entry); } - if($entry!=='.' && $entry!=='..' && $entry!=='.svn' && is_dir($path.'/'.$entry) && $recursive) + if($entry!=='.' && $entry!=='..' && is_dir($path.'/'.$entry) && $recursive) $this->addTests($test,$path.'/'.$entry,$recursive,$match); } closedir($dir); @@ -37,7 +37,6 @@ All Source Files in framework --> <fileset dir="." id="framework"> - <exclude name="**/.svn"/> <exclude name="**/*.bak"/> <exclude name="**/*~"/> <exclude name="**/pradolite.php"/><!-- will be generated --> @@ -58,7 +57,6 @@ Surrounding files --> <fileset dir="." id="misc"> - <exclude name="**/.svn"/> <exclude name="**/*.bak"/> <exclude name="**/*~"/> <include name="COPYRIGHT"/> @@ -72,7 +70,6 @@ Documentation --> <fileset dir="." id="docs"> - <exclude name="**/.svn"/> <exclude name="**/*.bak"/> <exclude name="**/*~"/> <exclude name="**/latex"/> @@ -85,7 +82,6 @@ Demos --> <fileset dir="." id="demos"> - <exclude name="**/.svn"/> <exclude name="**/*.bak"/> <exclude name="**/*~"/> <exclude name="**/runtime/*"/> @@ -201,8 +197,6 @@ php="false" templateconfig="buildscripts/apigen/pradosoft/config.neon" /> - <echo>Cleaning svn directories from API manuals...</echo> - <delete dir="${build.doc.dir}/manual/resources/.svn" includeemptydirs="true" failonerror="true" /> <echo>Indexing API manuals...</echo> <prado-api-index docdir="${build.doc.dir}/manual" todir="${build.doc.dir}/manual"/> @@ -335,7 +329,6 @@ <echo>Checking php files..</echo> <phplint deprecatedAsError="true"> <fileset dir="framework"> - <exclude name="**/.svn"/> <exclude name="**/*.bak"/> <exclude name="**/*~"/> <include name="**/*.php"/> @@ -345,7 +338,6 @@ <echo>Checking js files..</echo> <jsllint> <fileset dir="framework"> - <exclude name="**/.svn"/> <exclude name="**/*.bak"/> <exclude name="**/*~"/> <include name="**/*.js"/> @@ -355,7 +347,6 @@ <echo>Checking xml files..</echo> <xmllint> <fileset dir="framework"> - <exclude name="**/.svn"/> <exclude name="**/*.bak"/> <exclude name="**/*~"/> <include name="**/*.xml"/> @@ -367,7 +358,6 @@ <echo>Checking php files..</echo> <phplint deprecatedAsError="true"> <fileset dir="demos"> - <exclude name="**/.svn"/> <exclude name="**/*.bak"/> <exclude name="**/*~"/> <include name="**/*.php"/> @@ -377,7 +367,6 @@ <echo>Checking js files..</echo> <jsllint> <fileset dir="demos"> - <exclude name="**/.svn"/> <exclude name="**/*.bak"/> <exclude name="**/*~"/> <include name="**/*.js"/> @@ -387,7 +376,6 @@ <echo>Checking xml files..</echo> <xmllint> <fileset dir="demos"> - <exclude name="**/.svn"/> <exclude name="**/*.bak"/> <exclude name="**/*~"/> <include name="**/*.xml"/> diff --git a/buildscripts/classtree/build.php b/buildscripts/classtree/build.php index 44700be4..f7b8d7e7 100644 --- a/buildscripts/classtree/build.php +++ b/buildscripts/classtree/build.php @@ -12,7 +12,6 @@ $exclusions=array( 'pradolite.php', 'prado-cli.php', 'JSMin.php', - '.svn', '/I18N/core', '/3rdParty', '/Testing', diff --git a/framework/pradolite.php b/framework/pradolite.php index cb0db1f0..40ad7ccd 100644 --- a/framework/pradolite.php +++ b/framework/pradolite.php @@ -1,7 +1,7 @@ <?php /** * File Name: pradolite.php - * Last Update: 2013/11/26 09:44:24 + * Last Update: 2013/11/26 09:57:19 * Generated By: buildscripts/phpbuilder/build.php * * This file is used in lieu of prado.php to boost PRADO application performance. |