From 6f9ee03f2a58bd1c6c7afe738b553f1176464137 Mon Sep 17 00:00:00 2001
From: "haertl.mike" <>
Date: Fri, 5 Dec 2008 13:48:56 +0000
Subject: Moved prado-cli/prado-cli.bat to framework folder

---
 .gitattributes          |  4 ++--
 UPGRADE                 |  2 ++
 framework/prado-cli     |  4 ++++
 framework/prado-cli.bat | 39 +++++++++++++++++++++++++++++++++++++++
 prado-cli               |  4 ----
 prado-cli.bat           | 39 ---------------------------------------
 6 files changed, 47 insertions(+), 45 deletions(-)
 create mode 100755 framework/prado-cli
 create mode 100644 framework/prado-cli.bat
 delete mode 100755 prado-cli
 delete mode 100644 prado-cli.bat

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/framework/prado-cli b/framework/prado-cli
new file mode 100755
index 00000000..0d504299
--- /dev/null
+++ b/framework/prado-cli
@@ -0,0 +1,4 @@
+#!/usr/bin/env php
+<?php
+//execute the command line tool
+include(dirname(__FILE__).'/prado-cli.php');
diff --git a/framework/prado-cli.bat b/framework/prado-cli.bat
new file mode 100644
index 00000000..38d02850
--- /dev/null
+++ b/framework/prado-cli.bat
@@ -0,0 +1,39 @@
+@echo off
+
+rem *************************************************************
+rem ** CLI for Windows based systems (based on phing.bat)
+rem *************************************************************
+
+rem This script will do the following:
+rem - check for PHP_COMMAND env, if found, use it.
+rem   - if not found detect php, if found use it, otherwise err and terminate
+
+if "%OS%"=="Windows_NT" @setlocal
+
+rem %~dp0 is expanded pathname of the current script under NT
+set PRADO_DIR=%~dp0
+
+goto init
+
+:init
+
+if "%PHP_COMMAND%" == "" goto no_phpcommand
+
+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%\prado-cli.php" %1 %2 %3 %4 %5 %6 %7 %8 %9
+)
+goto cleanup
+
+:no_phpcommand
+rem echo ------------------------------------------------------------------------
+rem echo WARNING: Set environment var PHP_COMMAND to the location of your php.exe
+rem echo          executable (e.g. C:\PHP\php.exe).  (assuming php.exe on PATH)
+rem echo ------------------------------------------------------------------------
+set PHP_COMMAND=php.exe
+goto init
+
+:cleanup
+if "%OS%"=="Windows_NT" @endlocal
+rem pause
diff --git a/prado-cli b/prado-cli
deleted file mode 100755
index 6db1e002..00000000
--- a/prado-cli
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env php
-<?php
-//execute the command line tool
-include(dirname(__FILE__).'/framework/prado-cli.php');
diff --git a/prado-cli.bat b/prado-cli.bat
deleted file mode 100644
index b3fe9f3e..00000000
--- a/prado-cli.bat
+++ /dev/null
@@ -1,39 +0,0 @@
-@echo off
-
-rem *************************************************************
-rem ** CLI for Windows based systems (based on phing.bat)
-rem *************************************************************
-
-rem This script will do the following:
-rem - check for PHP_COMMAND env, if found, use it.
-rem   - if not found detect php, if found use it, otherwise err and terminate
-
-if "%OS%"=="Windows_NT" @setlocal
-
-rem %~dp0 is expanded pathname of the current script under NT
-set PRADO_DIR=%~dp0
-
-goto init
-
-: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
-) 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
-)
-goto cleanup
-
-:no_phpcommand
-rem echo ------------------------------------------------------------------------
-rem echo WARNING: Set environment var PHP_COMMAND to the location of your php.exe
-rem echo          executable (e.g. C:\PHP\php.exe).  (assuming php.exe on PATH)
-rem echo ------------------------------------------------------------------------
-set PHP_COMMAND=php.exe
-goto init
-
-:cleanup
-if "%OS%"=="Windows_NT" @endlocal
-rem pause
-- 
cgit v1.2.3