Changeset 8333 for trunk/make

Timestamp:

Apr 30, 2002, 8:19:13 AM (24 years ago)

Author:

bird

Message:

Build level info. Symbol files.

Location:

trunk/make

Files:

• process.mak (modified) (11 diffs)
• setup.mak (modified) (2 diffs)
• setup.tools.mk (modified) (4 diffs)

trunk/make/process.mak

@@ -1 @@
-# $Id: process.mak,v 1.9 2002-04-29 12:04:37 bird Exp $
+# $Id: process.mak,v 1.10 2002-04-30 06:19:13 bird Exp $
 
 #
@@ -112 +112 @@
 !endif
 
+# Default target .sym file. (output)
+!ifndef TARGET_SYM
+TARGET_SYM  = $(PATH_TARGET)\$(TARGET_NAME).$(EXT_SYM)
+!endif
 
 # Default object file. (output)
@@ -128 +132 @@
 !endif
 
+# Default modified definition filename. (output)
+!ifndef TARGET_DEF_LINK
+TARGET_DEF_LINK = $(PATH_TARGET)\$(TARGET_NAME)_link.def
+!endif
+
 # Default definition file for generating the import library. (input)
 !ifndef TARGET_IDEF
@@ -135 +144 @@
 # Default map file. (output)
 !ifndef TARGET_MAP
-TARGET_MAP  = $(PATH_TARGET)\$(TARGET_NAME).map
+TARGET_MAP  = $(PATH_TARGET)\$(TARGET_NAME).$(EXT_MAP)
 !endif
 
@@ -516 +525 @@
     @$(ECHO) Installing $(CLRFIL)$(TARGET)$(CLRTXT) in directory $(CLRFIL)$(PATH_BIN)$(CLRRST)
     @if not exist $(TARGET) $(ECHO) $(CLRERR)WARNING: $(CLRFIL)$(TARGET)$(CLRERR) doesn't exist. $(CLRRST)
-    @if exist $(TARGET)     $(TOOL_COPY) $(TARGET) $(PATH_BIN)
+    @if exist $(TARGET)     $(TOOL_COPY) $(TARGET)     $(PATH_BIN)
+    @if exist $(TARGET_SYM) $(TOOL_COPY) $(TARGET_SYM) $(PATH_BIN)
 ! endif
 ! if "$(TARGET_MODE)" == "DLL" || "$(TARGET_MODE)" == "CRT"
     @$(ECHO) Installing $(CLRFIL)$(TARGET)$(CLRTXT) in directory $(CLRFIL)$(PATH_DLL)$(CLRRST)
     @if not exist $(TARGET) $(ECHO) $(CLRERR)WARNING: $(CLRFIL)$(TARGET)$(CLRERR) doesn't exist. $(CLRRST)
-    @if exist $(TARGET)     $(TOOL_COPY) $(TARGET) $(PATH_DLL)
+    @if exist $(TARGET)     $(TOOL_COPY) $(TARGET)     $(PATH_DLL)
+    @if exist $(TARGET_SYM) $(TOOL_COPY) $(TARGET_SYM) $(PATH_DLL)
 ! endif
 ! if "$(TARGET_MODE)" == "SYS" || "$(TARGET_MODE)" == "IFS"
     @$(ECHO) Installing $(CLRFIL)$(TARGET)$(CLRTXT) in directory $(CLRFIL)$(PATH_SYS)$(CLRRST)
     @if not exist $(TARGET) $(ECHO) $(CLRERR)WARNING: $(CLRFIL)$(TARGET)$(CLRERR) doesn't exist. $(CLRRST)
-    @if exist $(TARGET)     $(TOOL_COPY) $(TARGET) $(PATH_SYS)
+    @if exist $(TARGET)     $(TOOL_COPY) $(TARGET)     $(PATH_SYS)
+    @if exist $(TARGET_SYM) $(TOOL_COPY) $(TARGET_SYM) $(PATH_SYS)
 ! endif
 !if 1 # these targets are either TARGET_PUBLIC or all private.
@@ -532 +544 @@
     @$(ECHO) Installing $(CLRFIL)$(TARGET)$(CLRTXT) in directory $(CLRFIL)$(PATH_LIB)$(CLRRST)
     @if not exist $(TARGET) $(ECHO) $(CLRERR)WARNING: $(CLRFIL)$(TARGET)$(CLRERR) doesn't exist. $(CLRRST)
-    @if exist $(TARGET)     $(TOOL_COPY) $(TARGET) $(PATH_LIB)
+    @if exist $(TARGET)     $(TOOL_COPY) $(TARGET)     $(PATH_LIB)
+    @if exist $(TARGET_SYM) $(TOOL_COPY) $(TARGET_SYM) $(PATH_LIB)
 !  endif
 ! endif
@@ -624 +637 @@
         $(PATH_TARGET)\*.$(EXT_EXE) \
         $(PATH_TARGET)\*.$(EXT_DLL) \
-        $(PATH_TARGET)\*.$(EXT_RES) \
+        $(PATH_TARGET)\*.$(EXT_RES)
+    $(TOOL_RM) \
         $(PATH_TARGET)\*.$(EXT_SYS) \
-        $(PATH_TARGET)\*.$(EXT_LIB)
+        $(PATH_TARGET)\*.$(EXT_LIB) \
+        $(PATH_TARGET)\*.$(EXT_IFS) \
+        $(PATH_TARGET)\*.$(EXT_MAP) \
+        $(PATH_TARGET)\*.$(EXT_SYM)
     $(TOOL_RM) \
-        $(PATH_TARGET)\*.$(EXT_IFS) \
-        $(PATH_TARGET)\*.map \
         $(PATH_TARGET)\*.s \
         $(PATH_TARGET)\*.lst \
@@ -653 +668 @@
 # -----------------------------------------------------------------------------
 !if "$(TARGET_MODE)" == "EXE" || "$(TARGET_MODE)" == "DLL" || "$(TARGET_MODE)" == "CRT" || "$(TARGET_MODE)" == "SYS" || "$(TARGET_MODE)" == "IFS" || "$(TARGET_MODE)" == "VDD"
-$(TARGET): $(TARGET_OBJS) $(TARGET_RES) $(TARGET_DEF) $(TARGET_LNK) $(TARGET_DEPS)
+$(TARGET): $(TARGET_OBJS) $(TARGET_RES) $(TARGET_DEF_LINK) $(TARGET_LNK) $(TARGET_DEPS)
     @$(ECHO) Linking $(TARGET_MODE) $(CLRFIL)$@ $(CLRRST)
 !ifndef BUILD_VERBOSE
@@ -689 +704 @@
 ! endif
     $(TOOL_DLLRNAME) $(TARGET) $(TARGET_DLLRNAME)
+!endif
+!if "$(TOOL_MAPSYM)" != "" && "$(TARGET_SYM)" != "" && "$(TARGET_MAP)" != ""
+! ifndef BUILD_VERBOSE
+    @ \
+! endif
+    $(TOOL_MAPSYM) $(TARGET_MAP) $(TARGET_SYM)
 !endif
 
@@ -703 +724 @@
 $(LINK_LNK5)
 <<KEEP
+
+
+#
+# Builddef modified definition file.
+#
+!if "$(TARGET_DEF_LINK)" != "$(TARGET_DEF)"
+$(TARGET_DEF_LINK): $(TARGET_DEF)
+! ifndef BUILD_QUIET
+    @$(ECHO) Stamping deffile with build level info.$(CLRRST)
+! endif
+! ifndef BUILD_VERBOSE
+    @ \
+! endif
+    $(TOOL_BLDLEVEL) $(BUILD_BLDLEVEL_FLAGS) $(TARGET_BLDLEVEL_FLAGS) -R$** $** $@
+!endif
+
 !endif
 
@@ -745 +782 @@
 !endif
     $(TOOL_COPY) $** $@
+    @if exist $(TARGET_SYM) $(TOOL_COPY) $(TARGET_SYM) $(@R).sym
 !endif
 

trunk/make/setup.mak

@@ -1 @@
-# $Id: setup.mak,v 1.6 2002-04-22 02:23:05 bird Exp $
+# $Id: setup.mak,v 1.7 2002-04-30 06:19:13 bird Exp $
 
 #
@@ -148 +148 @@
 
 # The default definitions.
-BUILD_DEFINES = -D__WIN32OS2__ -D__WINE__ -D__i386__
+BUILD_DEFINES           = -D__WIN32OS2__ -D__WINE__ -D__i386__
+BUILD_BLDLEVEL_FLAGS    = -V^"^#define=ODIN32_VERSION,$(PATH_ROOT)\include\odinbuild.h^" \
+                          -M^"^#define=ODIN32_BUILD_NR,$(PATH_ROOT)\include\odinbuild.h^"
 
 # This is the process file to include at end of the makefile.

trunk/make/setup.tools.mk

@@ -1 @@
-# $Id: setup.tools.mk,v 1.6 2002-04-22 01:59:34 bird Exp $
+# $Id: setup.tools.mk,v 1.7 2002-04-30 06:19:13 bird Exp $
 
 
@@ -26 +26 @@
 #
 ECHO            = $(TOOL_ECHO)
+TOOL_BLDLEVEL   = $(PATH_TOOLS)\BldLevelInf.cmd
+TOOL_BUILDENV   = $(PATH_TOOLS)\BuildEnv.cmd
 TOOL_CMP        = $(PATH_TOOLS)\cmp.exe
 !if "$(BUILD_SHELL)" != "4OS2"
@@ -43 +45 @@
 TOOL_EXISTS     = $(PATH_TOOLS)\Exists.cmd
 TOOL_MAKE       = $(MAKE) -nologo
+TOOL_MAPSYM     = $(PATH_TOOLS)\MapSym.cmd $(BUILD_ENV)
 TOOL_RM         = rm.exe -f
 TOOL_TYPE       = type
-TOOL_BUILDENV   = $(PATH_TOOLS)\BuildEnv.cmd
 
 
@@ -51 +53 @@
 # Default Extensions.
 #
+EXT_DLL = dll
+EXT_EXE = exe
+EXT_IFS = ifs
+EXT_ILIB= lib
+EXT_LIB = lib
+EXT_MAP = map
 EXT_OBJ = obj
-EXT_LIB = lib
-EXT_ILIB= lib
-EXT_EXE = exe
-EXT_DLL = dll
 EXT_RES = res
+EXT_RES = res
+EXT_SYM = sym
 EXT_SYS = sys
-EXT_IFS = ifs
 EXT_VDD = sys
-EXT_RES = res
 
 
-#
-# Depreciated (kso don't like these)
-#
-RM=$(TOOLS_RM)
-TOOLS_DEL=@del      # use TOOLS_RM!
-CD=cd
-CD_ENTER=cd
-CD_LEAVE=cd ..
-
-