Changeset 42048 in vbox

Timestamp:

Jul 9, 2012 10:13:46 AM (12 years ago)

Author:

vboxsync

Message:

New build tool VBoxCmp: Simple cmp with sensible output.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Devices/PC/BIOS-new/Makefile.kmk (modified) (2 diffs)
• src/bldprogs/Makefile.kmk (modified) (2 diffs)
• src/bldprogs/VBoxCmp.cpp (added)

trunk/Config.kmk

@@ -1729 +1729 @@
 # RTManifest (extension pack manifest utility)
 VBOX_RTMANIFEST ?= $(PATH_OBJ)/bldRTManifest/bldRTManifest$(HOSTSUFF_EXE)
+
+# VBoxCmp (simple /bin/cmp with more sensible output)
+VBOX_VBOXCMP    ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE)
 
 # VBoxCPP (special purpose C preprocessor)

trunk/src/VBox/Devices/PC/BIOS-new/Makefile.kmk

@@ -91 +91 @@
  update-bios-source | $(PATH_SUB_CURRENT)/VBoxBiosAlternative.asm $(PATH_SUB_CURRENT)/VBoxBiosAlternative.md5sum: \
                 $$(VBoxPcBios_1_TARGET) \
-                $$(MakeDebianBiosAssembly_1_TARGET)
+                $$(MakeDebianBiosAssembly_1_TARGET) \
+                $(VBOX_VBOXCMP)
  if1of ($(KBUILD_TYPE), release)
         $(MakeDebianBiosAssembly_1_TARGET) \
@@ -99 +100 @@
                 --output $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.asm
         $(QUIET)yasm -f bin -o $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.bin $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.asm
-        $(CMP) -l -- $< $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.bin
+        $(VBOX_VBOXCMP) $< $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.bin
         $(CP) --changed -- $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.asm $(PATH_ROOT)/src/VBox/Devices/PC/BIOS-new/VBoxBiosAlternative.asm
         $(REDIRECT) -C $(dir $(VBoxPcBios_1_TARGET)) -- \

trunk/src/bldprogs/Makefile.kmk

@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-BLDPROGS += bin2c biossums filesplitter
+BLDPROGS += bin2c biossums filesplitter VBoxCmp
 
 bin2c_TEMPLATE = VBOXBLDPROG
@@ -29 +29 @@
 filesplitter_TEMPLATE = VBOXBLDPROG
 filesplitter_SOURCES = filesplitter.cpp
+
+VBoxCmp_TEMPLATE = VBOXBLDPROG
+VBoxCmp_SOURCES = VBoxCmp.cpp
 
 if  !defined(VBOX_ONLY_ADDITIONS) \