Changeset 99701 in vbox

Timestamp:

May 9, 2023 1:02:23 PM (21 months ago)

Author:

vboxsync

Message:

*kmk: VBOX_ONLY_SDK_ON_WINDOWS changes and cleanups. bugref:10442

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (5 diffs)
• src/Makefile.kmk (modified) (1 diff)
• src/VBox/Installer/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/Makefile.kmk (modified) (5 diffs)
• src/VBox/Main/cbinding/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -2379 +2379 @@
 
 # Define the macro for win path conversion.
-ifndef VBOX_ONLY_SDK
+if !defined(VBOX_ONLY_SDK) || defined(VBOX_ONLY_SDK_ON_WINDOWS)
  VBOX_FN_MAKE_WIN_PATH = "$(quote-sh-dq $(subst /,\,$(requote unq, $(1))))"
 else
  # Z: is always FS root for Wine.
  VBOX_FN_MAKE_WIN_PATH  = $(subst /,\\,$(patsubst /%,Z:/%,$(1)))
-endif #!VBOX_ONLY_SDK
+endif
 
 # The kprofile build automagically links with kProfile.

trunk/Makefile.kmk

@@ -99 +99 @@
  # and .linux property suffixes.
  #
- INSTALLS += InstallExternalLibs
+ if !defined(VBOX_ONLY_SDK_ON_WINDOWS)
+  INSTALLS += InstallExternalLibs
+ endif
 
  InstallExternalLibs_INST = $(INST_BIN)
@@ -234 +236 @@
    VBOX_QT_PATH_LIB = $(PATH_SDK_QT5_LIB)
   endif
-  ifdef VBOX_WITH_QTGUI
+  if defined(VBOX_WITH_QTGUI) && !defined(VBOX_ONLY_SDK)
    INSTALLS += qt5-bin
   endif
@@ -290 +292 @@
    include $(KBUILD_PATH)/units/qt5.kmk
    ifeq ($(KBUILD_TARGET),win)
-    ifdef VBOX_WITH_QTGUI
+    if defined(VBOX_WITH_QTGUI) && !defined(VBOX_ONLY_SDK)
      INSTALLS += qt5-bin
     endif
@@ -308 +310 @@
     endif # VBOX_WITH_QT_PDBS
    else # x11
-    ifdef VBOX_WITH_QTGUI
+    if defined(VBOX_WITH_QTGUI) && !defined(VBOX_ONLY_SDK)
      INSTALLS += qt5-bin
     endif
@@ -2137 +2139 @@
 .NOTPARALLEL: sdk sdk-fetch
 sdk:
-        + $(KMK) VBOX_ONLY_SDK=1 \
+        + $(KMK) VBOX_ONLY_SDK=1 $(if-expr "$(KBUILD_HOST)" == "win",VBOX_ONLY_SDK_ON_WINDOWS=1,) \
                 pass_bldprogs pass_others pass_installs pass_packing
 
 sdk-fetch:
-        + $(KMK) VBOX_ONLY_SDK=1 -C tools
+        + $(KMK) VBOX_ONLY_SDK=1 $(if-expr "$(KBUILD_HOST)" == "win",VBOX_ONLY_SDK_ON_WINDOWS=1,) \
+                -C tools
 
 

trunk/src/Makefile.kmk

@@ -31 +31 @@
 include $(PATH_SUB_CURRENT)/bldprogs/Makefile.kmk
 include $(PATH_SUB_CURRENT)/VBox/Makefile.kmk
-include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
+if !defined(VBOX_ONLY_SDK_ON_WINDOWS) || "$(KBUILD_TARGET)" != "win"
+ include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
+endif
 ifndef VBOX_ONLY_BUILD
  # Normal build.

trunk/src/VBox/Installer/Makefile.kmk

@@ -73 +73 @@
                 $(VBOX_VERSION_STAMP)
         $(call MSG_L1,Making SDK delivery $@)
-        $(QUIET)$(REDIRECT) $(if $(QUIET),-wo /dev/null,) -C $(PATH_STAGE_BIN) -- $(VBOX_ZIP) -r9 $@ sdk
+        $(QUIET)$(REDIRECT) $(if $(QUIET),-wo /dev/null,) -C $(PATH_STAGE_BIN) -- $(VBOX_ZIP) -r9 "$@" sdk
 endif
 

trunk/src/VBox/Main/Makefile.kmk

@@ -45 +45 @@
  include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
  include $(PATH_SUB_CURRENT)/cbinding/Makefile.kmk
- include $(PATH_SUB_CURRENT)/UnattendedTemplates/Makefile.kmk
  ifndef VBOX_ONLY_SDK
+  include $(PATH_SUB_CURRENT)/UnattendedTemplates/Makefile.kmk
   include $(PATH_SUB_CURRENT)/src-helper-apps/OpenGLTest/Makefile.kmk
- endif
- if defined(VBOX_WITH_OPEN_WATCOM) && defined(VBOX_WITH_UNATTENDED)
-  include $(PATH_SUB_CURRENT)/src-helper-apps/os2/Makefile.kmk
- endif
- if defined(VBOX_WITH_DEVMAPPER) && !defined(VBOX_ONLY_SDK)
-  include $(PATH_SUB_CURRENT)/src-helper-apps/VBoxVolInfo/Makefile.kmk
+  if defined(VBOX_WITH_OPEN_WATCOM) && defined(VBOX_WITH_UNATTENDED)
+   include $(PATH_SUB_CURRENT)/src-helper-apps/os2/Makefile.kmk
+  endif
+  ifdef VBOX_WITH_DEVMAPPER
+   include $(PATH_SUB_CURRENT)/src-helper-apps/VBoxVolInfo/Makefile.kmk
+  endif
  endif
 endif
@@ -221 +221 @@
 
 # The MS COM specific stuff.
-if defined(VBOX_ONLY_SDK) || "$(KBUILD_TARGET)" == "win"
+if "$(KBUILD_TARGET)" == "win" || (defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_SDK_ON_WINDOWS))
  OTHERS         += \
         $(VBOX_IDL_FILE.MSCOM)
@@ -1479 +1479 @@
 
 
-if defined(VBOX_WITH_MIDL_PROXY_STUB) && "$(KBUILD_TARGET)" == "win" && !defined(VBOX_ONLY_EXTPACKS)
+if defined(VBOX_WITH_MIDL_PROXY_STUB) && "$(KBUILD_TARGET)" == "win" && !defined(VBOX_ONLY_EXTPACKS) && !defined(VBOX_ONLY_SDK)
  #
  # Experimental COM proxy + stub DLL w/ automatic registration updating.
@@ -1659 +1659 @@
         $(QUIET)$(VBOX_XSLTPROC) -o $@ $< $(VBOX_XIDL_FILE)
 
-if defined(VBOX_ONLY_SDK) || "$(KBUILD_TARGET)" == "win"
+if "$(KBUILD_TARGET)" == "win" || (defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_SDK_ON_WINDOWS))
 
  # Note! Because we've got a different proxy stub DLL for pre windows 7 64-bit hosts, we target windows 7 for AMD64.
@@ -1731 +1731 @@
  endif
 
-endif # defined(VBOX_ONLY_SDK) || "$(KBUILD_TARGET)" == "win"
+endif # "$(KBUILD_TARGET)" == "win" || (defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_SDK_ON_WINDOWS))
 
 #

trunk/src/VBox/Main/cbinding/Makefile.kmk

@@ -82 +82 @@
         $(QUIET)$(VBOX_XSLTPROC) -o $@ $^
 
-if !defined(VBOX_ONLY_SDK)
+ifndef VBOX_ONLY_SDK
 
  #
@@ -182 +182 @@
  endif
 
-endif # ! VBOX_ONLY_SDK
+endif # !VBOX_ONLY_SDK
 
 # generate rules.