summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes4
-rw-r--r--UPGRADE2
-rwxr-xr-xframework/prado-cli (renamed from prado-cli)2
-rw-r--r--framework/prado-cli.bat (renamed from prado-cli.bat)6
4 files changed, 8 insertions, 6 deletions
diff --git a/.gitattributes b/.gitattributes
index 762440c3..8862b651 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2740,12 +2740,12 @@ framework/Xml/TXmlDocument.php -text
framework/interfaces.php -text
framework/powered.gif -text
framework/powered2.gif -text
+framework/prado-cli -text
+framework/prado-cli.bat -text
framework/prado.php -text
/index.html -text
/phing -text
/phing.bat -text
-/prado-cli -text
-/prado-cli.bat -text
requirements/index.php -text
requirements/messages-bg.txt -text
requirements/messages-id.txt -text
diff --git a/UPGRADE b/UPGRADE
index 05fe6547..baec1403 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -11,6 +11,8 @@ for both A and B.
Upgrading from v3.1.3
---------------------
+- The prado-cli and prado-cli.bat scripts have been moved into
+ the framework folder of the distribution.
Upgrading from v3.1.2
diff --git a/prado-cli b/framework/prado-cli
index 6db1e002..0d504299 100755
--- a/prado-cli
+++ b/framework/prado-cli
@@ -1,4 +1,4 @@
#!/usr/bin/env php
<?php
//execute the command line tool
-include(dirname(__FILE__).'/framework/prado-cli.php');
+include(dirname(__FILE__).'/prado-cli.php');
diff --git a/prado-cli.bat b/framework/prado-cli.bat
index b3fe9f3e..38d02850 100644
--- a/prado-cli.bat
+++ b/framework/prado-cli.bat
@@ -19,10 +19,10 @@ goto init
if "%PHP_COMMAND%" == "" goto no_phpcommand
-IF EXIST ".\framework\prado-cli.php" (
- %PHP_COMMAND% -d html_errors=off -d open_basedir= -q ".\framwork\prado-cli.php" %1 %2 %3 %4 %5 %6 %7 %8 %9
+IF EXIST ".\prado-cli.php" (
+ %PHP_COMMAND% -d html_errors=off -d open_basedir= -q ".\prado-cli.php" %1 %2 %3 %4 %5 %6 %7 %8 %9
) ELSE (
- %PHP_COMMAND% -d html_errors=off -d open_basedir= -q "%PRADO_DIR%\framework\prado-cli.php" %1 %2 %3 %4 %5 %6 %7 %8 %9
+ %PHP_COMMAND% -d html_errors=off -d open_basedir= -q "%PRADO_DIR%\prado-cli.php" %1 %2 %3 %4 %5 %6 %7 %8 %9
)
goto cleanup