[openorb-commits] CVS: OpenORB build.bat,1.1.1.1,1.2 build.sh,1.1.1.1,1.2

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB
In directory usw-pr-cvs1:/tmp/cvs-serv29401/OpenORB

Modified Files:
	build.bat build.sh 
Log Message:
Fixed bugs 501393, 501412, 501418, 501420, and many other related problems.


Index: build.bat
===================================================================
RCS file: /cvsroot/openorb/OpenORB/build.bat,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** build.bat	2002/01/09 12:28:36	1.1.1.1
--- build.bat	2002/01/10 09:01:29	1.2
***************
*** 2,8 ****
  REM $Id$
  set JAVA=%JAVA_HOME%\bin\java
! set cp=%CLASSPATH%
  for %%i in (lib\*.jar) do call cp.bat %%i
- set CP=%JAVA_HOME%\lib\tools.jar;%CP%
  %JAVA% -classpath "%CP%" -Dant.home=lib org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 -buildfile src/build.xml
  
--- 2,7 ----
  REM $Id$
  set JAVA=%JAVA_HOME%\bin\java
! set CP=%JAVA_HOME%\lib\tools.jar;%CLASSPATH%
  for %%i in (lib\*.jar) do call cp.bat %%i
  %JAVA% -classpath "%CP%" -Dant.home=lib org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 -buildfile src/build.xml
  

Index: build.sh
===================================================================
RCS file: /cvsroot/openorb/OpenORB/build.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** build.sh	2002/01/09 12:28:36	1.1.1.1
--- build.sh	2002/01/10 09:01:30	1.2
***************
*** 21,27 ****
  # it to the classpath environment variable
  #
! CP=$JAVA_HOME/lib/tools.jar
! CP=$CP:lib/ant_1.3.jar
! CP=$CP:lib/xerces-J_1.4.0.jar
  
  # Change the attributes for the antRun file
--- 21,26 ----
  # it to the classpath environment variable
  #
! CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH
! CLASSPATH=$JAVA_HOME/lib/tools.jar
  
  # Change the attributes for the antRun file
***************
*** 32,35 ****
  # Execute the build tool passing the build.xml file
  #
! $JAVAC -cp $CP -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml
  
--- 31,34 ----
  # Execute the build tool passing the build.xml file
  #
! $JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml