Commit:    d93ae5c801a89c1b286fae3eb85868c98b127ac4
Author:    Christoph M. Becker <cmbecke...@gmx.de>         Mon, 23 Sep 2019 
18:40:36 +0200
Parents:   a98986f1a65fb30c41cbcc7c0bc794a282dfee7d
Branches:  master

Link:       
http://git.php.net/?p=pftt2.git;a=commitdiff;h=d93ae5c801a89c1b286fae3eb85868c98b127ac4

Log:
Update CLASSPATH for command line tools

Whenever we make changes to .classpath, we also have to update pftt.cmd
and pftt accordingly, so that the bin/ tools use basically the same
CLASSPATH.

Changed paths:
  M  bin/pftt
  M  bin/pftt.cmd


Diff:
diff --git a/bin/pftt b/bin/pftt
index 1cd8b4d3..62f87c61 100644
--- a/bin/pftt
+++ b/bin/pftt
@@ -6,6 +6,62 @@ source `dirname $BASH_SOURCE`/set_path.sh
 
 export PFTT_LIB=$PFTT_HOME/lib
 
-export 
CLASSPATH=$PFTT_HOME/build:$PFTT_LIB/javax.servlet.jar:$PFTT_LIB/mysql-connector-java-5.1.25-bin.jar:$PFTT_LIB/apache-mime4j-0.6.jar:$PFTT_LIB/commons-exec-1.1.jar:$PFTT_LIB/cssparser-0.9.8.jar:$PFTT_LIB/guava-14.0.jar:$PFTT_LIB/hamcrest-core-1.3.jar:$PFTT_LIB/httpclient-4.2.1.jar:$PFTT_LIB/httpcore-4.2.1.jar:$PFTT_LIB/httpmime-4.2.1.jar:$PFTT_LIB/jna-3.4.0.jar:$PFTT_LIB/jna-platform-3.4.0.jar:$PFTT_LIB/json-20080701.jar:$PFTT_LIB/jzlib-1.1.1.jar:$PFTT_LIB/nekohtml-1.9.17.jar:$PFTT_LIB/phantomjsdriver-1.0.1.jar:$PFTT_LIB/selenium-java-2.31.0.jar:$PFTT_LIB/winp-1.14.jar:$PFTT_LIB/htmlcleaner-2.2.jar:$PFTT_LIB/groovy-1.8.6.jar:$PFTT_LIB/icu4j-49_1.jar:$PFTT_LIB/icudata.jar:$PFTT_LIB/icutzdata.jar:$PFTT_LIB/j2ssh-common-0.2.9.jar:$PFTT_LIB/j2ssh-core-0.2.9.jar:$PFTT_LIB/jansi-1.7.jar:$PFTT_LIB/jline-0.9.94.jar:$PFTT_LIB/jzlib-1.0.7.jar:$PFTT_LIB/selenium-server-standalone-2.19.0.jar:$PFTT_LIB/xercesImpl.jar:$PFTT_LIB/xmlpull-1.1.3.1.jar:$PFTT_LIB/commons-net-3.1.jar:$PFTT_LIB/commons-cli-1.2.jar:$PFTT_LIB/antlr-2.7.7.jar:$PFTT_LIB/asm-3.2.jar:$PFTT_LIB/asm-analysis-3.2.jar:$PFTT_LIB/asm-commons-3.2.jar:$PFTT_LIB/asm-tree-3.2.jar:$PFTT_LIB/asm-util-3.2.jar:$PFTT_LIB/php_parser.jar
+export CLASSPATH=\
+$PFTT_LIB/htmlcleaner-2.2.jar;\
+$PFTT_LIB/icu4j-49_1.jar;\
+$PFTT_LIB/icudata.jar;\
+$PFTT_LIB/icutzdata.jar;\
+$PFTT_LIB/jansi-1.7.jar;\
+$PFTT_LIB/jline-0.9.94.jar;\
+$PFTT_LIB/xercesImpl.jar;\
+$PFTT_LIB/xmlpull-1.1.3.1.jar;\
+$PFTT_LIB/commons-cli-1.2.jar;\
+$PFTT_LIB/antlr-2.7.7.jar;\
+$PFTT_LIB/asm-3.2.jar;\
+$PFTT_LIB/asm-analysis-3.2.jar;\
+$PFTT_LIB/asm-commons-3.2.jar;\
+$PFTT_LIB/asm-tree-3.2.jar;\
+$PFTT_LIB/asm-util-3.2.jar;\
+$PFTT_LIB/winp-1.14.jar;\
+$PFTT_LIB/commons-net-3.1.jar;\
+$PFTT_LIB/commons-codec-1.6.jar;\
+$PFTT_LIB/commons-lang-2.6.jar;\
+$PFTT_LIB/commons-logging-1.1.1.jar;\
+$PFTT_LIB/jzlib-1.1.1.jar;\
+$PFTT_LIB/mina-core-2.0.7.jar;\
+$PFTT_LIB/mina-statemachine-2.0.7.jar;\
+$PFTT_LIB/slf4j-api-1.7.2.jar;\
+$PFTT_LIB/slf4j-log4j12-1.7.2.jar;\
+$PFTT_LIB/log4j-1.2.17.jar;\
+$PFTT_LIB/php_parser.jar;\
+$PFTT_LIB/selenium-java-2.31.0.jar;\
+$PFTT_LIB/apache-mime4j-0.6.jar;\
+$PFTT_LIB/commons-exec-1.1.jar;\
+$PFTT_LIB/cssparser-0.9.8.jar;\
+$PFTT_LIB/guava-14.0.jar;\
+$PFTT_LIB/hamcrest-core-1.3.jar;\
+$PFTT_LIB/hamcrest-library-1.3.jar;\
+$PFTT_LIB/httpclient-4.2.1.jar;\
+$PFTT_LIB/httpcore-4.2.1.jar;\
+$PFTT_LIB/httpmime-4.2.1.jar;\
+$PFTT_LIB/jna-3.4.0.jar;\
+$PFTT_LIB/jna-platform-3.4.0.jar;\
+$PFTT_LIB/json-20080701.jar;\
+$PFTT_LIB/nekohtml-1.9.17.jar;\
+$PFTT_LIB/phantomjsdriver-1.0.1.jar;\
+$PFTT_LIB/serializer-2.7.1.jar;\
+$PFTT_LIB/j2ssh-common-0.2.9.jar;\
+$PFTT_LIB/j2ssh-core-0.2.9.jar;\
+$PFTT_LIB/javax.servlet.jar;\
+$PFTT_LIB/mysql-connector-java-5.1.25-bin.jar;\
+$PFTT_LIB/activation-1.1-rev-1.jar;\
+$PFTT_LIB/jcifs-1.3.17.jar;\
+$PFTT_LIB/sqljdbc4.jar;\
+$PFTT_LIB/groovy-all-2.4.15.jar;\
+$PFTT_LIB/sshd-core-1.1.1.jar;\
+$PFTT_LIB/windowsazure-core-0.5.0.jar;\
+$PFTT_LIB/windowsazure-websites-0.5.0.jar;\
+$PFTT_LIB/java-diff-1.1.2.jar;\
+$PFTT_LIB/kxml2-2.3.0.jar
 
 java -classpath $CLASSPATH com.mostc.pftt.main.PfttMain $*
diff --git a/bin/pftt.cmd b/bin/pftt.cmd
index 56967383..10a7fe91 100644
--- a/bin/pftt.cmd
+++ b/bin/pftt.cmd
@@ -7,7 +7,63 @@ CALL %~dp0set_env.cmd
 :skip_set_env
 SET PFTT_LIB=%PFTT_HOME%\lib
 
-SET 
CLASSPATH=%PFTT_LIB%\sqljdbc4.jar;%PFTT_LIB%\javax.servlet.jar;%PFTT_LIB%\mysql-connector-java-5.1.25-bin.jar;%PFTT_LIB%\apache-mime4j-0.6.jar;%PFTT_LIB%\commons-exec-1.1.jar;%PFTT_LIB%\cssparser-0.9.8.jar;%PFTT_LIB%\guava-14.0.jar;%PFTT_LIB%\hamcrest-core-1.3.jar;%PFTT_LIB%\httpclient-4.2.1.jar;%PFTT_LIB%\httpcore-4.2.1.jar;%PFTT_LIB%\httpmime-4.2.1.jar;%PFTT_LIB%\jna-3.4.0.jar;%PFTT_LIB%\jna-platform-3.4.0.jar;%PFTT_LIB%\json-20080701.jar;%PFTT_LIB%\jzlib-1.1.1.jar;%PFTT_LIB%\nekohtml-1.9.17.jar;%PFTT_LIB%\phantomjsdriver-1.0.1.jar;%PFTT_LIB%\selenium-java-2.31.0.jar;%PFTT_LIB%\htmlcleaner-2.2.jar;%PFTT_LIB%\groovy-all-2.4.15.jar;%PFTT_LIB%\icu4j-49_1.jar;%PFTT_LIB%\icudata.jar;%PFTT_LIB%\icutzdata.jar;%PFTT_LIB%\jansi-1.7.jar;%PFTT_LIB%\jline-0.9.94.jar;%PFTT_LIB%\xercesImpl.jar;%PFTT_LIB%\xmlpull-1.1.3.1.jar;%PFTT_LIB%\commons-cli-1.2.jar;%PFTT_LIB%\antlr-2.7.7.jar;%PFTT_LIB%\asm-3.2.jar;%PFTT_LIB%\asm-analysis-3.2.jar;%PFTT_LIB%\asm-commons-3.2.jar;%PFTT_LIB%\asm-tree-3.2.jar;%PFTT_LIB%\asm-util-3.2.jar;%PFTT_LIB%\winp-1.14.jar;%PFTT_LIB%\commons-net-3.1.jar;%PFTT_LIB%\commons-codec-1.6.jar;%PFTT_LIB%\commons-lang-2.6.jar;%PFTT_LIB%\commons-logging-1.1.1.jar;%PFTT_LIB%\jzlib-1.1.1.jar;%PFTT_LIB%\mina-core-2.0.7.jar;%PFTT_LIB%\mina-statemachine-2.0.7.jar;%PFTT_LIB%\slf4j-api-1.7.2.jar;%PFTT_LIB%\slf4j-log4j12-1.7.2.jar;%PFTT_LIB%\php_parser.jar;%PFTT_LIB%\log4j-1.2.17.jar;%PFTT_LIB%\j2ssh-common-0.2.9.jar;%PFTT_LIB%\j2ssh-core-0.2.9.jar
+SET CLASSPATH=^
+%PFTT_LIB%\htmlcleaner-2.2.jar;^
+%PFTT_LIB%\icu4j-49_1.jar;^
+%PFTT_LIB%\icudata.jar;^
+%PFTT_LIB%\icutzdata.jar;^
+%PFTT_LIB%\jansi-1.7.jar;^
+%PFTT_LIB%\jline-0.9.94.jar;^
+%PFTT_LIB%\xercesImpl.jar;^
+%PFTT_LIB%\xmlpull-1.1.3.1.jar;^
+%PFTT_LIB%\commons-cli-1.2.jar;^
+%PFTT_LIB%\antlr-2.7.7.jar;^
+%PFTT_LIB%\asm-3.2.jar;^
+%PFTT_LIB%\asm-analysis-3.2.jar;^
+%PFTT_LIB%\asm-commons-3.2.jar;^
+%PFTT_LIB%\asm-tree-3.2.jar;^
+%PFTT_LIB%\asm-util-3.2.jar;^
+%PFTT_LIB%\winp-1.14.jar;^
+%PFTT_LIB%\commons-net-3.1.jar;^
+%PFTT_LIB%\commons-codec-1.6.jar;^
+%PFTT_LIB%\commons-lang-2.6.jar;^
+%PFTT_LIB%\commons-logging-1.1.1.jar;^
+%PFTT_LIB%\jzlib-1.1.1.jar;^
+%PFTT_LIB%\mina-core-2.0.7.jar;^
+%PFTT_LIB%\mina-statemachine-2.0.7.jar;^
+%PFTT_LIB%\slf4j-api-1.7.2.jar;^
+%PFTT_LIB%\slf4j-log4j12-1.7.2.jar;^
+%PFTT_LIB%\log4j-1.2.17.jar;^
+%PFTT_LIB%\php_parser.jar;^
+%PFTT_LIB%\selenium-java-2.31.0.jar;^
+%PFTT_LIB%\apache-mime4j-0.6.jar;^
+%PFTT_LIB%\commons-exec-1.1.jar;^
+%PFTT_LIB%\cssparser-0.9.8.jar;^
+%PFTT_LIB%\guava-14.0.jar;^
+%PFTT_LIB%\hamcrest-core-1.3.jar;^
+%PFTT_LIB%\hamcrest-library-1.3.jar;^
+%PFTT_LIB%\httpclient-4.2.1.jar;^
+%PFTT_LIB%\httpcore-4.2.1.jar;^
+%PFTT_LIB%\httpmime-4.2.1.jar;^
+%PFTT_LIB%\jna-3.4.0.jar;^
+%PFTT_LIB%\jna-platform-3.4.0.jar;^
+%PFTT_LIB%\json-20080701.jar;^
+%PFTT_LIB%\nekohtml-1.9.17.jar;^
+%PFTT_LIB%\phantomjsdriver-1.0.1.jar;^
+%PFTT_LIB%\serializer-2.7.1.jar;^
+%PFTT_LIB%\j2ssh-common-0.2.9.jar;^
+%PFTT_LIB%\j2ssh-core-0.2.9.jar;^
+%PFTT_LIB%\javax.servlet.jar;^
+%PFTT_LIB%\mysql-connector-java-5.1.25-bin.jar;^
+%PFTT_LIB%\activation-1.1-rev-1.jar;^
+%PFTT_LIB%\jcifs-1.3.17.jar;^
+%PFTT_LIB%\sqljdbc4.jar;^
+%PFTT_LIB%\groovy-all-2.4.15.jar;^
+%PFTT_LIB%\sshd-core-1.1.1.jar;^
+%PFTT_LIB%\windowsazure-core-0.5.0.jar;^
+%PFTT_LIB%\windowsazure-websites-0.5.0.jar;^
+%PFTT_LIB%\java-diff-1.1.2.jar;^
+%PFTT_LIB%\kxml2-2.3.0.jar
 
 REM this might be also controlled by environment, if needed
 IF EXIST %PFTT_LIB%\pftt2.jar (
@@ -16,7 +72,6 @@ IF EXIST %PFTT_LIB%\pftt2.jar (
        SET CLASSPATH=%PFTT_HOME%\build;%CLASSPATH%
 )
 
-
 REM if user added -uac -auto -debug* console options or setup or stop 
commands, run elevated in UAC
 REM user will get at most 1 UAC popup dialog
 REM UAC popups break unattended automation because there is no way to automate 
clicking on them

Reply via email to