From b2d84ee04786127ce73acf0120cefaf5095dc989 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@grand.central.org>
Date: Sat, 6 Dec 2003 20:11:12 +0000
Subject: [PATCH] reorg-ntbuild-20031206

Reorganize ntbuild.bat to place all of the user edits at the front
---
 src/ntbuild.bat | 105 ++++++++++++++++++++++++------------------------
 1 file changed, 52 insertions(+), 53 deletions(-)

diff --git a/src/ntbuild.bat b/src/ntbuild.bat
index 2dbb39768..14ef314ce 100755
--- a/src/ntbuild.bat
+++ b/src/ntbuild.bat
@@ -22,6 +22,56 @@ REM
 REM ########################################################################
 
 
+REM ########################################################################
+REM General required definitions:
+REM     SYS_NAME = AFS system name
+REM Choose one of "i386_win95" or "i386_nt40"
+SET SYS_NAME=i386_nt40
+
+REM Specify the targeted version of Windows and IE: 0x400 for Win9x/NT4 
+REM and above; 0x500 for Windows 2000 and above
+SET _WIN32_IE=0x400
+
+REM ########################################################################
+REM Location of base folder where source lies, build directory
+REM e.g. AFSROOT\SRC is source directory of the build tree (8.3 short name)
+set AFSROOT=D:\Dev\AfsSorce\OpenAF~2.2
+
+REM ########################################################################
+REM NTMakefile required definitions:
+REM     AFSVER_CL  = version of the Microsoft compiler:
+REM                  "1200" for VC6
+REM                  "1300" for VC7 (.NET)
+REM                  "1310" for .NET 2003
+set AFSVER_CL=1200
+
+REM Location of Microsoft Visual C++ development folder (8.3 short name)
+set MSVCDIR=c:\progra~1\micros~2\vc98
+
+REM Location of Microsoft Platform SDK (8.3 short name)
+set MSSDKDIR=c:\progra~1\micros~4
+
+REM Location of npapi.h (from DDK or Platform SDK samples - 8.3 short name)
+set NTDDKDIR=c:\progra~1\micros~5
+
+REM Location of netmpr.h/netspi.h (from Windows 95/98 DDK - 8.3 short name)
+SET W9XDDKDIR=c:\progra~1\micros~6
+
+REM ########################################################################
+REM NTMakefile optional definitions:
+REM
+REM See NTMakefile.SYS_NAME; will normally use defaults.
+REM
+
+IF [%HOMEDRIVE%]==[] SET HOMEDRIVE=C:
+
+REM ########################################################################
+REM Options necessary when using bison
+REM
+
+set BISON_SIMPLE=c:\bin\bison.simple
+set BISON_HAIRY=c:\bin\bison.hairy
+
 REM ########################################################################
 REM Accept build type as an argument; default to checked.
 
@@ -56,46 +106,17 @@ set AFSDEV_CRTDEBUG=0
 goto args_done
 
 
-
 :args_done
-REM ########################################################################
-REM General required definitions:
-REM     SYS_NAME = AFS system name
-REM Choose one of "i386_win95" or "i386_nt40"
-
-SET SYS_NAME=i386_nt40
-
-REM Specify the targeted version of Windows and IE: 0x400 for Win9x/NT4 
-REM and above; 0x500 for Windows 2000 and above
-
-SET _WIN32_IE=0x400
 
-REM ########################################################################
-REM NTMakefile required definitions:
+REM #######################################################################
+REM Construct Variables Required for NTMakefile
 REM     AFSDEV_BUILDTYPE = CHECKED / FREE 
 REM     AFSDEV_INCLUDE = default include directories
 REM     AFSDEV_LIB = default library directories
 REM     AFSDEV_BIN = default build binary directories
-REM     AFSVER_CL  = version of the Microsoft compiler "1200" for VC6;
-REM                  or "1300" for VC7 (.NET)
-REM                  or "1310" for .NET 2003
-
-set AFSVER_CL=1200
 
 set AFSDEV_BUILDTYPE=%AFSBLD_TYPE%
 
-REM Location of Microsoft Visual C++ development folder (8.3 short name)
-set MSVCDIR=c:\progra~1\micros~2\vc98
-
-REM Location of Microsoft Platform SDK (8.3 short name)
-set MSSDKDIR=c:\progra~1\micros~4
-
-REM Location of npapi.h (from DDK or Platform SDK samples - 8.3 short name)
-set NTDDKDIR=c:\progra~1\micros~5
-
-REM Location of netmpr.h/netspi.h (from Windows 95/98 DDK - 8.3 short name)
-SET W9XDDKDIR=c:\progra~1\micros~6
-
 set AFSDEV_INCLUDE=%MSSDKDIR%\include;%MSVCDIR%\include
 IF "%AFSVER_CL%" == "1310" set AFSDEV_INCLUDE=%AFSDEV_INCLUDE%;%MSVCDIR%\atlmfc\include
 IF "%AFSVER_CL%" == "1300" set AFSDEV_INCLUDE=%AFSDEV_INCLUDE%;%MSVCDIR%\atlmfc\include
@@ -109,30 +130,8 @@ IF "%AFSVER_CL%" == "1200" set AFSDEV_LIB=%AFSDEV_LIB%;%MSVCDIR%\mfc\lib
 
 set AFSDEV_BIN=%MSSDKDIR%\bin;%MSVCDIR%\bin
 
-REM ########################################################################
-REM Location of base folder where source lies, build directory
-REM e.g. AFSROOT\SRC is source directory of the build tree (8.3 short name)
-
-set AFSROOT=D:\Dev\AfsSorce\OpenAF~2.2
-
-REM ########################################################################
-REM NTMakefile optional definitions:
-REM
-REM See NTMakefile.SYS_NAME; will normally use defaults.
-REM
-
-IF [%HOMEDRIVE%]==[] SET HOMEDRIVE=C:
-
-REM ########################################################################
-REM Options necessary when using bison
-REM
-
-set BISON_SIMPLE=c:\bin\bison.simple
-set BISON_HAIRY=c:\bin\bison.hairy
-
 goto end
 
-
 :usage
 echo.
 echo Usage: %0 [free^|^checked^|^wspp]
-- 
2.39.5