Changeset 31

Timestamp:

07/12/07 11:48:09 (18 months ago)

Author:

iteman

Message:

- Merged trunk changes r28:r30 into releases/release-0.5.0.

Location:

releases/release-0.5.0

Files:

• package.php (modified) (1 diff)
• package.xml (modified) (3 diffs)
• scripts/testrunner1 (modified) (1 diff)
• scripts/testrunner1.bat (modified) (1 diff)
• scripts/testrunner2 (modified) (1 diff)
• scripts/testrunner2.bat (modified) (1 diff)

releases/release-0.5.0/package.php

@@ -89 +89 @@
 $package->addMaintainer('lead', 'iteman', 'KUBO Atsuhiro', 'iteman@users.sourceforge.net');
 $package->addGlobalReplacement('package-info', '@package_version@', 'version');
-$package->addReplacement('scripts/testrunner1.bat', 'pear-config', '@php_bin@', 'php_bin');
-$package->addReplacement('scripts/testrunner2.bat', 'pear-config', '@php_bin@', 'php_bin');
 $package->addInstallAs('scripts/testrunner1', 'testrunner1');
 $package->addInstallAs('scripts/testrunner1.bat', 'testrunner1.bat');

releases/release-0.5.0/package.xml

@@ -16 +16 @@
  </lead>
  <date>2007-07-12</date>
- <time>03:52:09</time>
+ <time>11:29:35</time>
  <version>
   <release>0.5.0</release>
@@ -51 +51 @@
     <file baseinstalldir="/" name="testrunner1.bat" role="script">
      <tasks:replace from="@package_version@" to="version" type="package-info" />
-     <tasks:replace from="@php_bin@" to="php_bin" type="pear-config" />
     </file>
     <file baseinstalldir="/" name="testrunner2" role="script">
@@ -58 +57 @@
     <file baseinstalldir="/" name="testrunner2.bat" role="script">
      <tasks:replace from="@package_version@" to="version" type="package-info" />
-     <tasks:replace from="@php_bin@" to="php_bin" type="pear-config" />
     </file>
    </dir> <!-- /scripts -->

releases/release-0.5.0/scripts/testrunner1

@@ -1 @@
-#!env php
+#!/usr/bin/env php
 <?php
 /* vim: set expandtab tabstop=4 shiftwidth=4: */

releases/release-0.5.0/scripts/testrunner1.bat

@@ -2 +2 @@
 REM $Id: pearenv.bat 15 2007-05-26 17:31:39Z iteman $
 
+REM *************************************************************
+REM ** Stagehand_TestRunner CLI for Windows based systems (based on symfony.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 SCRIPT_DIR=%~dp0
+SET SCRIPT_DIR=%~dp0
 
-IF "%PHP_PEAR_PHP_BIN%"=="" SET "PHP_PEAR_PHP_BIN=@php_bin@"
+GOTO INIT
+
+:INIT
+
+IF "%PHP_COMMAND%" == "" GOTO NO_PHPCOMMAND
 
 IF EXIST ".\testrunner1" (
-  %PHP_PEAR_PHP_BIN% -d html_errors=off -d open_basedir= -q ".\testrunner1" %1 %2 %3 %4 %5 %6 %7 %8 %9
+  %PHP_COMMAND% -d html_errors=off -d open_basedir= -q ".\testrunner1" %1 %2 %3 %4 %5 %6 %7 %8 %9
 ) ELSE (
-  %PHP_PEAR_PHP_BIN% -d html_errors=off -d open_basedir= -q "%SCRIPT_DIR%testrunner1" %1 %2 %3 %4 %5 %6 %7 %8 %9
+  %PHP_COMMAND% -d html_errors=off -d open_basedir= -q "%SCRIPT_DIR%\testrunner1" %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
 
 REM Local Variables:

releases/release-0.5.0/scripts/testrunner2

@@ -1 @@
-#!env php
+#!/usr/bin/env php
 <?php
 /* vim: set expandtab tabstop=4 shiftwidth=4: */

releases/release-0.5.0/scripts/testrunner2.bat

@@ -2 +2 @@
 REM $Id: pearenv.bat 15 2007-05-26 17:31:39Z iteman $
 
+REM *************************************************************
+REM ** Stagehand_TestRunner CLI for Windows based systems (based on symfony.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 SCRIPT_DIR=%~dp0
+SET SCRIPT_DIR=%~dp0
 
-IF "%PHP_PEAR_PHP_BIN%"=="" SET "PHP_PEAR_PHP_BIN=@php_bin@"
+GOTO INIT
+
+:INIT
+
+IF "%PHP_COMMAND%" == "" GOTO NO_PHPCOMMAND
 
 IF EXIST ".\testrunner2" (
-  %PHP_PEAR_PHP_BIN% -d html_errors=off -d open_basedir= -q ".\testrunner2" %1 %2 %3 %4 %5 %6 %7 %8 %9
+  %PHP_COMMAND% -d html_errors=off -d open_basedir= -q ".\testrunner2" %1 %2 %3 %4 %5 %6 %7 %8 %9
 ) ELSE (
-  %PHP_PEAR_PHP_BIN% -d html_errors=off -d open_basedir= -q "%SCRIPT_DIR%testrunner2" %1 %2 %3 %4 %5 %6 %7 %8 %9
+  %PHP_COMMAND% -d html_errors=off -d open_basedir= -q "%SCRIPT_DIR%\testrunner2" %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
 
 REM Local Variables: