- Timestamp:
- Oct 19, 2021 6:01:00 PM (3 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
- 1 copied
-
debian/rules (modified) (5 diffs)
-
src/VBox/Installer/common/virtualbox.desktop.in (modified) (1 diff)
-
src/VBox/Installer/common/virtualboxvm.desktop.in (copied) (copied from trunk/src/VBox/Installer/common/virtualbox.desktop.in ) (2 diffs)
-
src/VBox/Installer/freebsd/Makefile.kmk (modified) (2 diffs)
-
src/VBox/Installer/freebsd/pkg_plist (modified) (1 diff)
-
src/VBox/Installer/linux/Makefile.kmk (modified) (4 diffs)
-
src/VBox/Installer/linux/debian/rules (modified) (5 diffs)
-
src/VBox/Installer/linux/deffiles (modified) (1 diff)
-
src/VBox/Installer/linux/install.sh (modified) (1 diff)
-
src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec (modified) (1 diff)
-
src/VBox/Installer/linux/uninstall.sh (modified) (1 diff)
-
src/VBox/Installer/solaris/Makefile.kmk (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/debian/rules
r91701 r91846 157 157 for d in $(wildcard /lib/modules/*); do \ 158 158 if [ -L $$d/build ]; then \ 159 160 161 162 163 164 165 166 167 168 169 170 159 make -C $(builddir)/bin/src/vboxdrv KERN_VER=$$(basename $$d) clean && \ 160 make -C $(builddir)/bin/src/vboxdrv KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all; \ 161 make -C $(builddir)/bin/src/vboxnetflt KERN_VER=$$(basename $$d) clean && \ 162 (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetflt || true) && \ 163 make -C $(builddir)/bin/src/vboxnetflt KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxnetflt/Module.symvers all; \ 164 make -C $(builddir)/bin/src/vboxnetadp KERN_VER=$$(basename $$d) clean && \ 165 (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetadp || true) && \ 166 make -C $(builddir)/bin/src/vboxnetadp KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxnetadp/Module.symvers all; \ 167 [ -d $(builddir)/bin/src/vboxpci ] && make -C $(builddir)/bin/src/vboxpci KERN_VER=$$(basename $$d) clean && \ 168 (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxpci || true) && \ 169 make -C $(builddir)/bin/src/vboxpci KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxpci/Module.symvers all; \ 170 true; \ 171 171 fi; \ 172 172 done … … 209 209 $(if $(NOQT),,mv $(archdir)/virtualbox.desktop \ 210 210 $(prefix)/usr/share/applications/virtualbox.desktop) 211 $(if $(NOQT),,mv $(archdir)/virtualboxvm.desktop \ 212 $(prefix)/usr/share/applications/virtualboxvm.desktop) 211 213 install -d -g 0 -o 0 $(prefix)/usr/share/pixmaps 212 214 $(if $(NOQT),,install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor) … … 216 218 $(if $(NOQT),,cd $(archdir)/icons; for i in *; do \ 217 219 for j in $$i/virtualbox.*; do \ 218 219 220 221 222 223 220 if [ -f $$j ]; then \ 221 if [ ! -d $(prefix)/usr/share/icons/hicolor/$$i/apps ]; then \ 222 install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/apps; \ 223 fi; \ 224 mv $$j $(prefix)/usr/share/icons/hicolor/$$i/apps; \ 225 fi; \ 224 226 done; \ 225 227 install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/mimetypes; \ … … 246 248 $(if $(NOMODS),,for d in $(moddir)/*; do \ 247 249 if [ -f $$d/vboxdrv.ko -a -f $$d/vboxnetflt.ko -a -f $$d/vboxnetadp.ko ]; then \ 248 250 install -D -g 0 -o 0 -m 0644 \ 249 251 $$d/vboxdrv.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxdrv.ko; \ 250 252 install -D -g 0 -o 0 -m 0644 \ 251 253 $$d/vboxnetflt.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxnetflt.ko; \ 252 254 install -D -g 0 -o 0 -m 0644 \ 253 255 $$d/vboxnetadp.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxnetadp.ko; \ 254 255 256 257 256 if [ -f $$d/vboxpci.ko ]; then \ 257 install -D -g 0 -o 0 -m 0644 \ 258 $$d/vboxpci.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxpci.ko; \ 259 fi \ 258 260 fi \ 259 261 done) … … 265 267 if [ -f $(prefix)/usr/lib/$(package)/libQt5CoreVBox.so.5 ]; then \ 266 268 $(vboxroot)/tools/linux.$(chrarch)/bin/chrpath \ 267 268 269 270 271 272 273 269 --keepgoing --replace /usr/lib/$(package) \ 270 $(prefix)/usr/lib/$(package)/*.so.5 \ 271 $(prefix)/usr/lib/$(package)/plugins/platforms/*.so; \ 272 $(prefix)/usr/lib/$(package)/plugins/platformthemes/*.so; \ 273 $(prefix)/usr/lib/$(package)/plugins/sqldrivers/*.so; \ 274 $(prefix)/usr/lib/$(package)/plugins/styles/*.so; \ 275 $(prefix)/usr/lib/$(package)/plugins/xcbglintegrations/*.so; \ 274 276 echo "[Paths]" > $(prefix)/usr/lib/$(package)/qt.conf; \ 275 277 echo "Plugins = /usr/lib/$(package)/plugins" >> $(prefix)/usr/lib/$(package)/qt.conf; \ -
trunk/src/VBox/Installer/common/virtualbox.desktop.in
r69839 r91846 3 3 Version=1.0 4 4 Name=@VBOX_PRODUCT@ 5 GenericName=Virtual Machine6 GenericName[de]=Virtu elle Maschine5 GenericName=Virtualization Software 6 GenericName[de]=Virtualisierung Software 7 7 GenericName[ru]=Виртуальная машина 8 8 Type=Application -
trunk/src/VBox/Installer/common/virtualboxvm.desktop.in
r91833 r91846 7 7 GenericName[ru]=Виртуальная машина 8 8 Type=Application 9 Exec=VirtualBox %U10 TryExec=VirtualBox 9 Exec=VirtualBoxVM %U 10 TryExec=VirtualBoxVM 11 11 Keywords=virtualization; 12 12 Keywords[de]=Virtualisierung; … … 17 17 Categories=Emulator;System; 18 18 Actions=Manager; 19 StartupWMClass=VirtualBox Manager 20 Comment=Run several virtual systems on a single host computer 21 Comment[de]=Mehrere virtuelle Maschinen auf einem einzigen Rechner ausführen 22 Comment[it]=Esegui più macchine virtuali su un singolo computer 23 Comment[ko]=가상 머신 24 Comment[pl]=Uruchamianie wielu systemów wirtualnych na jednym komputerze gospodarza 25 Comment[ru]=Запуск нескольких виртуальных машин на одном компьютере 26 Comment[sv]=Kör flera virtuella system på en enda värddator 19 StartupWMClass=VirtualBox Machine 20 Comment=Run the virtual machine 27 21 28 22 [Desktop Action Manager] 29 23 Exec=VirtualBox 30 Name=Open VM Manager 31 Name[de]=VM Manager öffnen 24 Name=Run Virtual Machine -
trunk/src/VBox/Installer/freebsd/Makefile.kmk
r89669 r91846 60 60 $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_32px.png=>VBox.png \ 61 61 $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \ 62 $(if $(VBOX_WITH_QTGUI),$(freebsd-misc_0_OUTDIR)/virtualbox.desktop,) 62 $(if $(VBOX_WITH_QTGUI),$(freebsd-misc_0_OUTDIR)/virtualbox.desktop,) \ 63 $(if $(VBOX_WITH_QTGUI),$(freebsd-misc_0_OUTDIR)/virtualboxvm.desktop,) 63 64 freebsd-misc_CLEAN = $(freebsd-misc_0_OUTDIR)/virtualbox.desktop 65 freebsd-misc_CLEAN = $(freebsd-misc_0_OUTDIR)/virtualboxvm.desktop 64 66 65 67 $$(PATH_freebsd-misc)/virtualbox.desktop: $(PATH_SUB_CURRENT)/virtualbox.desktop $(VBOX_VERSION_STAMP) | $$(dir $$@) 68 $(call MSG_GENERATE,,$@,$<) 69 $$(PATH_freebsd-misc)/virtualboxvm.desktop: $(PATH_SUB_CURRENT)/virtualboxvm.desktop $(VBOX_VERSION_STAMP) | $$(dir $$@) 66 70 $(call MSG_GENERATE,,$@,$<) 67 71 ifdef VBOX_PATH_PACKAGE_DOCS … … 153 157 $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm) 154 158 VBOX_FBSD_DESKTOP_FILE = \ 155 virtualbox.desktop 159 virtualbox.desktop \ 160 virtualboxvm.desktop 156 161 VBOX_FBSD_ICON_FILE = \ 157 162 VBox.png -
trunk/src/VBox/Installer/freebsd/pkg_plist
r84450 r91846 89 89 lib/virtualbox/nls/VirtualBox_cs.qm 90 90 share/applications/virtualbox.desktop 91 share/applications/virtualboxvm.desktop 91 92 share/pixmaps/VBox.png 92 -
trunk/src/VBox/Installer/linux/Makefile.kmk
r90320 r91846 105 105 $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \ 106 106 $(linux-misc_0_OUTDIR)/generated.sh=>scripts/generated.sh \ 107 $(if $(VBOX_WITH_QTGUI),$(linux-misc_0_OUTDIR)/virtualbox.desktop,) 107 $(if $(VBOX_WITH_QTGUI),$(linux-misc_0_OUTDIR)/virtualbox.desktop,) \ 108 $(if $(VBOX_WITH_QTGUI),$(linux-misc_0_OUTDIR)/virtualboxvm.desktop,) 108 109 ifeq ($(KBUILD_TYPE),asan) 109 110 linux-misc_SOURCES += $(foreach lib,$(VBOX_GCC_SANITIZER_SO_FILES) \ … … 112 113 linux-misc_CLEAN = \ 113 114 $(linux-misc_0_OUTDIR)/generated.sh \ 114 $(linux-misc_0_OUTDIR)/virtualbox.desktop 115 $(linux-misc_0_OUTDIR)/virtualbox.desktop \ 116 $(linux-misc_0_OUTDIR)/virtualboxvm.desktop 115 117 116 118 $$(linux-misc_0_OUTDIR)/generated.sh: $(VBOX_VERSION_STAMP) $(VBOX_LNX_INST_DEP_ON_MAKEFILE) | $$(dir $$@) … … 123 125 124 126 $$(linux-misc_0_OUTDIR)/virtualbox.desktop: $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.desktop.in $(VBOX_VERSION_STAMP) | $$(dir $$@) 127 $(call MSG_GENERATE,,$@,$<) 128 $(QUIET)$(SED) -e "s+@VBOX_DOC_PATH@+$(VBOX_LNX_APP_DOCS)+" \ 129 -e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \ 130 --output $@ $< 131 $$(linux-misc_0_OUTDIR)/virtualboxvm.desktop: $(VBOX_PATH_INST_COMMON_SRC)/virtualboxvm.desktop.in $(VBOX_VERSION_STAMP) | $$(dir $$@) 125 132 $(call MSG_GENERATE,,$@,$<) 126 133 $(QUIET)$(SED) -e "s+@VBOX_DOC_PATH@+$(VBOX_LNX_APP_DOCS)+" \ … … 254 261 VBOX_LNX_NO_STRIP += \ 255 262 virtualbox.desktop \ 263 virtualboxvm.desktop \ 256 264 virtualbox.xml \ 257 265 $(VBOX_LICENSE_FILES) \ -
trunk/src/VBox/Installer/linux/debian/rules
r91701 r91846 181 181 for d in $(wildcard /lib/modules/*); do \ 182 182 if [ -L $$d/build ]; then \ 183 184 185 186 187 188 189 190 191 192 193 194 183 make -C $(builddir)/bin/src/vboxdrv KERN_VER=$$(basename $$d) clean && \ 184 make -C $(builddir)/bin/src/vboxdrv KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all; \ 185 make -C $(builddir)/bin/src/vboxnetflt KERN_VER=$$(basename $$d) clean && \ 186 (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetflt || true) && \ 187 make -C $(builddir)/bin/src/vboxnetflt KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxnetflt/Module.symvers all; \ 188 make -C $(builddir)/bin/src/vboxnetadp KERN_VER=$$(basename $$d) clean && \ 189 (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetadp || true) && \ 190 make -C $(builddir)/bin/src/vboxnetadp KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxnetadp/Module.symvers all; \ 191 [ -d $(builddir)/bin/src/vboxpci ] && make -C $(builddir)/bin/src/vboxpci KERN_VER=$$(basename $$d) clean && \ 192 (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxpci || true) && \ 193 make -C $(builddir)/bin/src/vboxpci KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxpci/Module.symvers all; \ 194 true; \ 195 195 fi; \ 196 196 done … … 233 233 $(if $(NOQT),,mv $(archdir)/virtualbox.desktop \ 234 234 $(prefix)/usr/share/applications/virtualbox.desktop) 235 $(if $(NOQT),,mv $(archdir)/virtualboxvm.desktop \ 236 $(prefix)/usr/share/applications/virtualboxvm.desktop) 235 237 install -d -g 0 -o 0 $(prefix)/usr/share/pixmaps 236 238 $(if $(NOQT),,install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor) … … 240 242 $(if $(NOQT),,cd $(archdir)/icons; for i in *; do \ 241 243 for j in $$i/virtualbox.*; do \ 242 243 244 245 246 247 244 if [ -f $$j ]; then \ 245 if [ ! -d $(prefix)/usr/share/icons/hicolor/$$i/apps ]; then \ 246 install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/apps; \ 247 fi; \ 248 mv $$j $(prefix)/usr/share/icons/hicolor/$$i/apps; \ 249 fi; \ 248 250 done; \ 249 251 install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/mimetypes; \ … … 270 272 $(if $(NOMODS),,for d in $(moddir)/*; do \ 271 273 if [ -f $$d/vboxdrv.ko -a -f $$d/vboxnetflt.ko -a -f $$d/vboxnetadp.ko ]; then \ 272 274 install -D -g 0 -o 0 -m 0644 \ 273 275 $$d/vboxdrv.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxdrv.ko; \ 274 276 install -D -g 0 -o 0 -m 0644 \ 275 277 $$d/vboxnetflt.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxnetflt.ko; \ 276 278 install -D -g 0 -o 0 -m 0644 \ 277 279 $$d/vboxnetadp.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxnetadp.ko; \ 278 279 280 281 280 if [ -f $$d/vboxpci.ko ]; then \ 281 install -D -g 0 -o 0 -m 0644 \ 282 $$d/vboxpci.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxpci.ko; \ 283 fi \ 282 284 fi \ 283 285 done) … … 289 291 if [ -f $(prefix)/usr/lib/$(package)/libQt5CoreVBox.so.5 ]; then \ 290 292 $(vboxroot)/tools/linux.$(chrarch)/bin/chrpath \ 291 292 293 294 295 296 297 293 --keepgoing --replace /usr/lib/$(package) \ 294 $(prefix)/usr/lib/$(package)/*.so.5 \ 295 $(prefix)/usr/lib/$(package)/plugins/platforms/*.so; \ 296 $(prefix)/usr/lib/$(package)/plugins/platformthemes/*.so; \ 297 $(prefix)/usr/lib/$(package)/plugins/sqldrivers/*.so; \ 298 $(prefix)/usr/lib/$(package)/plugins/styles/*.so; \ 299 $(prefix)/usr/lib/$(package)/plugins/xcbglintegrations/*.so; \ 298 300 echo "[Paths]" > $(prefix)/usr/lib/$(package)/qt.conf; \ 299 301 echo "Plugins = /usr/lib/$(package)/plugins" >> $(prefix)/usr/lib/$(package)/qt.conf; \ -
trunk/src/VBox/Installer/linux/deffiles
r90404 r91846 103 103 VBox.png \ 104 104 virtualbox.desktop \ 105 virtualboxvm.desktop \ 105 106 src/ \ 106 107 src/include/ \ -
trunk/src/VBox/Installer/linux/install.sh
r89672 r91846 339 339 ln -sf $INSTALLATION_DIR/icons/128x128/virtualbox.png /usr/share/pixmaps/virtualbox.png 340 340 ln -sf $INSTALLATION_DIR/virtualbox.desktop /usr/share/applications/virtualbox.desktop 341 ln -sf $INSTALLATION_DIR/virtualboxvm.desktop /usr/share/applications/virtualboxvm.desktop 341 342 ln -sf $INSTALLATION_DIR/virtualbox.xml /usr/share/mime/packages/virtualbox.xml 342 343 ln -sf $INSTALLATION_DIR/rdesktop-vrdp /usr/bin/rdesktop-vrdp -
trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
r90369 r91846 197 197 ln -s /usr/share/virtualbox/src/vboxhost $RPM_BUILD_ROOT/usr/src/vboxhost-%VER% 198 198 mv virtualbox.desktop $RPM_BUILD_ROOT/usr/share/applications/virtualbox.desktop 199 mv virtualboxvm.desktop $RPM_BUILD_ROOT/usr/share/applications/virtualboxvm.desktop 199 200 mv VBox.png $RPM_BUILD_ROOT/usr/share/pixmaps/VBox.png 200 201 %{!?is_ose: mv LICENSE $RPM_BUILD_ROOT%{VBOXDOCDIR}} -
trunk/src/VBox/Installer/linux/uninstall.sh
r90404 r91846 89 89 /usr/share/pixmaps/virtualbox.png \ 90 90 /usr/share/applications/virtualbox.desktop \ 91 /usr/share/applications/virtualboxvm.desktop \ 91 92 /usr/share/mime/packages/virtualbox.xml \ 92 93 /usr/bin/rdesktop-vrdp \ -
trunk/src/VBox/Installer/solaris/Makefile.kmk
r89825 r91846 545 545 \ 546 546 $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.desktop.in \ 547 $(VBOX_PATH_INST_COMMON_SRC)/virtualboxvm.desktop.in \ 547 548 $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.xml \ 548 549 $(VBOX_PATH_SOL_INST_SRC)/virtualbox.applications.in \ … … 645 646 --output $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/applications/virtualbox.desktop \ 646 647 $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.desktop.in 648 $(SED) -e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \ 649 -e "s+@VBOX_DOC_PATH@+/opt/VirtualBox+" \ 650 --output $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/applications/virtualboxvm.desktop \ 651 $(VBOX_PATH_INST_COMMON_SRC)/virtualboxvm.desktop.in 647 652 $(CHMOD) 0644 $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/applications/virtualbox.desktop 653 $(CHMOD) 0644 $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/applications/virtualboxvm.desktop 648 654 649 655 # Desktop stuff in /usr/share/mime/packages/ (S10 cannot deal with icon information in virtualbox.xml).
Note:
See TracChangeset
for help on using the changeset viewer.
