Changeset 69245 in vbox

Timestamp:

Oct 24, 2017 6:54:30 PM (7 years ago)

Author:

vboxsync

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

118560

Message:

Installer/win: Dropped VBOX_BRAND_WIN_AS_MENU and associated code. Can be fished out of history or a branch if we ever need it again.

File:

• trunk/src/VBox/Installer/win/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Installer/win/Makefile.kmk

@@ -38 +38 @@
  include $(PATH_SUB_CURRENT)/Stub/Makefile.kmk
  include $(PATH_SUB_CURRENT)/StubBld/Makefile.kmk
- ifdef VBOX_BRAND_WIN_AS_MENU
-  include $(PATH_SUB_CURRENT)/AutoStartMenu/Makefile.kmk
- endif
 endif
 
@@ -866 +863 @@
                 $(if-expr "$(KBUILD_TARGET_ARCH)" == "x86", \
                         $(PATH_STAGE_BIN)/VBoxBundleMachine.exe \
-                        $(if $(VBOX_BRAND_WIN_AS_MENU), $(PATH_STAGE_BIN)/AutoStartMenu.exe) \
                         $(if $(VBOX_WITH_COMBINED_PACKAGE), $(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL)),)
         $(RM) -Rf -- $(VBOX_PATH_PACK_BUNDLE_TMP)/
@@ -879 +875 @@
         $(CP) $(PATH_STAGE_BIN)/VBoxBundleMachine.exe     $(VBOX_PATH_PACK_BUNDLE_TMP)/
         $(CP) $(PATH_STAGE_BIN)/AutoStartMenu.exe         $(VBOX_PATH_PACK_BUNDLE_TMP)/
- ifdef VBOX_BRAND_WIN_AS_MENU
-        $(MKDIR) -p $(VBOX_PATH_PACK_BUNDLE_TMP)/Menu/Graphics/
-        $(CP) $(VBOX_BRAND_WIN_AS_CONTENT)          $(VBOX_PATH_PACK_BUNDLE_TMP)/
-        $(CP) $(VBOX_BRAND_WIN_AS_MENU_CONTENT)     $(VBOX_PATH_PACK_BUNDLE_TMP)/Menu/
-        $(CP) $(VBOX_BRAND_WIN_AS_MENU_CONTENT_GFX) $(VBOX_PATH_PACK_BUNDLE_TMP)/Menu/Graphics/
-  ifdef VBOX_WITH_COMBINED_PACKAGE
-        $(SED) -e 's/VBOXEXE/$(PACKAGE_NAME_MULTIARCH_FINAL)/g' \
-               --output $(VBOX_PATH_PACK_BUNDLE_TMP)/Menu/index.html \
-               $(VBOX_BRAND_WIN_AS_MENU)/index_combined.html
-  else
-        $(SED) -e 's/VBOX32EXE/$(VBOX_BRAND_WIN_INST_NAME.x86)/g' \
-               -e 's/VBOX64EXE/$(VBOX_BRAND_WIN_INST_NAME.amd64)/g' \
-               --output $(VBOX_PATH_PACK_BUNDLE_TMP)/Menu/index.html \
-               $(VBOX_BRAND_WIN_AS_MENU)/index.html
-  endif
- endif
 endif
 ifeq ($(KBUILD_TARGET_ARCH),amd64)