Changeset 10420 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 9, 2008 1:48:36 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Named the Qt3 version VirtualBox3 & the Qt4 version VirtualBox.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (10 diffs)
• src/VBoxGlobal.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -86 +86 @@
 PROGRAMS = VirtualBox
 ifeq ($(filter-out freebsd linux openbsd netbsd solaris,$(KBUILD_TARGET)),) # X11
-DLLS = VBoxKeyboard
-OTHERS = $(PATH_BIN)/vboxkeyboard.tar.gz
+DLLS = VBoxKeyboard3
+OTHERS = $(PATH_BIN)/vboxkeyboard3.tar.gz
 endif
 INSTALLS = VirtualBox.nls
@@ -119 +119 @@
 # VBoxKeyboard - keyboard library for X11.
 #
-VBoxKeyboard_TEMPLATE = VBOXR3
-VBoxKeyboard_SOURCES  = \
+VBoxKeyboard3_TEMPLATE = VBOXR3
+VBoxKeyboard3_SOURCES  = \
         src/linux/keyboard-new.c
-VBoxKeyboard_TARSOURCES = \
-        $(VBoxKeyboard_SOURCES) \
+VBoxKeyboard3_TARSOURCES = \
+        $(VBoxKeyboard3_SOURCES) \
         src/linux/COPYING.LIB \
         src/linux/keyboard.h \
@@ -131 +131 @@
         src/linux/keyboard-types.h \
         src/linux/Makefile
-VBoxKeyboard_LIBS     = X11
-VBoxKeyboard_LIBPATH  = $(VBOX_LIBPATH_X11)
-
-
-#
-# vboxkeyboard.tar.gz - the LGPLed keyboard library must always be
+VBoxKeyboard3_LIBS     = X11
+VBoxKeyboard3_LIBPATH  = $(VBOX_LIBPATH_X11)
+
+
+#
+# vboxkeyboard3.tar.gz - the LGPLed keyboard library must always be
 # redistributed with usable sources.
 #
-SOURCE_DIRECTORY = vboxkeyboard
+SOURCE_DIRECTORY = vboxkeyboard3
 DIRECTORY_PREFIX = src/linux/
 
@@ -146 +146 @@
         $(LN_SYMLINK) $(abspath $(PATH_CURRENT))/$(DIRECTORY_PREFIX) $@
 
-$(PATH_BIN)/vboxkeyboard.tar.gz: $(VBoxKeyboard_TARSOURCES) $(PATH_TARGET)/$(SOURCE_DIRECTORY)
+$(PATH_BIN)/vboxkeyboard3.tar.gz: $(VBoxKeyboard3_TARSOURCES) $(PATH_TARGET)/$(SOURCE_DIRECTORY)
         $(call MSG_TOOL,tar/gzip,,$@)
-        $(QUIET)cd $(PATH_TARGET) && tar -chf - $(addprefix $(SOURCE_DIRECTORY)/,$(subst $(DIRECTORY_PREFIX),,$(VBoxKeyboard_TARSOURCES))) | gzip - > $@
+        $(QUIET)cd $(PATH_TARGET) && tar -chf - $(addprefix $(SOURCE_DIRECTORY)/,$(subst $(DIRECTORY_PREFIX),,$(VBoxKeyboard3_TARSOURCES))) | gzip - > $@
 
 
@@ -155 +155 @@
 #
 VirtualBox_TEMPLATE = VBOXQTGUIEXE
+VirtualBox_NAME     = VirtualBox3
 VirtualBox_SDKS.win = WINPSDK DXSDK
 #ifeq ($(filter-out freebsd linux netbsd openbsd os2 solaris,$(KBUILD_TARGET)),) - later
@@ -163 +164 @@
 ifeq ($(KBUILD_TARGET),darwin)
 # For the launch trick we need different inode numbers.
-VirtualBox_INST = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
+VirtualBox_INST = $(INST_BIN)VirtualBox3 $(INST_BIN)VirtualBoxVM3
 
  # For testing iChat Theater stuff change
@@ -392 +393 @@
 VirtualBox_LIBS.os2      += $(PATH_DLL)/VBoxHlp$(VBOX_SUFF_DLL)
 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
-VirtualBox_LIBS          += $(PATH_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)
+VirtualBox_LIBS          += $(PATH_DLL)/VBoxKeyboard3$(VBOX_SUFF_DLL)
 endif
 
@@ -417 +418 @@
         $(VirtualBox_GENHDRS) \
         $(WRAPPERSFILE) \
-        $(PATH_BIN)/vboxkeyboard.tar.gz
+        $(PATH_BIN)/vboxkeyboard3.tar.gz
 
 
@@ -476 +477 @@
 # Translation installation
 #
-VirtualBox.nls_INST = $(INST_BIN)nls/
+VirtualBox.nls_INST = $(INST_BIN)nls3/
 VirtualBox.nls_SOURCES =  $(patsubst %.ts,$(PATH_VirtualBox)/nls/%.qm,$(notdir $(VirtualBox_QT_TRANSLATIONS)))
 VirtualBox.nls_SOURCES += $(patsubst %.ts,$(PATH_VirtualBox)/nls/%.qm,$(notdir $(VirtualBox_QT_TRANSLATIONS_QT)))
@@ -488 +489 @@
 PROGRAMS.darwin += tstDarwinKeyboard
 tstDarwinKeyboard_TEMPLATE = VBOXR3TSTEXE
+tstDarwinKeyboard_NAME = tstDarwinKeyboard3
 tstDarwinKeyboard_INCS = include
 tstDarwinKeyboard_SOURCES = \

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -2627 +2627 @@
 }
 
-extern const char *gVBoxLangSubDir = "/nls";
+extern const char *gVBoxLangSubDir = "/nls3";
 extern const char *gVBoxLangFileBase = "VirtualBox_";
 extern const char *gVBoxLangFileExt = ".qm";