Changeset 9236

Timestamp:

Sep 14, 2002, 6:03:38 PM (23 years ago)

Author:

bird

Message:

Added support for 'MSC v7.0 with OS/2 support'.

Location:

trunk

Files:

• make/setup.mak (modified) (5 diffs)
• make/setup.os2debmscv7-16.mk (added)
• make/setup.os2prfmscv7-16.mk (added)
• make/setup.os2relmscv7-16.mk (added)
• tools/bin/buildenv.cmd (modified) (6 diffs)

trunk/make/setup.mak

@@ -1 @@
-# $Id: setup.mak,v 1.18 2002-09-01 13:58:18 bird Exp $
+# $Id: setup.mak,v 1.19 2002-09-14 16:03:37 bird Exp $
 
 #
@@ -69 +69 @@
 SHT_BLDENV=mscv6-16
 !endif
+!if "$(BUILD_ENV)" == "MSCV7-16"
+SHT_BLDENV=mscv7-16
+!endif
 !if "$(BUILD_ENV)" == "WAT11C"
 SHT_BLDENV=wat11
@@ -76 +79 @@
 !endif
 !if "$(SHT_BLDENV)" == ""
-! error Fatal error: Env.var BUILD_ENV is either unspecified or incorrect. ($(BUILD_MODE)) Valid values: VAC308, VAC365, VAC4, EMX, MSCV6-16, WAT11C and WAT11C-16.
+! error Fatal error: Env.var BUILD_ENV is either unspecified or incorrect. ($(BUILD_MODE)) Valid values: VAC308, VAC365, VAC4, EMX, MSCV6-16, MSCV7-16, WAT11C and WAT11C-16.
 !endif
 
@@ -100 +103 @@
 SHT_BLDENVFRC=mscv6-16
 !endif
+!if "$(BUILD_ENV_FORCE)" == "MSCV7-16"
+SHT_BLDENVFRC=mscv7-16
+!endif
 !if "$(BUILD_ENV_FORCE)" == "WAT11C"
 SHT_BLDENVFRC=wat11
@@ -107 +113 @@
 !endif
 !if "$(SHT_BLDENVFRC)" == ""
-! error Fatal error: Var BUILD_ENV_FORCE is incorrect. ($(BUILD_ENV_FORCE)) Valid values: VAC308, VAC365, VAC4, EMX, MSCV6-16, WAT11C and WAT11C-16.
+! error Fatal error: Var BUILD_ENV_FORCE is incorrect. ($(BUILD_ENV_FORCE)) Valid values: VAC308, VAC365, VAC4, EMX, MSCV6-16, MSCV7-16, WAT11C and WAT11C-16.
 !endif
 !else

trunk/tools/bin/buildenv.cmd

@@ -1 @@
-/* $Id: buildenv.cmd,v 1.31 2002-09-05 01:20:11 bird Exp $
+/* $Id: buildenv.cmd,v 1.32 2002-09-14 16:01:03 bird Exp $
  *
  * This is the master tools environment script. It contains environment
@@ -126 +126 @@
     aCfg.i.sId = 'mscv6';           aCfg.i.sGrp = 'comp32';     aCfg.i.sSet = 'MSCV6_32';               aCfg.i.sDesc = 'MicroSoft C v6.0 32-bit';   i = i + 1;
     aCfg.i.sId = 'mscv6-16';        aCfg.i.sGrp = 'comp16';     aCfg.i.sSet = 'MSCV6_16';               aCfg.i.sDesc = 'MicroSoft C v6.0a 16-bit';  i = i + 1;
+    aCfg.i.sId = 'mscv7-16';        aCfg.i.sGrp = 'comp16';     aCfg.i.sSet = 'MSCV7_16';               aCfg.i.sDesc = 'MicroSoft C v7.0 16-bit with OS/2 support';  i = i + 1;
     aCfg.i.sId = 'mysql';           aCfg.i.sGrp = 'database';   aCfg.i.sSet = 'mySQL';                  aCfg.i.sDesc = 'MySql any version (latest from Yuri is recommended)'; i = i + 1;
     aCfg.i.sId = 'nasm9833';        aCfg.i.sGrp = 'asm';        aCfg.i.sSet = 'NASM,''nasm9833''';      aCfg.i.sDesc = 'NASM version 0.98.33 compiled on May 28 2002'; i = i + 1;
@@ -846 +847 @@
         aPath.i.sPId = 'home';                      aPath.i.sPath = 'e:\user\kso';                  i = i + 1;
         aPath.i.sPId = 'mscv6-16';                  aPath.i.sPath = 'f:\ddktools\toolkits\msc60';   i = i + 1;
+        aPath.i.sPId = 'mscv7-16';                  aPath.i.sPath = 'f:\msc\v7.0';                  i = i + 1;
         aPath.i.sPId = 'mysql';                     aPath.i.sPath = 'f:\mysql2';                    i = i + 1;
         aPath.i.sPId = 'nasm9833';                  aPath.i.sPath = 'f:\nasm\os2\0.98.33';          i = i + 1;
@@ -895 +897 @@
         aPath.i.sPId = 'home';                      aPath.i.sPath = 'x:\home';                      i = i + 1;
         aPath.i.sPId = 'mscv6-16';                  aPath.i.sPath = 'e:\ddktools\toolkits\msc60';   i = i + 1;
-      /*aPath.i.sPId = 'mysql';                     aPath.i.sPath = 'e:\mysql2';                    i = i + 1;
+      /*aPath.i.sPId = 'mscv7-16';                  aPath.i.sPath = 'e:\msc\v7.0';                  i = i + 1;
+        aPath.i.sPId = 'mysql';                     aPath.i.sPath = 'e:\mysql2';                    i = i + 1;
         aPath.i.sPId = 'netqos2';                   aPath.i.sPath = 'e:\netqos2';                   i = i + 1;
         aPath.i.sPId = 'perl';                      aPath.i.sPath = 'e:\perllib';                   i = i + 1;
@@ -943 +946 @@
         aPath.i.sPId = 'home';                      aPath.i.sPath = 'd:\home\bird';                 i = i + 1;
         aPath.i.sPId = 'mscv6-16';                  aPath.i.sPath = 'd:\dev\ddktools\toolkits\msc60'; i = i + 1;
+        aPath.i.sPId = 'mscv7-16';                  aPath.i.sPath = 'd:\dev\msc\v7.0';              i = i + 1;
         aPath.i.sPId = 'mysql';                     aPath.i.sPath = 'd:\apps\mysql\v3.23.50b1';     i = i + 1;
       /*aPath.i.sPId = 'netqos2';                   aPath.i.sPath = 'e:\netqos2';                   i = i + 1;
@@ -2345 +2349 @@
 
 /*
+ * Microsoft C v7.0 16-bit with OS/2 support.
+ */
+MSCV7_16: procedure expose aCfg. aPath. sPathFile
+    parse arg sToolId,sOperation,fRM,fQuiet
+
+    /*
+     * Microsoft C v6.0a main directory.
+     */
+    sPathMSC    = PathQuery('mscv7-16', sToolId, sOperation);
+    if (sPathMSC = '') then
+        return 1;
+    /* If config operation we're done now. */
+    if (pos('config', sOperation) > 0) then
+        return 0;
+
+    /*
+     * Installing the environment variables.
+     */
+    call EnvSet      fRM, 'BUILD_ENV',  'MSCV7-16'
+    call EnvSet      fRM, 'BUILD_PLATFORM', 'OS2'
+    call EnvSet      fRM, 'PATH_MSC',   sPathMSC;
+    call EnvAddFront fRM, 'path',       sPathMSC'\binp;'
+    call EnvAddFront fRM, 'include',    sPathMSC'\include;'
+    call EnvAddFront fRM, 'include16',  sPathMSC'\include;'
+    call EnvAddFront fRM, 'lib',        sPathMSC'\lib;'
+
+    /*
+     * Verify.
+     */
+    if (pos('verify', sOperation) <= 0) then
+        return 0;
+    if (    \CfgVerifyFile(sPathMSC'\binp\cl.exe', fQuiet),
+        |   \CfgVerifyFile(sPathMSC'\binp\link.exe', fQuiet),
+        |   \CfgVerifyFile(sPathMSC'\binp\ilink.exe', fQuiet),
+       /* |   \CfgVerifyFile(sPathMSC'\lib\clibcep.lib', fQuiet),
+        |   \CfgVerifyFile(sPathMSC'\lib\llibcep.lib', fQuiet),
+        |   \CfgVerifyFile(sPathMSC'\lib\mlibcep.lib', fQuiet),
+        |   \CfgVerifyFile(sPathMSC'\lib\slibcep.lib', fQuiet)*/,
+        |   \CfgVerifyFile(sPathMSC'\include\dos.h', fQuiet),
+        |   \CfgVerifyFile(sPathMSC'\include\bios.h', fQuiet),
+        |   \CfgVerifyFile(sPathMSC'\include\locale.h', fQuiet),
+        |   \CfgVerifyFile(sPathMSC'\include\stdiostr.h', fQuiet),
+        |   \CfgVerifyFile(sPathMSC'\include\string.h', fQuiet),
+        |   \CfgVerifyFile(sPathMSC'\include\vmemory.h', fQuiet),
+        |   \CfgVerifyFile(sPathMSC'\include\stdio.h', fQuiet),
+        ) then
+        return 2;
+    rc = CheckCmdOutput('cl', 0, fQuiet, 'Microsoft (R) C/C++ Optimizing Compiler Version 7.00');
+return rc;
+
+
+
+
+/*
  * mySQL Database system
  */