Changeset 5762 for trunk/src/win32k

Timestamp:

May 19, 2001, 10:53:04 PM (24 years ago)

Author:

bird

Message:

Fix from Rafal. Validate paths after they're found.

File:

• trunk/src/win32k/configure.cmd (modified) (10 diffs)

trunk/src/win32k/configure.cmd

@@ -1 @@
-/* $Id: configure.cmd,v 1.18 2001-04-14 07:22:12 bird Exp $
+/* $Id: configure.cmd,v 1.19 2001-05-19 20:53:04 bird Exp $
  *
  * Configuration script.
@@ -37 +37 @@
                 when (ch = '?' | ch = 'H' | substr(sArg, 1, 2) = '-H') then
                 do
-                    say 'Odin32 Configure.cmd. $Revision: 1.18 $.'
+                    say 'Odin32 Configure.cmd. $Revision: 1.19 $.'
                     say 'syntax: Configure.cmd [-n] [-w]'
                     say '  -n   Noninteractive.'
@@ -61 +61 @@
     do
         call lineout sIncFile, '################################################################################'
-        call lineout sIncFile, '# Generated by 'directory()'configure.cmd'
-        call lineout sIncFile, '################################################################################';
-        call lineout sIncFile, ''
-        call lineout sIncFile, '################################################################################'
-        call lineout sIncFile, '# BASEDIRECTORIES - Win32K'
+        call lineout sIncFile, '# Generated by 'directory()'\configure.cmd'
+        call lineout sIncFile, '################################################################################'
+        call lineout sIncFile, ''
+        call lineout sIncFile, '################################################################################'
+        call lineout sIncFile, '# BASE DIRECTORIES - Win32K'
         call lineout sIncFile, '# Note! These should be absolute paths!'
         call lineout sIncFile, '################################################################################'
@@ -92 +92 @@
 
         call lineout sIncFile, '################################################################################'
-        call lineout sIncFile, '# DDKPATH: base directory of ddk base. (ie. \DDK\BASE not \DDK for DDK v4.0+)'
+        call lineout sIncFile, '# DDKPATH: base directory of ddk base (ie. \DDK\BASE not \DDK for DDK v4.0+).'
         call lineout sIncFile, '################################################################################'
         sDDK = SearchPaths('INCLUDE', '..\h\dhcalls.h', 'PATH', '..\h\dhcalls.h', 'BOOKSHELF', '..\base\.\h\dhcalls.h', 'Path to DDK "\BASE" directory (ie. F:\DDK\BASE):');
+        sDDK = ValidatePath(sDDK, 'h\devhdr.h', 'DDK Base Path');
         call lineout sIncFile, 'DDKPATH          =' sDDK
         call lineout sIncFile, ''
@@ -102 +103 @@
         call lineout sIncFile, '################################################################################'
         sTLKT = SearchPaths('INCLUDE', '..\h\os2.h', 'PATH', '..\h\os2.h', 'BOOKSHELF', '..\h\os2.h', 'Path to OS/2 Toolkit directory:');
+        sTLKT = ValidatePath(sTLKT, 'h\bsememf.h', 'OS/2 Toolkit Path');
         call lineout sIncFile, 'TOOLKIT          =' sTLKT
         call lineout sIncFile, ''
@@ -108 +110 @@
         call lineout sIncFile, '# IBM VisualAge for C++ base path'
         call lineout sIncFile, '################################################################################'
-        sVA = Value('CPPMAIN',, 'OS2ENVIRONMENT'); /* no sure if CPPMAIN or CPPLOCAL is the one to search... */
+        sVA = Value('CPPMAIN',, 'OS2ENVIRONMENT'); /* not sure if CPPMAIN or CPPLOCAL is the one to search... */
+        if (sVA <> '' & stream(sVA'\bin\icc.exe', 'c', 'query exists') = '') then
+            sVA = ''
         if (sVA = '') then
             sVA = SearchPaths('PATH', 'icc.exe', 'BOOKSHELF', '..\bin\icc.exe', 'Path to IBM VisualAge for C++ or IBM C and C++ Compilers, and set its environment you compile:');
+        sVA = ValidatePath(sVA, 'bin\icc.exe', 'VisualAge Path');
         call lineout sIncFile, 'VACPATH          =' sVA
         call lineout sIncFile, ''
@@ -118 +123 @@
         call lineout sIncFile, '################################################################################'
         sMSC = SearchPaths('PATH', '..\binp\c3l.exe', 'INCLUDE', '..\binp\c3l.exe','LIB', '..\binp\c3l.exe', 'Path to Microsoft C v6.0, v6.0a or v7.0 directory:');
+        sMSC = ValidatePath(sMSC, 'binp\cl.exe', 'Microsoft C Path');
         call lineout sIncFile, 'MSCPATH          =' sMSC
         call lineout sIncFile, ''
@@ -126 +132 @@
         sGrep = SearchPaths('PATH', 'grep.exe', 'Path to UNIX-like grep utility which supports -v.');
         if (sGrep <> '') then
-            call lineout sIncFile, 'GREP             =' sGrep || 'grep.exe'
+            call lineout sIncFile, 'GREP             =' sGrep || '\grep.exe'
         call lineout sIncFile, ''
 
@@ -149 +155 @@
          * Display output.
          */
-        if (0 /*fInteractive = 1*/) then /* currently disabled since we're now called from mail config. */
+        if (0 /*fInteractive = 1*/) then /* currently disabled since we're now called from main config. */
         do
             say 'Configuration completed!'
@@ -229 +235 @@
             say '!error! sFile:'sFile  'sPath:'sPath;
         /* debug: say 'sPath:'sPath  'sFile:'sFile */
-        sPath = substr(sPath, 1, i-1);
-    end
-
-    return sPath;
+        sPath = strip(substr(sPath, 1, i-1), 'T', '\');
+    end
+
+return sPath;
+
+
+/**
+ * Validate if a file exists to ensure that the given path is valid.
+ * @returns The path if valid. If invalid an empty string is returned.
+ */
+ValidatePath: procedure
+    parse arg sPath, sFile, sDesc
+
+    rc = stream(sPath'\'sFile, 'c', 'query exists')
+    if (rc <> '') then
+        return sPath;
+    say 'Warning: Validatation of the' sPath 'failed. Win32k.sys will not be built.'
+    say '         path='sPath;
+return '';
+