Changeset 21077 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jun 30, 2009 3:19:12 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

49335

Message:

back out r49329, r49331, will start over

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (7 diffs)
• VBox/VBoxRTDeps.cpp (modified) (4 diffs)
• testcase/tstUtf8.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -51 +51 @@
  LIBRARIES += RuntimeR3
  DLLS += VBoxRT
+
+ # Temporary(?) hack.
+ VBOX_WITH_LIBXML2_IN_VBOXRT=
 
 else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_DOCS
@@ -162 +165 @@
 #
 RuntimeR3_TEMPLATE      = VBOXR3STATIC
-RuntimeR3_SDKS          = VBOX_LIBXML2
 RuntimeR3_SDKS.win      = WINPSDK W2K3DDK
 RuntimeR3_DEFS          = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX RT_NO_GIP
@@ -304 +306 @@
         r3/test.cpp \
         r3/testi.cpp \
-        r3/tcp.cpp \
-        r3/xml.cpp
+        r3/tcp.cpp
 
 #if1of ($(KBUILD_TARGET_ARCH),amd64 x86)
@@ -786 +787 @@
 #
 VBoxRT_TEMPLATE                = VBOXR3
+ifdef VBOX_WITH_LIBXML2_IN_VBOXRT
 VBoxRT_SDKS                    = VBOX_OPENSSL VBOX_LIBXML2 VBOX_LIBCURL
+endif
 VBoxRT_SDKS.win                = WINPSDK W2K3DDK VBOX_NTDLL
 ifeq ($(KBUILD_TARGET)$(VBOX_WITH_HARDENING),darwin)
@@ -796 +799 @@
         VBox/VBoxRTDeps.cpp \
         $(RuntimeR3_SOURCES)
+if defined(VBOX_WITH_LIBXML2_IN_VBOXRT)
 VBoxRT_SOURCES                += \
         common/misc/s3.cpp
+endif
 VBoxRT_SOURCES.$(KBUILD_TARGET) = $(RuntimeR3_SOURCES.$(KBUILD_TARGET))
 VBoxRT_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = $(RuntimeR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
@@ -813 +818 @@
         $(PATH_LIB)/VBox-kStuff$(VBOX_SUFF_LIB)
 endif
+ifdef VBOX_WITH_LIBXML2_IN_VBOXRT
+ ifndef SDK_VBOX_LIBXML2_LIBS
   VBoxRT_LIBS                 += \
         $(PATH_LIB)/VBox-libxml2$(VBOX_SUFF_LIB)
+ endif
+ ifndef SDK_VBOX_OPENSSL_LIBS
   VBoxRT_LIBS                 += \
         $(PATH_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB)
+ endif
+endif
 VBoxRT_LIBS.darwin             = \
         iconv
@@ -840 +851 @@
         $(PATH_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB)
 
+ifdef VBOX_WITH_LIBXML2_IN_VBOXRT
+VBox/VBoxRTDeps.cpp_DEFS = VBOX_WITH_LIBXML2_IN_VBOXRT
+endif
+
 if1of ($(DLLS), VBoxRT)
 $$(VBoxRT_0_OUTDIR)/VBoxRT.def: \
                 $(PATH_SUB_CURRENT)/r3/win/VBoxRT-$$(if-expr $$(KBUILD_TARGET_ARCH) == amd64,win64,win32).def \
-                $(PATH_SUB_CURRENT)/r3/win/$(if $(VBOX_OSE),VBoxRT-openssl-ose.def,VBoxRT-openssl.def)
+                $(if-expr defined(VBOX_WITH_LIBXML2_IN_VBOXRT),$(PATH_SUB_CURRENT)/r3/win/$(if $(VBOX_OSE),VBoxRT-openssl-ose.def,VBoxRT-openssl.def),)
         $(RM) -f -- $@
         $(REDIRECT) -wto $@ -- $(CAT_EXT) $^

trunk/src/VBox/Runtime/VBox/VBoxRTDeps.cpp

@@ -36 +36 @@
 #include <iprt/assert.h>
 #include <iprt/asm.h>
-
+#ifdef VBOX_WITH_LIBXML2_IN_VBOXRT
 # include <libxml/xmlmodule.h>
 # include <libxml/globals.h>
@@ -44 +44 @@
 # include <openssl/x509.h>
 # include <openssl/rsa.h>
+#endif
 
 
@@ -54 +55 @@
     (PFNRT)SUPR3PageAllocEx,
     (PFNRT)SUPSemEventCreate,
+#ifdef VBOX_WITH_LIBXML2_IN_VBOXRT
     (PFNRT)xmlModuleOpen,
     (PFNRT)MD5_Init,
@@ -63 +65 @@
     (PFNRT)i2d_X509,
     (PFNRT)RSA_generate_key,
+#endif
     (PFNRT)RTAssertShouldPanic,
     (PFNRT)ASMAtomicReadU64,

trunk/src/VBox/Runtime/testcase/tstUtf8.cpp

@@ -42 +42 @@
 #include <iprt/err.h>
 #include <iprt/test.h>
-#include <iprt/ministring_cpp.h>
 
 #include <stdlib.h> /** @todo use our random. */
@@ -927 +926 @@
 
 
-void testMinistring(RTTEST hTest)
-{
-    RTTestSub(hTest, "class ministring");
-
-#define CHECK(expr) \
-    do { \
-        if (!(expr)) \
-            RTTestFailed(hTest, "%d: FAILED %s", __LINE__, #expr); \
-    } while (0)
-
-#define CHECK_DUMP(expr, value) \
-    do { \
-        if (!(expr)) \
-            RTTestFailed(hTest, "%d: FAILED %s, got \"%s\"", __LINE__, #expr, value); \
-    } while (0)
-
-#define CHECK_DUMP_I(expr) \
-    do { \
-        if (!(expr)) \
-            RTTestFailed(hTest, "%d: FAILED %s, got \"%d\"", __LINE__, #expr, expr); \
-    } while (0)
-
-    ministring empty;
-    CHECK( (empty.length() == 0) );
-    CHECK( (empty.capacity() == 0) );
-
-    ministring sixbytes("12345");
-    CHECK( (sixbytes.length() == 5) );
-    CHECK( (sixbytes.capacity() == 6) );
-
-    sixbytes.append("678");
-    CHECK( (sixbytes.length() == 8) );
-    CHECK( (sixbytes.capacity() == 9) );
-
-    char *psz = sixbytes.mutableRaw();
-        // 12345678
-        //       ^
-        // 0123456
-    psz[6] = '\0';
-    sixbytes.jolt();
-    CHECK( (sixbytes.length() == 6) );
-    CHECK( (sixbytes.capacity() == 7) );
-
-    ministring morebytes("tobereplaced");
-    morebytes = "newstring ";
-    morebytes.append(sixbytes);
-
-    CHECK_DUMP( (morebytes == "newstring 123456"), morebytes.c_str() );
-
-    ministring third(morebytes);
-    third.reserve(100 * 1024);      // 100 KB
-    CHECK_DUMP( (third == "newstring 123456"), morebytes.c_str() );
-    CHECK( (third.capacity() == 100 * 1024) );
-    CHECK( (third.length() == morebytes.length()) );        // must not have changed
-
-    ministring copy1(morebytes);
-    ministring copy2 = morebytes;
-    CHECK( (copy1 == copy2) );
-
-    copy1 = NULL;
-    CHECK( (copy1.isNull()) );
-
-    copy1 = "";
-    CHECK( (copy1.isEmpty()) );
-
-    CHECK( (ministring("abc") < ministring("def")) );
-    CHECK( (ministring("abc") != ministring("def")) );
-    CHECK_DUMP_I( (ministring("def") > ministring("abc")) );
-
-    copy2.setNull();
-    for (int i = 0;
-         i < 100;
-         ++i)
-    {
-        copy2.reserve(50);      // should be ignored after 50 loops
-        copy2.append("1");
-    }
-    CHECK( (copy2.length() == 100) );
-
-#undef CHECK
-}
-
 int main()
 {
@@ -1029 +946 @@
     TstRTStrXCmp(hTest);
     testStrStr(hTest);
-
-    testMinistring(hTest);
-
     Benchmarks(hTest);