From 74498aabd718cdb4137debe16f3dcbea4a6c025d Mon Sep 17 00:00:00 2001
From: brodsom <brodsom@users.sourceforge.net>
Date: Fri, 4 Jul 2003 16:39:02 +0000
Subject: [PATCH] Beutifiying

---
 builds/win32/make6_all.bat  | 11 ++++++++---
 builds/win32/make6_boot.bat | 24 ++++++++++++------------
 builds/win32/make7_all.bat  |  7 ++++++-
 builds/win32/make7_boot.bat | 22 +++++++++++-----------
 4 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/builds/win32/make6_all.bat b/builds/win32/make6_all.bat
index 8abed51d5d..230b74d9f5 100644
--- a/builds/win32/make6_all.bat
+++ b/builds/win32/make6_all.bat
@@ -1,6 +1,7 @@
 @echo off
 
-@cd msvc6
+::===========
+:: Read input values
 @set DBG=
 @set DBG_DIR=release
 @set CLEAN=
@@ -8,6 +9,10 @@
 @if "%2"=="DEBUG" ((set DBG=TRUE) && (set DBG_DIR=debug))
 @if "%1"=="CLEAN" (set CLEAN=/REBUILD)
 @if "%2"=="CLEAN" (set CLEAN=/REBUILD)
+
+::==========
+:: MAIN
+@cd msvc6
 @if "%DBG%"=="" (call :RELEASE) else (call :DEBUG)
 @cd ..
 @call :MOVE
@@ -15,13 +20,13 @@
 
 ::===========
 :RELEASE
-@echo Building...
+@echo Building release
 @msdev Firebird2.dsw /MAKE "fbserver - Win32 Release" "fbguard - Win32 Release" "fb_lock_print - Win32 Release" "fb_inet_server - Win32 Release" "gbak - Win32 Release" "gpre - Win32 Release" "gsplit - Win32 Release" "gdef - Win32 Release" "gfix - Win32 Release" "gsec - Win32 Release" "gstat - Win32 Release" "instreg - Win32 Release" "instsvc - Win32 Release" "isql - Win32 Release" "qli - Win32 Release" "gds32 - Win32 Release" "fbclient - Win32 Release" "ib_udf - Win32 Release" "ib_util - Win32 Release" "intl - Win32 Release" "intlcpp - Win32 Release" %CLEAN% /OUT Firebird2.log
 @goto :EOF
 
 ::===========
 :DEBUG
-@echo Building...
+@echo Building debug
 @msdev Firebird2.dsw /MAKE "fbserver - Win32 Debug" "fbguard - Win32 Debug" "fb_lock_print - Win32 Debug" "fb_inet_server - Win32 Debug" "gbak - Win32 Debug" "gpre - Win32 Debug" "gsplit - Win32 Debug" "gdef - Win32 Debug" "gfix - Win32 Debug" "gsec - Win32 Debug" "gstat - Win32 Debug" "instreg - Win32 Debug" "instsvc - Win32 Debug" "isql - Win32 Debug" "qli - Win32 Debug" "gds32 - Win32 Debug" "fbclient - Win32 Debug" "ib_udf - Win32 Debug" "ib_util - Win32 Debug" "intl - Win32 Debug" "intlcpp - Win32 Debug" %CLEAN% /OUT Firebird2.log
 @goto :EOF
 
diff --git a/builds/win32/make6_boot.bat b/builds/win32/make6_boot.bat
index 4b537d7e96..34bef897d8 100644
--- a/builds/win32/make6_boot.bat
+++ b/builds/win32/make6_boot.bat
@@ -13,18 +13,18 @@
 @echo Creating directories
 @cd ..\..
 @rmdir gen 2>nul
-@mkdir gen\alice
-@mkdir gen\burp
-@mkdir gen\dsql
-@mkdir gen\dudley
-@mkdir gen\gpre
-@mkdir gen\isql
-@mkdir gen\jrd
-@mkdir gen\msgs
-@mkdir gen\qli
-@mkdir gen\utilities
-@mkdir gen\v5_examples
-@cd builds\win32
+@mkdir gen\alice 2>nul
+@mkdir gen\burp 2>nul
+@mkdir gen\dsql 2>nul
+@mkdir gen\dudley 2>nul
+@mkdir gen\gpre 2>nul
+@mkdir gen\isql 2>nul
+@mkdir gen\jrd 2>nul
+@mkdir gen\msgs 2>nul
+@mkdir gen\qli 2>nul
+@mkdir gen\utilities 2>nul
+@mkdir gen\v5_examples 2>nul
+@cd builds\win32 
 
 ::provisional, copy all fdbs to the same directory to be used from preprocess
 copy dbs\metadata.fdb %ROOT_PATH%\gen\yachts.lnk > nul
diff --git a/builds/win32/make7_all.bat b/builds/win32/make7_all.bat
index ff73e3aa26..c4ccef4fec 100644
--- a/builds/win32/make7_all.bat
+++ b/builds/win32/make7_all.bat
@@ -1,6 +1,7 @@
 @echo off
 
-@cd msvc7
+::===========
+:: Read input values
 @set DBG=
 @set DBG_DIR=release
 @set CLEAN=/build
@@ -8,6 +9,10 @@
 @if "%2"=="DEBUG" ((set DBG=TRUE) && (set DBG_DIR=debug))
 @if "%1"=="CLEAN" (set CLEAN=/clean)
 @if "%2"=="CLEAN" (set CLEAN=/clean)
+
+::==========
+:: MAIN
+@cd msvc7
 @if "%DBG%"=="" (call :RELEASE) else (call :DEBUG)
 @cd ..
 @call :MOVE
diff --git a/builds/win32/make7_boot.bat b/builds/win32/make7_boot.bat
index e8fc628ce2..3efbd4db90 100644
--- a/builds/win32/make7_boot.bat
+++ b/builds/win32/make7_boot.bat
@@ -13,17 +13,17 @@
 @echo Creating directories
 @cd ..\..
 @rmdir gen 2>nul
-@mkdir gen\alice
-@mkdir gen\burp
-@mkdir gen\dsql
-@mkdir gen\dudley
-@mkdir gen\gpre
-@mkdir gen\isql
-@mkdir gen\jrd
-@mkdir gen\msgs
-@mkdir gen\qli
-@mkdir gen\utilities
-@mkdir gen\v5_examples
+@mkdir gen\alice 2>nul
+@mkdir gen\burp 2>nul
+@mkdir gen\dsql 2>nul
+@mkdir gen\dudley 2>nul
+@mkdir gen\gpre 2>nul
+@mkdir gen\isql 2>nul
+@mkdir gen\jrd 2>nul
+@mkdir gen\msgs 2>nul
+@mkdir gen\qli 2>nul
+@mkdir gen\utilities 2>nul
+@mkdir gen\v5_examples 2>nul
 @cd builds\win32
 
 ::provisional, copy all fdbs to the same directory to be used from preprocess