\r
set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin\r
\r
+if not defined ORIGINAL_CLASSPATH set ORIGINAL_CLASSPATH=%CLASSPATH%\r
+set CLASSPATH=%ORIGINAL_CLASSPATH%\r
+\r
if defined WORKSPACE_TOOLS_PATH goto check_path\r
set PATH=%FRAMEWORK_TOOLS_PATH%;%JAVA_HOME%\bin;%ANT_HOME%\bin;%XMLBEANS_HOME%\bin;%PATH%\r
set WORKSPACE_TOOLS_PATH=%FRAMEWORK_TOOLS_PATH%\r
goto skipbuild\r
\r
:ForceBuild \r
-@if "%CLASSPATH%"=="" set CLASSPATH= \r
-call ant -noclasspath -f %WORKSPACE%\Tools\build.xml cleanall\r
+call ant -f %WORKSPACE%\Tools\build.xml -noclasspath cleanall\r
\r
:NormalBuild\r
@REM\r
@REM Java Programs can use it.\r
@REM It needs the XMLBEANS libraries in order to compile.\r
@REM\r
-set CLASSPATH=%XMLBEANS_HOME%\lib\r
+set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\r
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar\r
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar\r
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar\r
echo CYGWIN_HOME: %CYGWIN_HOME%\r
echo PATH: %PATH%\r
echo.\r
-set CLASSPATH=%XMLBEANS_HOME%\lib\r
+set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\r
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar\r
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar\r
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar\r