Changeset 89

Timestamp:

Mar 4, 2007, 5:40:05 PM (19 years ago)

Author:

stevenhl

Message:

Correct make clean operation

Location:

OCO/trunk

Files:

• drv16/makefile.os2 (modified) (2 diffs)
• install/CARDINFO.DLL (modified) ( previous)
• install/makefile.os2 (modified) (1 diff)
• makefile.os2 (modified) (1 diff)
• runtime/makefile.os2 (modified) (1 diff)
• tools/wat2map.cmd (modified) (10 diffs)

OCO/trunk/drv16/makefile.os2

@@ -72 +72 @@
 !endif
 
+#   @%write $(OBJDIR)\$(NAME).lrf library $(%WATCOM)\lib286\os2\clibs.lib
+
 $(OBJDIR)\$(NAME).sys: $(OBJS) $(OBJDIR)\$(NAME).lrf makefile.os2 $(DDK_BASE)\lib\os2286.lib $(ALSA_LIB)\runtime.lib $(DDK_BASE)\src\dev\resource\rmcalls\rmcalls.lib
    $(LINK) @$(OBJDIR)\$(NAME).lrf
@@ -87 +89 @@
    copy $(OBJDIR)\$(NAME).sym $(ALSA_BIN_)
 
-clean:
-     del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lrf
+clean: .SYMBOLIC
+     -del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lrf

OCO/trunk/install/makefile.os2

@@ -134 +134 @@
 #############################################################################
 
-clean:
-     del *.dll *.obj *.err *.lrf *.res *.hlp
+clean: .SYMBOLIC
+     -del *.dll *.obj *.err *.lrf *.res *.hlp
 
 

OCO/trunk/makefile.os2

@@ -37 +37 @@
     @cd ..
 
-clean:
+clean: .SYMBOLIC
     @echo BUILDING runtime
     @cd runtime

OCO/trunk/runtime/makefile.os2

@@ -41 +41 @@
    copy $(OBJDIR)\$(NAME).lib $(ALSA_LIB)
 
-clean:
+clean: .SYMBOLIC
      cd $(OBJDIR)
-     del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lrf *.lib
+     -del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lrf *.lib
      cd ..\..
 

OCO/trunk/tools/wat2map.cmd

@@ -1 @@
-/* $Id: wat2map.cmd,v 1.1.1.1 2003/07/02 13:57:10 eleph Exp $ */
-
-/* SCCSID = %W% %E% */
+/* $Id: wat2map.cmd,v 1.2 2002/04/26 23:09:44 smilcke Exp $ */
+
+/* SCCSID = src/dev/mme/pciaudio/wat2map.cmd, pciaudio, c.basedd 99/08/20 */
 /****************************************************************************
  *                                                                          *
@@ -12 +12 @@
  *                                                                          *
  ****************************************************************************/
-/**@internal %W%
+
+/* 05 Jul 05 SHL - Correct do/end errors, close files
+   05 Jul 05 SHL - Partial 16/32 bit support (see f32bit)
+*/
+
+/**@internal src/dev/mme/pciaudio/wat2map.cmd, pciaudio, c.basedd
  * WAT2MAP - translate symbol map from Watcom format to MS format.
- * @version %I%
+ * @version 1.1
  * @context
  *  Unless otherwise noted, all interfaces are Ring-0, 16-bit, kernel stack.
@@ -47 +52 @@
 /* <End of helpText> - don't modify this string - used to flag end of help. */
 /****************************************************************************/
+
 CALL RXFUNCADD 'sysloadfuncs','rexxutil','sysloadfuncs'
 call sysloadfuncs
+
+f32bit = 0      /* fixme to autodetect */
 
 Parse Arg arg1 arg2 rest
@@ -74 +82 @@
    watcomText = LineIn( mapFile )
    Parse Value watcomText With "Executable Image: " fileName "." fileExt
-
    If fileName <> "" Then Do;   /* Found match */
       call lineout outfile ,' '
@@ -103 +110 @@
 
 /*--- 4.  Translate segment table.  ---*/
-call lineout outfile , " Start     Length     Name                   Class"
+if f32bit then
+  call lineout outfile , " Start         Length     Name                   Class"
+else
+  call lineout outfile , " Start     Length     Name                   Class"
+
 Do While Lines( mapFile ) <> 0
    watcomText = LineIn( mapFile )
    Parse Value watcomText With segName className groupName address size .
    If segName = "" Then Leave;          /* Empty line, break from loop. */
-   length = Substr( size, 4, 5 ) || 'H     '
+   if f32bit then
+     length = size || 'H  '
+   else
+     length = Substr( size, 4, 5 ) || 'H     '
    segName = Left( segName, 23 )
    call lineout outfile ,' ' || address || ' ' || length || segName || className
@@ -124 +138 @@
 Do While Lines( mapFile ) <> 0
    watcomText = LineIn( mapFile )
-   Parse Value watcomText With seg ':' ofs 10 . 16 declaration
+   Parse Value watcomText With seg ':' ofs declaration
+   if length(ofs) = 9 then
+     ofs = left(ofs, 8) || strip(translate(right(ofs, 1),, '+*'))
+
    is_Adress = (is_Hex(seg) = 1) & (is_Hex(ofs) = 1)
    If (is_Adress = 1) Then Do;
+
+      if \ f32bit then
+        ofs = right(ofs, 4)
 
       /*--- Haven't done the work to xlate operator symbols - skip the line. */
@@ -156 +176 @@
       declaration = ReplaceSubstr( '~', 'd', declaration )
 
-      call lineout outfile ,' ' || seg || ':' || ofs || '       ' || declaration
+      fill = copies(' ', 7)
+      call lineout outfile ,' ' || seg || ':' || ofs || fill || declaration
    End;
 End; /* End While through symbol section, end of input file. */
+
+call stream mapfile, 'C', 'CLOSE'
+call lineout outfile
 
 Return;  /* End of program.  */
@@ -184 +208 @@
       Return StripMatchedParen( string )
    End;
-End;
+
 
 ReplaceSubstr:
@@ -198 +222 @@
    End;
    Return string
-End;
+
 
 is_Hex:
@@ -204 +228 @@
    Parse Arg string
    Return (Length(string) > 0) &  (Verify( string, '0123456789abcdefABCDEF' ) = 0)
-End;