VirtualBox

Changeset 90038 in vbox for trunk


Ignore:
Timestamp:
Jul 5, 2021 7:29:55 PM (4 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
145532
Message:

debian/rules, rpm/rules: Change from CHM help file to QHelp. bugref:9831

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/debian/rules

    r84968 r90038  
    2929#                   either the subversion rev [if available] or the build date)
    3030#  NODOCS=1         don't build docs, use precompiled UserManual.pdf and
    31 #                   maybe VirtualBox.chm from $(vboxroot)/prebuild
     31#                   maybe VirtualBox.qch and VirtualBox.qhc from $(vboxroot)/prebuild
    3232#  NOMODS=1         don't build any module
    3333#  NOQT=1           don't build the Qt GUI
    … …  
    3838#  NOWEBSVC=1       don't build the webservice API, default for OSE
    3939#  STAGEDISO=<path> don't build the VBoxAdditions, use the precompiled .iso
    40 #  STAGEDCHM=<path> use VirtualBox*.chm from this directory
     40#  STAGEDQHELP=<path> use VirtualBox*.qch and VirtualBox*.qhc from this directory
    4141#  PKGDIR=<path>    where to store the final package(s)
    4242#
    4343# NODOCS will be set if UserManual*.pdf is placed in $(vboxroot)/prebuild.
    4444# STAGEDISO will be set if VBoxGuestAdditions.iso is placed there.
    45 # STAGEDCHM will be set if VirtualBox*.chm is placed there.
    46 # VirtualBox*.chm is used if it is provided, but never attempted to be built.
     45# STAGEDQHELP will be set if VirtualBox*.qch and VirtualBox*.qhc is placed there.
     46# VirtualBox*.qch and VirtualBox*.qhc are used if they are provided, but never
     47# attempted to be built.
    4748#
    4849# Wine will not be required if either NODOCS or STAGEDISO are set.
    … …  
    6667NODOCS   ?= $(if $(wildcard $(vboxroot)/prebuild/UserManual*.pdf),1,)
    6768STAGEDISO ?= $(if $(wildcard $(vboxroot)/prebuild/VBoxGuestAdditions.iso),$(vboxroot)/prebuild,)
    68 STAGEDCHM ?= $(if $(wildcard $(vboxroot)/prebuild/VirtualBox*.chm),$(vboxroot)/prebuild,)
     69STAGEDQHELP ?= $(if $(and $(wildcard $(vboxroot)/prebuild/VirtualBox*.qch),$(wildcard $(vboxroot)/prebuild/VirtualBox*.qhc)),$(vboxroot)/prebuild,)
    6970NOWINE   := $(if $(NODOCS),1,$(if $(STAGEDISO),1,$(ose)))
    7071PYTHON   := $(firstword $(shell which python) $(shell which python3))
    … …  
    102103             VBOX_DO_STRIP= \
    103104             VBOX_PATH_PACKAGE_DOCS="\"/usr/share/doc/$(verpkg)\"" \
    104              $(if $(STAGEDCHM),VBOX_WITH_DOCS_CHM=1,VBOX_WITH_KCHMVIEWER=) \
     105             $(if $(STAGEDQHELP),VBOX_WITH_DOCS_QHELP=1,) \
    105106             $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \
    106107             $(if $(NODOCS),VBOX_WITH_DOCS= ,) \
    … …  
    119120        . debian/env.sh && kmk -C $(vboxroot) $(bld_flags) $(if $(NOPARALLEL),-j1,) all
    120121        $(if $(NODOCS),cp $(vboxroot)/prebuild/UserManual*.pdf $(builddir)/bin,)
    121         $(if $(STAGEDCHM),cp $(STAGEDCHM)/VirtualBox*.chm $(builddir)/bin,)
     122        $(if $(STAGEDQHELP),cp $(STAGEDQHELP)/VirtualBox*.qch $(STAGEDQHELP)/VirtualBox*.qhc $(builddir)/bin,)
    122123        $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI32.fd $(builddir)/bin,)
    123124        $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI64.fd $(builddir)/bin,)
    … …  
    236237ifeq ($(ose),)
    237238        dh_installdocs \
    238             $(archdir)/UserManual*.pdf $(archdir)/VirtualBox*.chm \
    239             $(addprefix $(archdir)/, LICENSE)
    240         rm $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.chm \
     239            $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.qch VirtualBox*.qhc \
     240            LICENSE)
     241        rm $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.qch VirtualBox*.qhc \
    241242            LICENSE)
    242243        for i in rdesktop-vrdp.tar.gz additions/VBoxGuestAdditions.iso; do \
    … …  
    307308endif
    308309        $(firstword $(shell which dh_python2) $(shell which dh_python3))
    309         dh_compress -X.pdf -X.chm -X LICENSE -X.py
     310        dh_compress -X.pdf -X LICENSE -X.py
    310311        dh_fixperms
    311312        dh_makeshlibs

  • trunk/src/VBox/Installer/linux/debian/rules

    r89486 r90038  
    3434#                   either the subversion rev [if available] or the build date)
    3535#  NODOCS=1         don't build docs, use precompiled UserManual.pdf and
    36 #                   maybe VirtualBox.chm from $(vboxroot)/prebuild
     36#                   maybe VirtualBox.qch and VirtualBox.qhc from $(vboxroot)/prebuild
    3737#  NOMODS=1         don't build any module
    3838#  NOQT=1           don't build the Qt GUI
    … …  
    4444#  NOWEBSVC=1       don't build the webservice API, default for OSE
    4545#  STAGEDISO=<path> don't build the VBoxAdditions, use the precompiled .iso
    46 #  STAGEDCHM=<path> use VirtualBox*.chm from this directory
     46#  STAGEDQHELP=<path> use VirtualBox*.qch and VirtualBox*.qhc from this directory
    4747#  PKGDIR=<path>    where to store the final package(s)
    4848#
    4949# NODOCS will be set if UserManual*.pdf is placed in $(vboxroot)/prebuild.
    5050# STAGEDISO will be set if VBoxGuestAdditions.iso is placed there.
    51 # STAGEDCHM will be set if VirtualBox*.chm is placed there.
    52 # VirtualBox*.chm is used if it is provided, but never attempted to be built.
     51# STAGEDQHELP will be set if VirtualBox*.qch and VirtualBox*.qhc is placed there.
     52# VirtualBox*.qch and VirtualBox*.qhc are used if they are provided, but never
     53# attempted to be built.
    5354#
    5455# Wine will not be required if either NODOCS or STAGEDISO are set.
    … …  
    7576NODOCS   ?= $(if $(wildcard $(vboxroot)/prebuild/UserManual*.pdf),1,)
    7677STAGEDISO ?= $(if $(wildcard $(vboxroot)/prebuild/VBoxGuestAdditions.iso),$(vboxroot)/prebuild,)
    77 STAGEDCHM ?= $(if $(wildcard $(vboxroot)/prebuild/VirtualBox*.chm),$(vboxroot)/prebuild,)
     78STAGEDQHELP ?= $(if $(and $(wildcard $(vboxroot)/prebuild/VirtualBox*.qch),$(wildcard $(vboxroot)/prebuild/VirtualBox*.qhc)),$(vboxroot)/prebuild,)
    7879NOWINE   := $(if $(NODOCS),1,$(if $(STAGEDISO),1,$(ose)))
    7980PYTHON   := $(firstword $(shell which python) $(shell which python3))
    … …  
    124125             VBOX_DO_STRIP= \
    125126             VBOX_PATH_PACKAGE_DOCS="\"/usr/share/doc/$(verpkg)\"" \
    126              $(if $(STAGEDCHM),VBOX_WITH_DOCS_CHM=1,VBOX_WITH_KCHMVIEWER=) \
     127             $(if $(STAGEDQHELP),VBOX_WITH_DOCS_QHELP=1,) \
    127128             VBOX_PACKAGE_DIST=$(debdist) \
    128129             $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \
    … …  
    142143        . debian/env.sh && kmk -C $(vboxroot) $(bld_flags) $(if $(NOPARALLEL),-j1,) all
    143144        $(if $(NODOCS),cp $(vboxroot)/prebuild/UserManual*.pdf $(builddir)/bin,)
    144         $(if $(STAGEDCHM),cp $(STAGEDCHM)/VirtualBox*.chm $(builddir)/bin,)
     145        $(if $(STAGEDQHELP),cp $(STAGEDQHELP)/VirtualBox*.qch $(STAGEDQHELP)/VirtualBox*.qhc $(builddir)/bin,)
    145146        $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI32.fd $(builddir)/bin,)
    146147        $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI64.fd $(builddir)/bin,)
    … …  
    260261ifeq ($(ose),)
    261262        dh_installdocs \
    262             $(archdir)/UserManual*.pdf $(archdir)/VirtualBox*.chm \
    263             $(addprefix $(archdir)/, LICENSE)
    264         rm $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.chm \
     263            $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.qch VirtualBox*.qhc \
     264            LICENSE)
     265        rm $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.qch VirtualBox*.qhc \
    265266            LICENSE)
    266267        for i in rdesktop-vrdp.tar.gz additions/VBoxGuestAdditions.iso; do \
    … …  
    339340endif
    340341        $(firstword $(shell which dh_python2) $(shell which dh_python3))
    341         dh_compress -X.pdf -X.chm -X LICENSE -X.py
     342        dh_compress -X.pdf -X LICENSE -X.py
    342343        dh_fixperms
    343344        dh_makeshlibs

  • trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

    r89669 r90038  
    1919%define %OSE% 1
    2020%define %PYTHON% 1
    21 %define %CHM% 1
     21%define %QHELP% 1
    2222%define VBOXDOCDIR %{_defaultdocdir}/%NAME%
    2323%global __requires_exclude_from ^/usr/lib/virtualbox/VBoxPython.*$|^/usr/lib/python.*$|^.*\\.py$
    … …  
    192192%{!?is_ose: mv LICENSE $RPM_BUILD_ROOT%{VBOXDOCDIR}}
    193193mv UserManual*.pdf $RPM_BUILD_ROOT%{VBOXDOCDIR}
    194 %{?with_chm: mv VirtualBox*.chm $RPM_BUILD_ROOT%{VBOXDOCDIR}}
     194%{?with_qhelp: mv VirtualBox*.qch VirtualBox*.qhc $RPM_BUILD_ROOT%{VBOXDOCDIR}}
    195195install -m 755 -d $RPM_BUILD_ROOT/usr/lib/debug/usr/lib/virtualbox
    196196%if %{?rpm_suse:1}%{!?rpm_suse:0}

  • trunk/src/VBox/Installer/linux/rpm/rules

    r88293 r90038  
    2626#                   either the subversion rev [if available] or the build date)
    2727#  NODOCS=1         don't build docs, use precompiled UserManual.pdf and
    28 #                   maybe VirtualBox.chm from $(vboxroot)/prebuild
     28#                   maybe VirtualBox.qch and VirtualBox.qhc from $(vboxroot)/prebuild
    2929#  NOMODS=1         don't build any module
    3030#  NOQT=1           don't build the Qt GUI
    … …  
    3636#  NOWEBSVC=1       don't build the webservice API, default for OSE
    3737#  STAGEDISO=<path> don't build the VBoxAdditions, use the precompiled .iso
    38 #  STAGEDCHM=<path> use VirtualBox*.chm from this directory
     38#  STAGEDQHELP=<path> use VirtualBox*.qch and VirtualBox*.qhc from this directory
    3939#  PKGDIR=<path>    where to store the final package(s)
    4040#  svn_revision=xxx do not depend on subversion being available, but use this
    … …  
    4343# NODOCS will be set if UserManual*.pdf is placed in $(vboxroot)/prebuild.
    4444# STAGEDISO will be set if VBoxGuestAdditions.iso is placed there.
    45 # STAGEDCHM will be set if VirtualBox*.chm is placed there.
    46 # VirtualBox*.chm is used if it is provided, but never attempted to be built.
     45# STAGEDQHELP will be set if VirtualBox*.qch and VirtualBox*.qhc is placed there.
     46# VirtualBox*.qch and VirtualBox*.qhc are used if they are provided, but never
     47# attempted to be built.
    4748#
    4849# Wine will not be required if either NODOCS or STAGEDISO are set.
    … …  
    7172NODOCS   ?= $(if $(wildcard $(vboxroot)/prebuild/UserManual*.pdf),1,)
    7273STAGEDISO ?= $(if $(wildcard $(vboxroot)/prebuild/VBoxGuestAdditions.iso),$(vboxroot)/prebuild,)
    73 STAGEDCHM ?= $(if $(wildcard $(vboxroot)/prebuild/VirtualBox*.chm),$(vboxroot)/prebuild,)
     74STAGEDQHELP ?= $(if $(and $(wildcard $(vboxroot)/prebuild/VirtualBox*.qch),$(wildcard $(vboxroot)/prebuild/VirtualBox*.qhc)),$(vboxroot)/prebuild,)
    7475NOWINE   := $(if $(NODOCS),1,$(if $(STAGEDISO),1,$(ose)))
    7576
    … …  
    183184                $(wildcard /usr/bin/python2.6) $(wildcard /usr/bin/python2) $(wildcard /usr/bin/python))),) \
    184185             $(doc_dir) \
    185              $(if $(STAGEDCHM),VBOX_WITH_DOCS_CHM=1,VBOX_WITH_KCHMVIEWER=) \
     186             $(if $(STAGEDQHELP),VBOX_WITH_DOCS_QHELP=1,) \
    186187             VBOX_PACKAGE_DIST=$(rpmdist) \
    187188             $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \
    … …  
    199200        . $(bldbase)/env.sh && kmk -C $(vboxroot) $(bld_flags) $(if $(NOPARALLEL),-j1,) all
    200201        $(if $(NODOCS),cp $(vboxroot)/prebuild/UserManual*.pdf $(builddir)/bin,)
    201         $(if $(STAGEDCHM),cp $(STAGEDCHM)/VirtualBox*.chm $(builddir)/bin,)
     202        $(if $(STAGEDQHELP),cp $(STAGEDQHELP)/VirtualBox*.qch $(STAGEDQHELP)/VirtualBox*.qhc $(builddir)/bin,)
    202203        $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI32.fd $(builddir)/bin,)
    203204        $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI64.fd $(builddir)/bin,)
    … …  
    239240            -e 's|%OSE%|$(if $(ose),is_ose,not_ose)|g' \
    240241            -e 's|%SPEC%|$(rpmspec)|g' \
    241             -e 's|%CHM%|$(if $(STAGEDCHM),with_chm,without_chm)|g' \
     242            -e 's|%QHELP%|$(if $(STAGEDQHELP),with_qhelp,without_qhelp)|g' \
    242243            -e 's|%PYTHON%|$(if $(filter el5,$(rpmrel)),without_python,with_python)|g' \
    243244            -e 's|%MACROSPYTHON%|$(if $(wildcard /usr/lib/rpm/macros.d/macros.python3),,$(if $(wildcard /usr/lib/rpm/macros.python),%include /usr/lib/rpm/macros.python,))|g' \
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette