Changeset 34466 in vbox for trunk/src

Timestamp:

Nov 29, 2010 3:00:56 PM (14 years ago)

Author:

vboxsync

Message:

Made RTManifest a build program, this drags in IPRT and libcrypto into the build program run.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (6 diffs)
• tools/Makefile.kmk (modified) (1 diff)
• tools/RTManifest.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -62 +62 @@
 
  BLDPROGS += uniread
- LIBRARIES += RuntimeR3 RuntimeR0 RuntimeEFCPP RuntimeR3NoCRTGCC
+ LIBRARIES += RuntimeR3 RuntimeBldProg RuntimeR0 RuntimeEFCPP RuntimeR3NoCRTGCC
  LIBRARIES.win += RuntimeR0Stub
  ifdef VBOX_WITH_RAW_MODE
@@ -185 +185 @@
 #
 RuntimeR3_TEMPLATE      = VBoxR3Static
-RuntimeR3_SDKS          = VBOX_LIBXML2 VBOX_BOOST
+RuntimeR3_SDKS          = VBOX_LIBXML2 VBOX_OPENSSL VBOX_BOOST ## @todo why is BOOST and XML2 here? r3/xml.cpp is not in this lib...
 RuntimeR3_SDKS.win      = WINPSDK $(VBOX_WINDDK)
 RuntimeR3_DEFS          = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX RT_NO_GIP
@@ -234 +234 @@
         common/checksum/ipv4.cpp \
         common/checksum/ipv6.cpp \
+        common/checksum/manifest.cpp \
+        common/checksum/manifest2.cpp \
+        common/checksum/manifest3.cpp \
+        common/checksum/manifest-file.cpp \
+        common/checksum/RTSha1Digest.cpp \
+        common/checksum/sha1.cpp \
+        common/checksum/sha1str.cpp \
+        common/checksum/sha256.cpp \
+        common/checksum/sha256str.cpp \
+        common/checksum/sha512.cpp \
+        common/checksum/sha512str.cpp \
         common/dbg/dbg.cpp \
         common/dbg/dbgas.cpp \
@@ -913 +924 @@
 
 #
+# RuntimeBldProg - Static Runtime for build programs.
+#
+# Note! This is a bit of hacky since kBuild doesn't support building libraries
+#       for build programs.
+#
+RuntimeBldProg_TEMPLATE         := VBOXBLDPROG
+RuntimeBldProg_EXTENDS          := RuntimeR3
+RuntimeBldProg_BLD_TRG          := $(KBUILD_HOST)
+RuntimeBldProg_BLD_TRG_ARCH     := $(KBUILD_HOST_ARCH)
+RuntimeBldProg_BLD_TRG_CPU      := $(KBUILD_HOST_CPU)
+
+
+#
 # RuntimeGuestR3 - Guest Additions Runtime (static/exe).
 # (The KBUILD_HOST inheritance here is for l4 cross building the linux
@@ -1108 +1132 @@
 VBoxRT_SOURCES                 = \
         VBox/VBoxRTDeps.cpp \
-        $(filter-out common/checksum/crc32.cpp, $(RuntimeR3_SOURCES))
-VBoxRT_SOURCES                += \
         r3/xml.cpp \
-        common/checksum/RTSha1Digest.cpp \
-        common/checksum/crc32-zlib.cpp \
-        common/checksum/manifest.cpp \
-        common/checksum/manifest2.cpp \
-        common/checksum/manifest3.cpp \
-        common/checksum/manifest-file.cpp \
-        common/checksum/sha1.cpp \
-        common/checksum/sha1str.cpp \
-        common/checksum/sha256.cpp \
-        common/checksum/sha256str.cpp \
-        common/checksum/sha512.cpp \
-        common/checksum/sha512str.cpp
+        $(filter-out common/checksum/crc32.cpp, $(RuntimeR3_SOURCES)) \
+        common/checksum/crc32-zlib.cpp
 ifdef VBOX_WITH_LIBCURL
  VBoxRT_SOURCES               += common/misc/s3.cpp
@@ -1913 +1925 @@
  $(lib)_common/err/errmsgxpcom.cpp_DEPS = $(IPRT_OUT_DIR)/errmsgvboxcomdata.h
 endef
-$(foreach lib,RuntimeR3 VBoxRT RuntimeLnxHostR3,$(eval $(def_errmsgwin_deps)))
+$(foreach lib,RuntimeR3 RuntimeBldProg VBoxRT RuntimeLnxHostR3,$(eval $(def_errmsgwin_deps)))
 
 

trunk/src/VBox/Runtime/tools/Makefile.kmk

@@ -33 +33 @@
 RTManifest_SOURCES = RTManifest.cpp
 
+BLDPROGS += bldRTManifest
+bldRTManifest_TEMPLATE = VBoxAdvBldProg
+bldRTManifest_SOURCES  = RTManifest.cpp
+
 # RTLdrFlt is similar to c++filt, except that it's for VMMR0.r0 stacks.
 PROGRAMS += RTLdrFlt

trunk/src/VBox/Runtime/tools/RTManifest.cpp

@@ -38 +38 @@
 #include <iprt/message.h>
 #include <iprt/path.h>
+#include <iprt/process.h>
 #include <iprt/stream.h>
 #include <iprt/string.h>
@@ -361 +362 @@
 
             case 'h':
-                RTMsgInfo("Usage: %s [--manifest <file>] [--chdir <dir>] [--attribute <attrib-name> [..]] <files>\n"
-                          "   or  %s --verify [--manifest <file>] [--chdir <dir>]\n"
-                          "\n"
-                          "attrib-name: size, md5, sha1, sha256 or sha512\n"
-                          , argv[0], argv[0]);
+                RTPrintf("Usage: %s [--manifest <file>] [--chdir <dir>] [--attribute <attrib-name> [..]] <files>\n"
+                         "   or  %s --verify [--manifest <file>] [--chdir <dir>]\n"
+                         "\n"
+                         "attrib-name: size, md5, sha1, sha256 or sha512\n"
+                         , RTProcShortName(), RTProcShortName());
                 return RTEXITCODE_SUCCESS;