Index: build/build.bat =================================================================== --- build/build.bat (revision 417806) +++ build/build.bat (working copy) @@ -121,7 +121,7 @@ REM Executing Ant build REM =================== -SET CLASSPATH=%CD%\make\tmp\cpptasks\cpptasks.jar +SET CLASSPATH=%CD%\make\tmp\cpptasks.jar SET CLASSPATH=%CLASSPATH%;.\make\tmp\org.eclipse.jdt.core_3.1.1.jar SET CLASSPATH=%CLASSPATH%;.\make\tmp\jdtCompilerAdapter.jar SET CLASSPATH=%CLASSPATH%;.\make\tmp\junit.jar Index: build/build.sh =================================================================== --- build/build.sh (revision 417806) +++ build/build.sh (working copy) @@ -72,7 +72,7 @@ export ANT_HOME=`(cd $ANT_HOME;pwd)` export CXX export BUILD_CFG -CLASSPATH=`pwd`/make/tmp/cpptasks/cpptasks.jar +CLASSPATH=`pwd`/make/tmp/cpptasks.jar CLASSPATH=$CLASSPATH:`pwd`/make/tmp/org.eclipse.jdt.core_3.1.1.jar; CLASSPATH=$CLASSPATH:`pwd`/make/tmp/jdtCompilerAdapter.jar CLASSPATH=$CLASSPATH:`pwd`/make/tmp/junit.jar Index: build/make/build.xml =================================================================== --- build/make/build.xml (revision 417806) +++ build/make/build.xml (working copy) @@ -232,14 +232,12 @@ - - + - - + Index: build/make/lnx.properties =================================================================== --- build/make/lnx.properties (revision 417806) +++ build/make/lnx.properties (working copy) @@ -38,7 +38,7 @@ remote.ECLIPSE.archive=http://mirrors.cat.pdx.edu/eclipse/eclipse/downloads/drops/R-3.1.1-200509290840/eclipse-SDK-3.1.1-linux-gtk.tar.gz # Cpptasks, version 1.0 beta 3 or above # http://sourceforge.net/project/showfiles.php?group_id=36177 -remote.CPPTASKS.archive=http://heanet.dl.sourceforge.net/sourceforge/ant-contrib/cpptasks-1.0b3.zip +remote.CPPTASKS.archive=http://heanet.dl.sourceforge.net/sourceforge/ant-contrib/cpptasks-1.0b4.zip # Ant-contrib, version 0.6 or above # http://sourceforge.net/project/showfiles.php?group_id=36177 Index: build/make/setup.xml =================================================================== --- build/make/setup.xml (revision 417806) +++ build/make/setup.xml (working copy) @@ -57,11 +57,14 @@ + + @@ -87,8 +90,7 @@ download.remote.files, unzip.resources, check.unzipped.externals, - copy.nessessary.jars, - execute.cpptasks.patch.with.eclipse.compiler.in.classpath"> + copy.nessessary.jars"> @@ -108,63 +110,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -232,7 +179,7 @@ - + @@ -253,64 +200,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -441,7 +331,9 @@ + Error: Index: build/make/targets/build.native.xml =================================================================== --- build/make/targets/build.native.xml (revision 417806) +++ build/make/targets/build.native.xml (working copy) @@ -89,7 +89,7 @@ - + @@ -199,7 +199,7 @@ + outtype="${outtype}" subsystem="console">