Changeset 8360 for trunk/tools/common

Timestamp:

May 1, 2002, 5:58:37 AM (23 years ago)

Author:

bird

Message:

Support for other watcom target OSes.

Location:

trunk/tools/common

Files:

• kDef2Wat.cpp (modified) (6 diffs)
• kFileDef.cpp (modified) (6 diffs)
• kFileDef.h (modified) (1 diff)

trunk/tools/common/kDef2Wat.cpp

@@ -1 @@
-/* $Id: kDef2Wat.cpp,v 1.3 2002-02-24 02:47:23 bird Exp $
+/* $Id: kDef2Wat.cpp,v 1.4 2002-05-01 03:58:36 bird Exp $
  *
  * Converter for IBM/MS linker definition files (.DEF) to Watcom linker directives and options.
@@ -20 +20 @@
 #include "kFileFormatBase.h"
 #include "kFileDef.h"
+
+#include <stdio.h>
+#include <string.h>
 
 /*******************************************************************************
@@ -42 +45 @@
     const char *pszOutput;
     const char *pszAppend;
+    const char *pszOS;
+    int         enmOS;
 
     /* check arguments */
-    if (argc != 3 && argc != 4)
+    if (argc != 4 && argc != 5)
     {
         syntax();
         return -1;
     }
-    pszInput  = argv[1];
-    pszOutput = argv[2];
-    pszAppend = (argc == 4) ? argv[3] : NULL;
+    pszOS     = argv[1];
+    pszInput  = argv[2];
+    pszOutput = argv[3];
+    pszAppend = (argc == 5) ? argv[4] : NULL;
+    if (!stricmp(pszOS, "os2"))
+        enmOS = kFileDef::os2;
+    else if (!stricmp(pszOS, "dos"))
+        enmOS = kFileDef::dos;
+    else if (!stricmp(pszOS, "win32"))
+        enmOS = kFileDef::win32;
+    else if (!stricmp(pszOS, "win16"))
+        enmOS = kFileDef::win16;
+    else if (!stricmp(pszOS, "nlm"))
+        enmOS = kFileDef::nlm;
+    else if (!stricmp(pszOS, "qnx"))
+        enmOS = kFileDef::qnx;
+    else if (!stricmp(pszOS, "elf"))
+        enmOS = kFileDef::elf;
+    else
+    {
+        printf("Invalid os string '%s'.\n", pszOS);
+        syntax();
+        return -1;
+    }
 
     /*
@@ -64 +90 @@
             OutFile.end();
 
-            def.makeWatcomLinkFileAddtion(&OutFile);
+            def.makeWatcomLinkFileAddtion(&OutFile, enmOS);
             if (pszAppend)
             {
@@ -103 +129 @@
 {
     kFile::StdOut.printf(
-        "kDef2Wat v0.0.0 (untested)\n"
+        "kDef2Wat v0.0.1\n"
         "\n"
-        "syntax: kDef2Wat.exe <def-file> <wlink-file> [extra-file]\n"
+        "syntax: kDef2Wat.exe <os> <def-file> <wlink-file> [extra-file]\n"
         "\n"
         "Where:\n"
+        "    <os>           Target os. os2, dos, win32, win16, nlm, qnx or elf.\n"
         "    <def-file>     The .DEF file to convert.\n"
         "    <wlink-file>   The WLINK directive and option file.\n"
@@ -113 +140 @@
         "                   the wlink-file\n"
         "\n"
-        "Copyright (c) 2000 knut st. osmundsen (knut.stange.osmundsen@mynd.no)\n"
+        "Copyright (c) 2000-2002 knut st. osmundsen (bird@anduin.net)\n"
         );
 }

trunk/tools/common/kFileDef.cpp

@@ -1 @@
-/* $Id: kFileDef.cpp,v 1.8 2002-02-24 02:47:25 bird Exp $
+/* $Id: kFileDef.cpp,v 1.9 2002-05-01 03:58:36 bird Exp $
  *
  * kFileDef - Definition files.
@@ -644 +644 @@
  * @param   pFile   File which we're to write to (append).
  *                  Appends at current posistion.
+ * @param   enmOS   The target OS of the link operation.
  * @sketch
  * @status
@@ -649 +650 @@
  * @remark
  */
-KBOOL kFileDef::makeWatcomLinkFileAddtion(kFile *pOut)
+KBOOL kFileDef::makeWatcomLinkFileAddtion(kFile *pOut, int enmOS)
 {
     PDEFSEGMENT pSeg;
@@ -662 +663 @@
 
     /* Format - Module type */
-    pOut->printf("FORMAT OS2 LX %s %s %s\n",
-                  fLibrary                               ? "DLL" :
-                    (fProgram ? (chAppType == pm         ? "PM"
-                              : (chAppType == fullscreen ? "FULLSCREEN"
-                                                         : "PMCOMPATIBLE"))
-                    : (fVirtualDevice                    ? "VIRTDEVICE"
-                                                         : "PHYSDEVICE" )),
-                  fLibrary ? (fInitGlobal ? "INITGLOBAL" : "INITINSTANCE") : "",
-                  fLibrary ? (fTermGlobal ? "TERMGLOBAL" : "TERMINSTANCE") : "");
+    switch (enmOS)
+    {
+        case kFileDef::os2:
+            pOut->printf("FORMAT OS2 LX %s %s %s\n",
+                          fLibrary                               ? "DLL" :
+                            (fProgram ? (chAppType == pm         ? "PM"
+                                      : (chAppType == fullscreen ? "FULLSCREEN"
+                                                                 : "PMCOMPATIBLE"))
+                            : (fVirtualDevice                    ? "VIRTDEVICE"
+                                                                 : "PHYSDEVICE" )),
+                          fLibrary ? (fInitGlobal ? "INITGLOBAL" : "INITINSTANCE") : "",
+                          fLibrary ? (fTermGlobal ? "TERMGLOBAL" : "TERMINSTANCE") : "");
+            break;
+
+        case kFileDef::win32:
+            if (fLibrary)
+                pOut->printf("FORMAT Window NT DLL %s %s\n"
+                             "Runtime Windows\n",
+                             fLibrary ? (fInitGlobal ? "INITGLOBAL" : "INITINSTANCE") : "",
+                             fLibrary ? (fTermGlobal ? "TERMGLOBAL" : "TERMINSTANCE") : "");
+            else
+                pOut->printf("FORMAT Window NT\n"
+                             "Runtime %s\n",
+                             fProgram ? chAppType == pm  ? "Windows" : "Console" : "Native");
+            break;
+        default:
+            return FALSE;
+    }
 
 
@@ -694 +714 @@
 
     /* Protected mode */
-    if (pszProtmode)
+    if (pszProtmode && (enmOS == kFileDef::os2))
         pOut->printf("OPTION PROTMODE\n", pszProtmode);
 
@@ -743 +763 @@
         if (pExp->pszIntName)
             pOut->printf("='%s'", pExp->pszIntName);
-        if (pExp->fResident)
+        if (pExp->fResident && (enmOS == kFileDef::os2 || enmOS == kFileDef::win16))
             pOut->printf(" RESIDENT");
         if (pExp->cParam != ~0UL)

trunk/tools/common/kFileDef.h

@@ -132 +132 @@
 
         /**@cat Operations */
-        KBOOL       makeWatcomLinkFileAddtion(kFile *pFile) throw(kError);
+        KBOOL       makeWatcomLinkFileAddtion(kFile *pFile, int enmOS) throw(kError);
 
         enum {fullscreen = 0, pmvio = 2, pm = 3, unknown = 255};
+        enum {os2, dos, win32, win16, nlm, qnx, elf};
 };