Changeset 768 in kBuild

Timestamp:

Jan 19, 2007 2:52:39 AM (18 years ago)

Author:

bird

Message:

Use response files (aka command files) with the Visual C++ librarian. References #9.

Location:

trunk/kBuild/tools

Files:

• VCC70.kmk (modified) (3 diffs)
• VCC80.kmk (modified) (1 diff)
• VCC80AMD64.kmk (modified) (1 diff)
• VCC80X86.kmk (modified) (2 diffs)

trunk/kBuild/tools/VCC70.kmk

@@ -24 +24 @@
 #
 #
-           
+
 TOOL_VCC70 := Visual C++ 7.0 (aka Visual Studio .NET), targeting x86.
 
@@ -61 +61 @@
 endif
 ## Disabled fast DEP_IDB based dependencies.
-#VCC70_OLD_DEPS = 1 
+#VCC70_OLD_DEPS = 1
 
 ## Constructs the correct .pdb name (the name is lowercased).
@@ -218 +218 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 #
-TOOL_VCC70_LINK_LIBRARY_OUTPUT = $(outbase).lst $(outbase).exp $(outbase).pdb
 TOOL_VCC70_LINK_LIBRARY_DEPEND = $(othersrc)
 TOOL_VCC70_LINK_LIBRARY_DEPORD =
+ifeq ($(filter append-dash-n,$(KMK_FEATURES)),append-dash-n)
+TOOL_VCC70_LINK_LIBRARY_OUTPUT = $(outbase).lst $(outbase).exp $(outbase).pdb $(outbase).rsp
+define TOOL_VCC70_LINK_LIBRARY_CMDS
+        $(QUIET)$(APPEND) -n $(outbase).rsp \
+                $(foreach arg,\
+                        $(subst /,\\,$(objs) \
+                        $(filter-out %.def,$(othersrc))) \
+                        $(addprefix /DEF:,$(filter %.def,$(othersrc))) \
+                        ,\"$(arg)\")
+        $(QUIET)$(TOOL_VCC70_AR) $(flags) /OUT:$(out) @$(outbase).rsp
+endef
+else
+TOOL_VCC70_LINK_LIBRARY_OUTPUT = $(outbase).lst $(outbase).exp $(outbase).pdb
 define TOOL_VCC70_LINK_LIBRARY_CMDS
         $(QUIET)$(TOOL_VCC70_AR) $(flags) /OUT:$(out) $(subst /,\\,$(objs) $(filter %.a %.lib,$(othersrc))) \
                 $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(def))
 endef
+endif
 
 

trunk/kBuild/tools/VCC80.kmk

@@ -239 +239 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 #
-TOOL_VCC80_LINK_LIBRARY_OUTPUT = $(outbase).lst $(outbase).exp $(outbase).pdb
 TOOL_VCC80_LINK_LIBRARY_DEPEND = $(othersrc)
 TOOL_VCC80_LINK_LIBRARY_DEPORD =
+ifeq ($(filter append-dash-n,$(KMK_FEATURES)),append-dash-n)
+TOOL_VCC80_LINK_LIBRARY_OUTPUT = $(outbase).lst $(outbase).exp $(outbase).pdb $(outbase).rsp
+define TOOL_VCC80_LINK_LIBRARY_CMDS
+        $(QUIET)$(APPEND) -n $(outbase).rsp \
+                $(foreach arg,\
+                        $(subst /,\\,$(objs) \
+                        $(filter-out %.def,$(othersrc))) \
+                        $(addprefix /DEF:,$(filter %.def,$(othersrc))) \
+                        ,\"$(arg)\")
+        $(QUIET)$(TOOL_VCC80_AR) $(flags) /OUT:$(out) @$(outbase).rsp
+endef
+else
+TOOL_VCC80_LINK_LIBRARY_OUTPUT = $(outbase).lst $(outbase).exp $(outbase).pdb
 define TOOL_VCC80_LINK_LIBRARY_CMDS
         $(QUIET)$(TOOL_VCC80_AR) $(flags) /OUT:$(out) $(subst /,\\,$(objs) $(filter %.a %.lib,$(othersrc))) \
                 $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(def))
 endef
+endif
+
+
 
 

trunk/kBuild/tools/VCC80AMD64.kmk

@@ -224 +224 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 #
-TOOL_VCC80AMD64_LINK_LIBRARY_OUTPUT = $(outbase).lst $(outbase).exp $(outbase).pdb
 TOOL_VCC80AMD64_LINK_LIBRARY_DEPEND = $(othersrc)
 TOOL_VCC80AMD64_LINK_LIBRARY_DEPORD =
+ifeq ($(filter append-dash-n,$(KMK_FEATURES)),append-dash-n)
+TOOL_VCC80AMD64_LINK_LIBRARY_OUTPUT = $(outbase).lst $(outbase).exp $(outbase).pdb $(outbase).rsp
+define TOOL_VCC80AMD64_LINK_LIBRARY_CMDS
+        $(QUIET)$(APPEND) -n $(outbase).rsp \
+                $(foreach arg,\
+                        $(subst /,\\,$(objs) \
+                        $(filter-out %.def,$(othersrc))) \
+                        $(addprefix /DEF:,$(filter %.def,$(othersrc))) \
+                        ,\"$(arg)\")
+        $(QUIET)$(TOOL_VCC80AMD64_AR) $(flags) /OUT:$(out) @$(outbase).rsp
+endef
+else
+TOOL_VCC80AMD64_LINK_LIBRARY_OUTPUT = $(outbase).lst $(outbase).exp $(outbase).pdb
 define TOOL_VCC80AMD64_LINK_LIBRARY_CMDS
         $(QUIET)$(TOOL_VCC80AMD64_AR) $(flags) /OUT:$(out) $(subst /,\\,$(objs) $(filter %.a %.lib,$(othersrc))) \
                 $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(def))
 endef
+endif
 
 

trunk/kBuild/tools/VCC80X86.kmk

@@ -63 +63 @@
 TOOL_VCC80X86_MT  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/mt.exe
 ## Disabled fast DEP_IDB based dependencies.
-#VCC80X86_OLD_DEPS = 1 
+#VCC80X86_OLD_DEPS = 1
 
 ## Constructs the correct .pdb name (the name is lowercased).
@@ -223 +223 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 #
-TOOL_VCC80X86_LINK_LIBRARY_OUTPUT = $(outbase).lst $(outbase).exp $(outbase).pdb
 TOOL_VCC80X86_LINK_LIBRARY_DEPEND = $(othersrc)
 TOOL_VCC80X86_LINK_LIBRARY_DEPORD =
+ifeq ($(filter append-dash-n,$(KMK_FEATURES)),append-dash-n)
+TOOL_VCC80X86_LINK_LIBRARY_OUTPUT = $(outbase).lst $(outbase).exp $(outbase).pdb $(outbase).rsp
+define TOOL_VCC80X86_LINK_LIBRARY_CMDS
+        $(QUIET)$(APPEND) -n $(outbase).rsp \
+                $(foreach arg,\
+                        $(subst /,\\,$(objs) \
+                        $(filter-out %.def,$(othersrc))) \
+                        $(addprefix /DEF:,$(filter %.def,$(othersrc))) \
+                        ,\"$(arg)\")
+        $(QUIET)$(TOOL_VCC80X86_AR) $(flags) /OUT:$(out) @$(outbase).rsp
+endef
+else
+TOOL_VCC80X86_LINK_LIBRARY_OUTPUT = $(outbase).lst $(outbase).exp $(outbase).pdb
 define TOOL_VCC80X86_LINK_LIBRARY_CMDS
         $(QUIET)$(TOOL_VCC80X86_AR) $(flags) /OUT:$(out) $(subst /,\\,$(objs) $(filter %.a %.lib,$(othersrc))) \
                 $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(def))
 endef
+endif