[JVCL-Checkins] dev/JVCL3/packages/bin build.dpr,1.20,1.21 build.exe,1.19,1.20 pretest.bat,1.1,1.2 - Build-System is now generic

[Andreas H. <ah...@us...>]

Update of /cvsroot/jvcl/dev/JVCL3/packages/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28024/packages/bin

Modified Files:
	build.dpr build.exe pretest.bat 
Log Message:
Build-System is now generic


Index: build.exe
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/packages/bin/build.exe,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
Binary files /tmp/cvsyfs4cV and /tmp/cvsHyV4S0 differ

Index: pretest.bat
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/packages/bin/pretest.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pretest.bat	13 Sep 2004 14:28:33 -0000	1.1
--- pretest.bat	12 Dec 2004 19:47:53 -0000	1.2
***************
*** 3,7 ****
  if EXIST build.exe GOTO FOUND
  
! dcc32.exe -$D- -Q -I..\..\common build.dpr >NUL
  if ERRORLEVEL 1 GOTO FAILED
  
--- 3,7 ----
  if EXIST build.exe GOTO FOUND
  
! dcc32.exe -$D- -DJVCL -Q build.dpr >NUL
  if ERRORLEVEL 1 GOTO FAILED
  
***************
*** 14,21 ****
  rem ======= FAILED =======
  echo.
! echo Delphi Compiler for Win32 (dpp32.exe) not found. Please add the 
  echo Delphi\Bin directory to the PATH environment variable.
  echo.
! echo You can do this by executing 'SET PATH="C:\Program Files\Borland\Delphi7\Bin"'
  echo (Adjust the directories to your installation path)
  echo.
--- 14,24 ----
  rem ======= FAILED =======
  echo.
! echo.
! echo Delphi Compiler for Win32 (dcc32.exe) was not found. Please add the 
  echo Delphi\Bin directory to the PATH environment variable.
  echo.
! echo You can do this by executing 
! echo   'SET PATH=C:\Program Files\Borland\Delphi7\Bin;%%PATH%%'
! echo.
  echo (Adjust the directories to your installation path)
  echo.

Index: build.dpr
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/packages/bin/build.dpr,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** build.dpr	11 Dec 2004 14:33:21 -0000	1.20
--- build.dpr	12 Dec 2004 19:47:52 -0000	1.21
***************
*** 24,37 ****
  // $Id$
  
- {$I jvcl.inc}
- 
  program build;
  
  {$APPTYPE CONSOLE}
  
  uses
    Windows, ShlObj;
[...1330 lines suppressed...]
!         WriteLn('Failed: ', '"' + RootDir + '\bin\make.exe" -l+ ' + MakeOptions);
        WriteLn('Press ENTER to continue');
        ReadLn;
      end;
- 
    end;
  end.
--- 1125,1136 ----
  
  
!     ExitCode := Execute('"' + Edition.RootDir + '\bin\make.exe" ' + MakeOptions);
      if ExitCode <> 0 then
      begin
        if ExitCode < 0 then
!         WriteLn('Failed: ', '"' + Edition.RootDir + '\bin\make.exe" ' + MakeOptions);
        WriteLn('Press ENTER to continue');
        ReadLn;
      end;
    end;
  end.