Changeset 679 for GPL/trunk/tools

Timestamp:

Mar 18, 2021, 8:57:36 PM (5 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• tools/AddToFile.cmd (modified) (6 diffs)
• tools/header.mif (modified) (4 diffs)
• tools/mkversion.cmd (modified) (5 diffs)

GPL/trunk/tools/AddToFile.cmd

@@ -3 +3 @@
  * Written by and Copyright (c) 2010-2018 David Azarewicz http://88watts.net
  *
- * @#D Azarewicz:1.03#@##1## 02 Mar 2020              DAZAR1    ::::::@@AddToFile.cmd (c) David Azarewicz 2020
+ * @#D Azarewicz:1.04#@##1## 02 Jan 2021              DAZAR1    ::::::@@AddToFile.cmd (c) David Azarewicz 2021
  * V1.01 16-Sep-2016 First official release
  * V1.02 02-Jun-2017 Added Asd to bldlevel, added DATE1
  * V1.03 02-Mar-2020 Added STRING function
+ * V1.04 02-Jan-2021 Added FILESIZE function
  *
  * The following line is for the help sample code for the VAR function:
@@ -30 +31 @@
   Say '  STRING - Adds the string with %Y substitution.';
   Say '  VAR - Adds the value of the specified variable from a specified file.';
+  Say '  FILESIZE - Adds the file size.';
   Say '  FILE - Adds the contents of a file.';
   Say 'Examples:';
@@ -68 +70 @@
   call 'AddToFile.cmd' MyCmd;
   MyCmd=MyFile||',#define XYZ "%A",VAR,EXAMPLEVAR=,AddToFile.cmd';
+  rc=LineOut(MyFile, '--- AddToFile.cmd '||MyCmd);
+  call 'AddToFile.cmd' MyCmd;
+  MyCmd=MyFile||',#define FSIZE,FILESIZE,addtofile.cmd';
   rc=LineOut(MyFile, '--- AddToFile.cmd '||MyCmd);
   call 'AddToFile.cmd' MyCmd;
@@ -92 +97 @@
 
   when (LEFT(Function,8)='BLDLEVEL') then do
+    /*  option description,BLDLEVEL,Vendor,1.2.3,Description,Fixpack,Asd';
+     *  String            ,Function,Parm1 ,Parm2,Parm3      ,Parm4  ,Parm5
+     */
     Type=SUBSTR(Function,9,1);
 
@@ -111 +119 @@
     end
 
+    /*           Vendor     TextVersion        Date/Time/Host    ASD            Revision         Fixpack      Desc */
     NewStr='@#'||Parm1||':'||Parm2||'#@##1## '||ProjString||':'||Parm5||':::'||ProjVersion||'::'||Parm4||'@@'||Parm3;
     if (Type='2') then do
@@ -209 +218 @@
     end;
     rc=stream(String,'c','close');
+    rc=lineout(OutFile);
+  end
+
+  when (Function="FILESIZE") then do
+    NewStr=stream(Parm1,'c','query size');
+    RepLoc=Pos('%A', String);
+    if (RepLoc>0) then OutStr=Substr(String,1,RepLoc-1)||NewStr||Substr(String,RepLoc+2);
+    else OutStr=String||' '||NewStr;
+    rc=lineout(OutFile, OutStr);
     rc=lineout(OutFile);
   end

GPL/trunk/tools/header.mif

@@ -17 +17 @@
 !endif
 WATCOM=$(%WATCOM)
-
-#Always build KEE version
-KEE = 1
 
 !if "$(DEBUG)" == "1"
@@ -44 +41 @@
 .SUFFIXES: .lst .obj .lib .cpp .cpp16 .c .c16 .asm .def
 
+CPPFLAGS = -xd
+ASFLAGS  = -Mb -Li -Sv:M510
+CFLAGS   = -bt=os2v2 -5r -omlinear -s -wx -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -ei
+CFLAGS16 = $(CFLAGS) -mc -zu -zc
+CFLAGS  += -mf
+
 !if "$(DEBUG)" == "1"
-CFLAGS = -dDEBUG -bt=os2v2 -hc -5r -omlinear -s -wx -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -ei
-CPPFLAGS= -xd
-ASFLAGS = -D:DEBUG -Mb -Li -Sv:M510
-!else
-CFLAGS = -bt=os2v2 -5r -omlinear -s -wx -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -ei
-CPPFLAGS= -xd
-ASFLAGS = -Mb -Li -Sv:M510
+CFLAGS  += -dDEBUG -hc
+ASFLAGS += -D:DEBUG
 !endif
 
@@ -58 +56 @@
 !else
 CFLAGS += -zp4
-!endif
-
-!if $(KEE) == 1
-CFLAGS16 = $(CFLAGS) -mc -zu -zc
-CFLAGS += -mf -DKEE -DFLATSTACK
-ASFLAGS += -D:KEE -D:FLATSTACK
-!else
-CFLAGS16 = $(CFLAGS) -mc -zu -zc
-CFLAGS += -mf -DFLATSTACK
-ASFLAGS += -D:FLATSTACK
 !endif
 
@@ -91 +79 @@
 LINK = wlink $(LFLAGS)
 !else
-LD2TARGETFLAGS =/PDD /OLDcpp /map /linenumbers
+LD2TARGETFLAGS = /PDD /nologo /noe /packcode /packdata /nod /OLDcpp
 !if "$(DEBUG)" == "1"
-LD2FLAGS = /nologo /noe /map /packcode /packdata /nod /debug $(LD2TARGETFLAGS)
+LD2FLAGS = /linenumbers /debug $(LD2TARGETFLAGS)
 !else
-LD2FLAGS = /nologo /noe /map /packcode /packdata /exepack:2 /nod $(LD2TARGETFLAGS)
+LD2FLAGS = /exepack:2 $(LD2TARGETFLAGS)
 !endif
 LINK = ilink $(LD2FLAGS)

GPL/trunk/tools/mkversion.cmd

@@ -8 +8 @@
 
 /* I don't this will ever change from Netlabs */
-projVendor    = EnvVar_Get_If('VENDOR', 'Netlabs');
+projVendor    = EnvVar_Get_If('VENDOR', 'Netlabs <www.netlabs.org>');
 projProduct   = "OS/2 Universal Audio 32 Driver";
-projVendorNam = "Netlabs <www.netlabs.org>";
-projAdapter   = "OS/2 Universal Audio";
 
 /* uniaud.inc is located in the base gpl directory and
@@ -69 +67 @@
 parse value versionIn with major'.'minor'.'projVersion
 
-if fixpack="" then
-  projVers = versionIn;
-else
-  projVers = versionIn||'-'||fixpack;
-
 projVers2 = major||minor||projVersion;
 
@@ -93 +86 @@
   say 'alsalevel='||alsalevel;
   say 'ProjVersion='||ProjVersion;
-  say 'projVers='||projVers;
   say 'projVers2='||projVers2;
   say 'Fixpack='||Fixpack;
@@ -109 +101 @@
     call lineout versMak, '#       Generated by mkversion.cmd, do NOT edit !'
     call lineout versMak, '#'
-    call lineout versMak, 'BLDLVL_VENDOR = '||projVendor;
+    call lineout versMak, 'BLDLVL_VENDOR = '||Translate(projVendor,,'><');
     call lineout versMak, 'BLDLVL_VERSION = '||versionIn;
     call lineout versMak, 'BLDLVL_FIXPACK = '||Fixpack;
@@ -140 +132 @@
     call lineout versHdr, '#define VENDOR_NAME             "'||projVendor||'"';
     call lineout versHdr, '#define PRODUCT_TIMESTAMP       '||projDate2||'       // YYYYMMDD';
-    call lineout versHdr, '#define UNIAUD_VERSION          "'||projVers||'"';
+    call lineout versHdr, '#define UNIAUD_VERSION          "'||versionIn||'"';
     call lineout versHdr, '#define ALSA_VERSION            "'||alsalevel||'"';
     call lineout versHdr, ' '
     call lineout versHdr, ' '
     call lineout versHdr, '#define RM_VERSION              '||projVers2;
+    call lineout versHdr, '#define RM_VMAJOR               '||format(major);
+    call lineout versHdr, '#define RM_VMINOR               '||format(minor);
     call lineout versHdr, '#define RM_DRIVER_NAME          "UNIAUD32.SYS"';
     call lineout versHdr, '#define RM_DRIVER_DESCRIPTION   "'||projProduct||'"';
-    call lineout versHdr, '#define RM_ADAPTER_NAME         "'||projAdapter||'"';
-    call lineout versHdr, '#define RM_DRIVER_VENDORNAME    "'||projVendorNam||'"';
+    call lineout versHdr, '#define RM_DRIVER_VENDORNAME    "'||projVendor||'"';
     call lineout versHdr, '#define RM_DRIVER_BUILDYEAR     (PRODUCT_TIMESTAMP / 10000)';
     call lineout versHdr, '#define RM_DRIVER_BUILDMONTH    ((PRODUCT_TIMESTAMP / 100) % 100)';