← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to src/VBox/Installer/win/Makefile.kmk

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-17 23:23:09 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20111017232309-kzm6841lzk61ranj
Tags: 4.1.4-dfsg-1
http://bugs.debian.org/507188
http://bugs.debian.org/637349
https://launchpad.net/bugs/840668
* New upstream release.
  - Fixes missing icons when using pt_BR locale. (Closes: #507188)
  - Fixes guest additions download url. (Closes: #637349; LP: #840668)
* Refresh patches.
* Drop the vboxmouse x11 driver. The mouse integration is now completely
  handled by the kernel module.
* Restrict dh_pycentral to the virtualbox binary package.
* Merge changes from the Ubuntu package but use them only when built
  on Ubuntu:
  - Add an Apport hook.
  - Add vboxguest modalias to the package control field.
* Pass KBUILD_VERBOSE=2 to kmk.
* Add 36-fix-text-mode.patch to fix text mode when using the vboxvideo driver.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Installer/win/Makefile.kmk
1
 
# $Id: Makefile.kmk 38082 2011-07-20 14:26:24Z vboxsync $
 
1
# $Id: Makefile.kmk $
2
2
## @file
3
3
# Makefile for the Windows installer.
4
4
#
256
256
        #
257
257
  ifdef VBOX_WITH_DOCS_CHM
258
258
        $(APPEND) $@ '  <Shortcut Id="sc_StartMenu_ManualCHM_en_US" Directory="dir_StartMenuVBox" Name="!(loc.StartMenu_UserManual) (CHM, English)" Description="!(loc.StartMenu_UserManual)"' \
259
 
                     '            Target="[INSTALLDIR]\doc\VirtualBox.chm" WorkingDirectory="dir_Documents" Advertise="no"/>'
 
259
                     '            Target="[INSTALLDIR]\VirtualBox.chm" WorkingDirectory="dir_Documents" Advertise="no"/>'
260
260
        $(APPEND) -n $@ $(foreach lang,$(VBOX_MANUAL_ADD_LANGUAGES), \
261
261
                     '  <Shortcut Id="sc_StartMenu_ManualCHM_$(lang)" Directory="dir_StartMenuVBox" Name="$!(loc.StartMenu_UserManual) (CHM, $(VBOX_BRAND_$(lang)_LANG_NAME))"' \
262
 
                     '            Description="$!(loc.StartMenu_UserManual) ($(VBOX_BRAND_$(lang)_LANG_NAME))" Target="[INSTALLDIR]\doc\VirtualBox_$(lang).chm" WorkingDirectory="dir_Documents"/>')
 
262
                     '            Description="$!(loc.StartMenu_UserManual) ($(VBOX_BRAND_$(lang)_LANG_NAME))" Target="[INSTALLDIR]\VirtualBox_$(lang).chm" WorkingDirectory="dir_Documents"/>')
263
263
  endif
264
264
        $(APPEND) $@ '  <Shortcut Id="sc_StartMenu_ManualPDF_en_US" Directory="dir_StartMenuVBox" Name="!(loc.StartMenu_UserManual) (PDF, English)" Description="!(loc.StartMenu_UserManual)"' \
265
265
                     '            Target="[INSTALLDIR]\doc\UserManual.pdf" WorkingDirectory="dir_Documents" Advertise="no"/>'
288
288
                $(VBOX_WIN_INST_OUT_DIR)/Languages/Language_$(lang).wxl \
289
289
                $(VBOX_WIN_INST_OUT_DIR)/Languages/License_$(lang).wxl \
290
290
                $(PATH_STAGE_BIN)/VBoxInstallHelper.dll \
 
291
                $(VBOX_SVN_REV_KMK) \
291
292
                $(MAKEFILE_CURRENT) \
292
293
                | $$$$(dir $$$$@)
293
294
        $$(call MSG_L1,Linking installer $$@)
304
305
                        $(VBOX_PATH_WIX)/difxapp_x86.wixlib, \
305
306
                        $(VBOX_PATH_WIX)/difxapp_x64.wixlib)
306
307
        $(RM) -f $(VBOX_WIN_INST_OUT_DIR)/Languages/$(lang).mst
307
 
        $(call VBOX_SIGN_FILE_FN,$$@)
 
308
        $(call VBOX_SIGN_FILE_FN,$$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)))
308
309
endef
309
310
 
310
311
$(foreach lang,$(VBOX_INSTALLER_LANGUAGES), $(eval $(def_vbox_link_msi)))
549
550
                $(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi \
550
551
                $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_$(lang).msi) \
551
552
                $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES), $(VBOX_WIN_INST_OUT_DIR)/Languages/$(lang).mst) \
 
553
                $(VBOX_SVN_REV_KMK) \
552
554
                | $$(dir $$@)
553
555
        $(QUIET)$(RM) -f $(wildcard $(PATH_STAGE_BIN)/$(PACKAGE_BASE)-r*.msi)
554
556
        $(REDIRECT) -C $(@D) -- \
555
557
                wscript.exe $(VBOX_PATH_WISUMINFO) $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_en_US.msi $(VBOX_INS_PROD_LANG)
556
558
        $(CP) -f $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_en_US.msi $@
557
 
        $(call VBOX_SIGN_FILE_FN,$@)
 
559
        $(call VBOX_SIGN_FILE_FN,$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV))
558
560
 
559
561
 
560
562
if defined(VBOX_WITH_COMBINED_PACKAGE) && "$(KBUILD_TARGET_ARCH)" == "x86"
566
568
$(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL): \
567
569
                $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.x86) \
568
570
                $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.amd64)
569
 
                $(call MSG_L1,Building Windows combined package)
570
 
                $(call VBOX_SIGN_FILE_FN,$(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_MULTIARCH_COMMONCAB))
 
571
        $(call MSG_L1,Building Windows combined package)
 
572
        $(call VBOX_SIGN_FILE_FN,$(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_MULTIARCH_COMMONCAB))
571
573
        $(REDIRECT) -C $(@D) -- \
572
574
                VBoxStubBld -out $@ \
573
575
                        -target-x86 $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.x86) \