Changeset 77823 in vbox for trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Timestamp:

Mar 21, 2019 12:20:13 PM (6 years ago)

Author:

vboxsync

Message:

bs3kit/VBoxBs3ObjConverter: Drop IPRT dependency to reduce rebuild effort. The code only needed Assert() and RTSortShell, so local hacks for the former and include the source file for the latter. bugref:9344

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxBs3ObjConverter.cpp (modified) (1 diff)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk

@@ -38 +38 @@
 # 64-bit relocation conversion tool (used via the parent Config.kmk).
 BLDPROGS += VBoxBs3ObjConverter
-VBoxBs3ObjConverter_TEMPLATE = VBoxAdvBldProg
+VBoxBs3ObjConverter_TEMPLATE = VBoxBldProg
 VBoxBs3ObjConverter_DEFS     =  BS3KIT_BS3CLASS16CODE=$(BS3KIT_BS3CLASS16CODE)
-VBoxBs3ObjConverter_SOURCES  = $(VBOX_PATH_BS3KIT_SRC)/VBoxBs3ObjConverter.cpp
+VBoxBs3ObjConverter_SOURCES  = \
+        $(VBOX_PATH_BS3KIT_SRC)/VBoxBs3ObjConverter.cpp \
+       $(PATH_ROOT)/src/VBox/Runtime/common/sort/shellsort.cpp
 
 

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/VBoxBs3ObjConverter.cpp

@@ -74 +74 @@
  * We will do some massaging for fixup records when this is used.  */
 static bool     g_f16BitWatcomC = false;
+
+
+/*
+ * Minimal assertion support.
+ */
+
+RTDECL(bool) RTAssertShouldPanic(void)
+{
+    return true;
+}
+
+
+RTDECL(void) RTAssertMsg1Weak(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction)
+{
+    fprintf(stderr,
+            "VBoxBs3ObjConverter: assertion failed in %s (%s:%u)!\n"
+            "VBoxBs3ObjConverter: %s\n",
+            pszFunction, pszFile, uLine, pszExpr);
+}