Skip to content

Commit

Permalink
Merge branch 'master' of github.com:pradosoft/prado
Browse files Browse the repository at this point in the history
  • Loading branch information
ciromattia committed Nov 26, 2013
2 parents f668d23 + 7f2ffe0 commit 94462d0
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 15 deletions.
2 changes: 1 addition & 1 deletion bin/prado-cli.php
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ protected function addTests($test,$path,$recursive=true,$match=null)
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);
Expand Down
12 changes: 0 additions & 12 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand All @@ -58,7 +57,6 @@
Surrounding files
-->
<fileset dir="." id="misc">
<exclude name="**/.svn"/>
<exclude name="**/*.bak"/>
<exclude name="**/*~"/>
<include name="COPYRIGHT"/>
Expand All @@ -72,7 +70,6 @@
Documentation
-->
<fileset dir="." id="docs">
<exclude name="**/.svn"/>
<exclude name="**/*.bak"/>
<exclude name="**/*~"/>
<exclude name="**/latex"/>
Expand All @@ -85,7 +82,6 @@
Demos
-->
<fileset dir="." id="demos">
<exclude name="**/.svn"/>
<exclude name="**/*.bak"/>
<exclude name="**/*~"/>
<exclude name="**/runtime/*"/>
Expand Down Expand Up @@ -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"/>
Expand Down Expand Up @@ -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"/>
Expand All @@ -345,7 +338,6 @@
<echo>Checking js files..</echo>
<jsllint>
<fileset dir="framework">
<exclude name="**/.svn"/>
<exclude name="**/*.bak"/>
<exclude name="**/*~"/>
<include name="**/*.js"/>
Expand All @@ -355,7 +347,6 @@
<echo>Checking xml files..</echo>
<xmllint>
<fileset dir="framework">
<exclude name="**/.svn"/>
<exclude name="**/*.bak"/>
<exclude name="**/*~"/>
<include name="**/*.xml"/>
Expand All @@ -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"/>
Expand All @@ -377,7 +367,6 @@
<echo>Checking js files..</echo>
<jsllint>
<fileset dir="demos">
<exclude name="**/.svn"/>
<exclude name="**/*.bak"/>
<exclude name="**/*~"/>
<include name="**/*.js"/>
Expand All @@ -387,7 +376,6 @@
<echo>Checking xml files..</echo>
<xmllint>
<fileset dir="demos">
<exclude name="**/.svn"/>
<exclude name="**/*.bak"/>
<exclude name="**/*~"/>
<include name="**/*.xml"/>
Expand Down
1 change: 0 additions & 1 deletion buildscripts/classtree/build.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
'pradolite.php',
'prado-cli.php',
'JSMin.php',
'.svn',
'/I18N/core',
'/3rdParty',
'/Testing',
Expand Down
2 changes: 1 addition & 1 deletion framework/pradolite.php
Original file line number Diff line number Diff line change
@@ -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.
Expand Down

0 comments on commit 94462d0

Please sign in to comment.