Changeset 1890

Timestamp:

Jan 30, 2020, 7:39:42 AM (6 years ago)

Author:

Steven Levine

Message:

Add PMPRINTF enable support to makefiles.
Correct PMPRINTF debug macro enables in sources.

Location:

trunk

Files:

• dll/dircnrs.c (modified) (1 diff)
• dll/filldir.c (modified) (1 diff)
• dll/flesh.c (modified) (2 diffs)
• dll/makefile (modified) (5 diffs)
• dll/misc.c (modified) (1 diff)
• dll/select.c (modified) (1 diff)
• dll/sortcnr.c (modified) (1 diff)
• dll/update.c (modified) (1 diff)
• dll/valid.c (modified) (1 diff)
• makefile (modified) (7 diffs)
• makefile_post.mk (modified) (3 diffs)
• makefile_pre.mk (modified) (6 diffs)

trunk/dll/dircnrs.c

@@ -174 +174 @@
 #include "pathutil.h"                   // AddBackslashToPath
 #include "copyf.h"                      // ignorereadonly
-#if 0
-#define  __PMPRINTF__
+
+#ifdef PMPRINTF
+#define  _PMPRINTF_                     // Enable debug macros
 #include "PMPRINTF.H"
 #endif

trunk/dll/filldir.c

@@ -168 +168 @@
 #include "pathutil.h"                   // AddBackslashToPath
 #include "tmrsvcs.h"                    // ITIMER_DESC
-#if 0
-#define  __PMPRINTF__
+
+#ifdef PMPRINTF
+#define  _PMPRINTF_                     // Enable debug macros
 #include "PMPRINTF.H"
 #endif

trunk/dll/flesh.c

@@ -79 +79 @@
 #include "common.h"                     // IncrThreadUsage DecrThreadUsage
 #include "pathutil.h"
-#if 0
-#define  __PMPRINTF__
+
+#ifdef PMPRINTF
+#define  _PMPRINTF_                     // Enable debug macros
 #include "PMPRINTF.H"
 #endif
@@ -88 +89 @@
 
 static PSZ pszSrcFile = __FILE__;
-
 
 static INT tidFleshWorkListThread = -1; // 2015-08-08 SHL

trunk/dll/makefile

@@ -3 +3 @@
 
 # Copyright (c) 1993-98 M. Kimes
-# Copyright (c) 2002, 2015 Steven H. Levine
+# Copyright (c) 2002-2020 Steven H. Levine
 
 # 22 May 03 SHL Correct icon dependencies
@@ -48 +48 @@
 # 24 Feb 14 JBS Ticket #500: Suspended use of high memory by commenting out the calls to exehdr
 # 13 Aug 15 SHL Add listutil
+# 25 Jan 20 SHL Add PMPRINTF support
 
 # Environment: see makefile_pre.mk and makefile_post.mk
@@ -54 +55 @@
 # WARNALL - add more warnings if defined, standard warnings if not defined
 # FORTIFY - enable FORTIFY heap checking if defined, omit FORITY support if not defined
+# PMPRINTF - enable PMPRINTF support, omit PMPRINTF support if not defined
 # USE_RC - use rc.exe if defined, use wrc.exe if not defined
 # NOHIGHMEM - support high memory use (i.e exehdir /highmem)
+
+# PMPRINTF support assumes PMPRINTF.H in INCLUDE path
+# PMPRINTF support assumes PMPRINTF.LIB in LIB path
 
 BASE = fm3dll
@@ -159 +164 @@
 !endif
 
+!ifdef PMPRINTF
+CFLAGS += -dPMPRINTF
+!endif
+
 # for fm3res only
 CFLAGSR = -bt=os2 -mf -bd -bm         -olirs -s     -j -we -wx -zfp -zgp -zp4 -zq
@@ -362 +371 @@
   -del *~
 
+# eof

trunk/dll/misc.c

@@ -122 +122 @@
 #include "fortify.h"
 #include "info.h"                       // driveflags
-#if 0
-#define  __PMPRINTF__
+
+#ifdef PMPRINTF
+#define  _PMPRINTF_                     // Enable debug macros
 #include "PMPRINTF.H"
 #endif

trunk/dll/select.c

@@ -74 +74 @@
 #include "flesh.h"
 #include "treecnr.h"                    // fExpandAll
-#if 0
-#define  __PMPRINTF__
+
+#ifdef PMPRINTF
+#define  _PMPRINTF_                     // Enable debug macros
 #include "PMPRINTF.H"
 #endif

trunk/dll/sortcnr.c

@@ -28 +28 @@
 #include "sortcnr.h"
 #include "valid.h"                      // TestCDates
-#if 0
-#define  __PMPRINTF__
+
+#ifdef PMPRINTF
+#define  _PMPRINTF_                     // Enable debug macros
 #include "PMPRINTF.H"
 #endif

trunk/dll/update.c

@@ -51 +51 @@
 #include "misc.h"                       // PostMsg
 #include "fortify.h"
-#if 0
-#define  __PMPRINTF__
+
+#ifdef PMPRINTF
+#define  _PMPRINTF_                     // Enable debug macros
 #include "PMPRINTF.H"
 #endif

trunk/dll/valid.c

@@ -696 +696 @@
       }
     }
-     else if (*argv[x] == '`' && isalpha(argv[x][1])) {
+    else if (*argv[x] == '`' && isalpha(argv[x][1])) {
 
       CHAR *p = &argv[x][1];

trunk/makefile

@@ -3 +3 @@
 
 # Copyright (c) 1993-98 M. Kimes
-# Copyright (c) 2002, 2010 Steven H. Levine
+# Copyright (c) 2002-2010 Steven H. Levine
 
 # 24 May 05 SHL Add clean and cleanobj target
@@ -32 +32 @@
 # 04 Jul 11 GKY Add eFTE backup files (*~) to clean target
 # 13 Aug 11 GKY Build xqs and sym files as part of dll and all targets
+# 25 Jan 20 SHL Add PMPRINTF support - PMPRINTF_OPT
 
 # Environment - see makefile_pre.mk and dll\makefile
@@ -72 +73 @@
 dll: .symbolic
   cd dll
-  $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT)
+  $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) $(PMPRINTF_OPT)
   cd ..
 
 dllsyms: .symbolic
   cd dll
-  $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) syms
+  $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) $(PMPRINTF_OPT) syms
   cd ..
 
@@ -89 +90 @@
 
 allexe: *.mak .symbolic
-  @for %f in ($<) do $(MAKE) -h -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT)
+  @for %f in ($<) do $(MAKE) -h -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) $(PMPRINTF_OPT)
 
 # make SYM files
 
 exesyms: *.mak .symbolic
-  @for %f in ($<) do $(MAKE) -h -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) sym
+  @for %f in ($<) do $(MAKE) -h -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) $(PMPRINTF_OPT) sym
 
 # make WPI files
@@ -109 +110 @@
 lxliteexe: *.mak .symbolic
 !ifndef DEBUG
-  @for %f in ($<) do $(MAKE) -h -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
+  @for %f in ($<) do $(MAKE) -h -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) $(PMPRINTF_OPT) lxlite
 !endif
 
@@ -117 +118 @@
   cd dll
   $(MAKE) -h lxlite
-#  $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
+# FIXME to be gone
+# $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) $(PMPRINTF_OPT) lxlite
   cd ..
 !endif
@@ -147 +149 @@
 !include makefile_post.mk
 
-# The end
+# eof

trunk/makefile_post.mk

@@ -2 +2 @@
 # $Id$
 
-# Copyright (c) 2002, 2012 Steven H. Levine
+# Copyright (c) 2002-2020 Steven H. Levine
 
 # 16 Aug 05 SHL Clean up
@@ -18 +18 @@
 # 25 Jan 12 SHL Renamae LOW -> NOHIGHMEM and allow set from enviroment
 # 17 Jan 14 JBS Ticket 500: Stop setting exe objects to high-memory
+# 25 Jan 20 SHL Comments
 
 !ifndef MAKERES
@@ -24 +25 @@
 # Common parameters go in .lrf
 # Executable specific paramters go in .def
-# Put 32-bit data in high memoryt unless overridden
+# Put 32-bit data in high memory unless overridden
 
 !ifndef NOHIGHMEM

trunk/makefile_pre.mk

@@ -3 +3 @@
 
 # Copyright (c) 1993-98 M. Kimes
-# Copyright (c) 2002, 2012 Steven H. Levine
+# Copyright (c) 2002-2020 Steven H. Levine
 
 # 03 Jan 08 SHL Switch to wrc.exe default; support USE_RC from environment
@@ -15 +15 @@
 # 07 Jan 11 SHL sort map
 # 25 Jan 12 SHL Comments
+# 14 Aug 15 SHL Test hll debug - FIXME to be gone
+# 25 Jan 20 SHL Add PMPRINTF support - PMPRINTF_OPT CFLAGS
 
 # Environment: see dll\makefile
@@ -61 +63 @@
 !endif
 
+!ifdef PMPRINTF                         # if defined on wmake command line
+PMPRINTF_OPT = PMPRINTF=$(PMPRINTF)     # set in case needed by sub-make
+!else
+!ifdef %PMPRINTF                        # if defined in environment
+PMPRINTF = $(%PMPRINTF)                 # use value from environment
+PMPRINTF_OPT = PMPRINTF=$(PMPRINTF)     # set in case needed by sub-make
+!endif
+!endif
+
 SYMS = $(BASE).sym                      # target for building SYM files
 
@@ -94 +105 @@
 
 # We always compile with debug info to avoid needing a full rebuild just to debug
+# 2015-08-14 SHL HLL debug testing
+# CFLAGS = -bt=os2 -mf -bm -d2 -olirs -s -j -wx -zfp -zgp -zp4 -zq -hc
 CFLAGS = -bt=os2 -mf -bm -d2 -olirs -s -j -wx -zfp -zgp -zp4 -zq -hd
 
@@ -106 +119 @@
 !endif
 
+!ifdef PMPRINTF
+CFLAGS += -dPMPRINTF
+!endif
+
 LFLAGS = sys os2v2_pm op quiet op verbose op cache op caseexact op map sort global
 !ifdef DEBUG
 CFLAGS += -d$DEBUG_OPT
+# 2015-08-14 SHL HLL debug testing
+# LFLAGS += debug hll all
 LFLAGS += debug dwarf all
 !endif
@@ -144 +163 @@
   $(CC) $(CFLAGS) $*.c
 
-# The end
+# eof