@REM Check the required system environment variables\r
@REM\r
\r
-if "%1"=="skip" goto skipbuild\r
-\r
:check_vc\r
if defined VCINSTALLDIR goto check_cygwin\r
if defined VS71COMNTOOLS (\r
set WORKSPACE=%CD%\r
\r
set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin\r
-set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%XMLBEANS_HOME%\bin;%Framework_Tools_Path%;%PATH%\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
+echo Setting the PATH variable to include the Framework_Tools_Path for this WORKSPACE\r
+goto path_ok\r
+\r
+:check_path\r
+if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto path_ok\r
+set PATH=%FRAMEWORK_TOOLS_PATH%;%PATH%\r
+set WORKSPACE_PATH=%WORKSPACE%\r
+echo Resetting the PATH variable to include the Framework_Tools_Path for this WORKSPACE\r
+\r
+:path_ok\r
+\r
+if "%1"=="skip" goto skipbuild\r
\r
echo.\r
+echo WORKSPACE: %WORKSPACE%\r
echo JAVA_HOME: %JAVA_HOME%\r
echo ANT_HOME: %ANT_HOME%\r
echo XMLBEANS_HOME: %XMLBEANS_HOME%\r
echo CYGWIN_HOME: %CYGWIN_HOME%\r
-echo WORKSPACE: %WORKSPACE%\r
echo PATH: %PATH%\r
echo.\r
\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\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar\r
+set CLASSPATH=.;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar\r
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar;%XMLBEANS_HOME%\lib\xmlpublic.jar\r
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar;%XMLBEANS_HOME%\lib\resolver.jar\r
\r
+@if "%1" neq "ForceRebuild" goto NormalBuild\r
+call ant -f %WORKSPACE%\Tools\build.xml cleanall\r
+\r
+:NormalBuild\r
call ant -f %WORKSPACE%\Tools\build.xml SurfaceArea\r
\r
@REM\r
@REM\r
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\%Tools\Jars\SurfaceArea.jar\r
\r
+\r
call ant -f %WORKSPACE%\Tools\build.xml JavaCode\r
\r
@REM\r
@REM We have all of the Java Programs and add-in classes created, so we can start\r
@REM using the cpp-tasks to create our tools\r
@REM\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.jar\r
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar\r
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar;%WORKSPACE%\Tools\Jars\frameworktasks.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\frameworktasks.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\FrameworkWizard.jar\r
\r
call ant -f %WORKSPACE%\Tools\build.xml C_Code\r
\r
@REM\r
@REM This just sets up the CLASSPATH, the rest of the environment should have been set already.\r
@REM\r
-set WORKSPACE=%CD%\r
-set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin\r
-if exist c:\cygwin set CYGWIN_HOME=c:\cygwin\r
echo.\r
+echo WORKSPACE: %WORKSPACE%\r
echo JAVA_HOME: %JAVA_HOME%\r
echo ANT_HOME: %ANT_HOME%\r
echo XMLBEANS_HOME: %XMLBEANS_HOME%\r
echo CYGWIN_HOME: %CYGWIN_HOME%\r
-echo WORKSPACE: %WORKSPACE%\r
echo PATH: %PATH%\r
echo.\r
set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar\r
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar;%XMLBEANS_HOME%\lib\xmlpublic.jar\r
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar;%XMLBEANS_HOME%\lib\resolver.jar\r
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%WORKSPACE%\Tools\Jars\GenBuild.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.jar;%WORKSPACE%\Tools\Jars\GenBuild.jar\r
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar;%WORKSPACE%\Tools\Jars\frameworktasks.jar\r
goto end\r
\r