VirtualBox

Changeset 10420 in vbox


Ignore:
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
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r10245 r10420  
    8686PROGRAMS = VirtualBox
    8787ifeq ($(filter-out freebsd linux openbsd netbsd solaris,$(KBUILD_TARGET)),) # X11
    88 DLLS = VBoxKeyboard
    89 OTHERS = $(PATH_BIN)/vboxkeyboard.tar.gz
     88DLLS = VBoxKeyboard3
     89OTHERS = $(PATH_BIN)/vboxkeyboard3.tar.gz
    9090endif
    9191INSTALLS = VirtualBox.nls
    … …  
    119119# VBoxKeyboard - keyboard library for X11.
    120120#
    121 VBoxKeyboard_TEMPLATE = VBOXR3
    122 VBoxKeyboard_SOURCES  = \
     121VBoxKeyboard3_TEMPLATE = VBOXR3
     122VBoxKeyboard3_SOURCES  = \
    123123        src/linux/keyboard-new.c
    124 VBoxKeyboard_TARSOURCES = \
    125         $(VBoxKeyboard_SOURCES) \
     124VBoxKeyboard3_TARSOURCES = \
     125        $(VBoxKeyboard3_SOURCES) \
    126126        src/linux/COPYING.LIB \
    127127        src/linux/keyboard.h \
    … …  
    131131        src/linux/keyboard-types.h \
    132132        src/linux/Makefile
    133 VBoxKeyboard_LIBS     = X11
    134 VBoxKeyboard_LIBPATH  = $(VBOX_LIBPATH_X11)
    135 
    136 
    137 #
    138 # vboxkeyboard.tar.gz - the LGPLed keyboard library must always be
     133VBoxKeyboard3_LIBS     = X11
     134VBoxKeyboard3_LIBPATH  = $(VBOX_LIBPATH_X11)
     135
     136
     137#
     138# vboxkeyboard3.tar.gz - the LGPLed keyboard library must always be
    139139# redistributed with usable sources.
    140140#
    141 SOURCE_DIRECTORY = vboxkeyboard
     141SOURCE_DIRECTORY = vboxkeyboard3
    142142DIRECTORY_PREFIX = src/linux/
    143143
    … …  
    146146        $(LN_SYMLINK) $(abspath $(PATH_CURRENT))/$(DIRECTORY_PREFIX) $@
    147147
    148 $(PATH_BIN)/vboxkeyboard.tar.gz: $(VBoxKeyboard_TARSOURCES) $(PATH_TARGET)/$(SOURCE_DIRECTORY)
     148$(PATH_BIN)/vboxkeyboard3.tar.gz: $(VBoxKeyboard3_TARSOURCES) $(PATH_TARGET)/$(SOURCE_DIRECTORY)
    149149        $(call MSG_TOOL,tar/gzip,,$@)
    150         $(QUIET)cd $(PATH_TARGET) && tar -chf - $(addprefix $(SOURCE_DIRECTORY)/,$(subst $(DIRECTORY_PREFIX),,$(VBoxKeyboard_TARSOURCES))) | gzip - > $@
     150        $(QUIET)cd $(PATH_TARGET) && tar -chf - $(addprefix $(SOURCE_DIRECTORY)/,$(subst $(DIRECTORY_PREFIX),,$(VBoxKeyboard3_TARSOURCES))) | gzip - > $@
    151151
    152152
    … …  
    155155#
    156156VirtualBox_TEMPLATE = VBOXQTGUIEXE
     157VirtualBox_NAME     = VirtualBox3
    157158VirtualBox_SDKS.win = WINPSDK DXSDK
    158159#ifeq ($(filter-out freebsd linux netbsd openbsd os2 solaris,$(KBUILD_TARGET)),) - later
    … …  
    163164ifeq ($(KBUILD_TARGET),darwin)
    164165# For the launch trick we need different inode numbers.
    165 VirtualBox_INST = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
     166VirtualBox_INST = $(INST_BIN)VirtualBox3 $(INST_BIN)VirtualBoxVM3
    166167
    167168 # For testing iChat Theater stuff change
    … …  
    392393VirtualBox_LIBS.os2      += $(PATH_DLL)/VBoxHlp$(VBOX_SUFF_DLL)
    393394ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
    394 VirtualBox_LIBS          += $(PATH_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)
     395VirtualBox_LIBS          += $(PATH_DLL)/VBoxKeyboard3$(VBOX_SUFF_DLL)
    395396endif
    396397
    … …  
    417418        $(VirtualBox_GENHDRS) \
    418419        $(WRAPPERSFILE) \
    419         $(PATH_BIN)/vboxkeyboard.tar.gz
     420        $(PATH_BIN)/vboxkeyboard3.tar.gz
    420421
    421422
    … …  
    476477# Translation installation
    477478#
    478 VirtualBox.nls_INST = $(INST_BIN)nls/
     479VirtualBox.nls_INST = $(INST_BIN)nls3/
    479480VirtualBox.nls_SOURCES =  $(patsubst %.ts,$(PATH_VirtualBox)/nls/%.qm,$(notdir $(VirtualBox_QT_TRANSLATIONS)))
    480481VirtualBox.nls_SOURCES += $(patsubst %.ts,$(PATH_VirtualBox)/nls/%.qm,$(notdir $(VirtualBox_QT_TRANSLATIONS_QT)))
    … …  
    488489PROGRAMS.darwin += tstDarwinKeyboard
    489490tstDarwinKeyboard_TEMPLATE = VBOXR3TSTEXE
     491tstDarwinKeyboard_NAME = tstDarwinKeyboard3
    490492tstDarwinKeyboard_INCS = include
    491493tstDarwinKeyboard_SOURCES = \

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

    r9060 r10420  
    26272627}
    26282628
    2629 extern const char *gVBoxLangSubDir = "/nls";
     2629extern const char *gVBoxLangSubDir = "/nls3";
    26302630extern const char *gVBoxLangFileBase = "VirtualBox_";
    26312631extern const char *gVBoxLangFileExt = ".qm";

  • trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk

    r10346 r10420  
    349349PROGRAMS += VirtualBox4
    350350ifeq ($(filter-out freebsd linux openbsd netbsd solaris,$(KBUILD_TARGET)),) # X11
    351  DLLS += VBoxKeyboard4
     351 DLLS += VBoxKeyboard
    352352 ## @todo convert to install target.
    353  OTHERS += $(PATH_BIN)/vboxkeyboard4.tar.gz
    354  CLEAN += $(PATH_BIN)/vboxkeyboard4.tar.gz
     353 OTHERS += $(PATH_BIN)/vboxkeyboard.tar.gz
     354 CLEAN += $(PATH_BIN)/vboxkeyboard.tar.gz
    355355endif
    356356INSTALLS += VirtualBox4.nls qt4-bin
    … …  
    360360# VBoxKeyboard - keyboard library for X11.
    361361#
    362 VBoxKeyboard4_TEMPLATE = VBOXR3
    363 VBoxKeyboard4_SOURCES  = \
     362VBoxKeyboard_TEMPLATE = VBOXR3
     363VBoxKeyboard_SOURCES  = \
    364364        src/linux/keyboard-new.c
    365 VBoxKeyboard4_LIBS     = X11
    366 VBoxKeyboard4_LIBPATH  = $(VBOX_LIBPATH_X11)
     365VBoxKeyboard_LIBS     = X11
     366VBoxKeyboard_LIBPATH  = $(VBOX_LIBPATH_X11)
    367367
    368368
    … …  
    377377#
    378378## @todo this should be tar'ed down into the output directory and installed using an install target.
    379 $(PATH_BIN)/vboxkeyboard4.tar.gz: \
    380                 $(VBoxKeyboard4_SOURCES) \
     379$(PATH_BIN)/vboxkeyboard.tar.gz: \
     380                $(VBoxKeyboard_SOURCES) \
    381381                src/linux/COPYING.LIB \
    382382                src/linux/keyboard.h \
    … …  
    387387                src/linux/Makefile
    388388        $(call MSG_TOOL,tar/gzip,,$@)
    389         $(QUIET2)$(RM) -f $(PATH_TARGET)/vboxkeyboard4 $@
    390         $(QUIET)$(LN_SYMLINK) $(VBOX_VIRTUALBOX4_SRC)/src/linux/ $(PATH_TARGET)/vboxkeyboard4
     389        $(QUIET2)$(RM) -f $(PATH_TARGET)/vboxkeyboard $@
     390        $(QUIET)$(LN_SYMLINK) $(VBOX_VIRTUALBOX4_SRC)/src/linux/ $(PATH_TARGET)/vboxkeyboard
    391391        $(QUIET)cd $(PATH_TARGET) \
    392                 && tar -chvf - $(addprefix vboxkeyboard4/,$(notdir $^)) \
     392                && tar -chvf - $(addprefix vboxkeyboard/,$(notdir $^)) \
    393393                   | gzip - > $@
    394         $(QUIET2)$(RM) -f $(PATH_TARGET)/vboxkeyboard4
     394        $(QUIET2)$(RM) -f $(PATH_TARGET)/vboxkeyboard
    395395
    396396
    … …  
    407407#
    408408VirtualBox4_TEMPLATE = VBOXQT4GUIEXE
     409VirtualBox4_NAME = VirtualBox
    409410VirtualBox4_SDKS.win = WINPSDK DXSDK
    410411ifeq ($(filter-out freebsd linux netbsd openbsd os2,$(KBUILD_TARGET)),) # X11 + os2 ## @todo solaris
    … …  
    414415ifeq ($(KBUILD_TARGET),darwin)
    415416 # For the launch trick we need different inode numbers.
    416  VirtualBox4_INST = $(INST_BIN)VirtualBox4 $(INST_BIN)VirtualBoxVM4
     417 VirtualBox4_INST = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
    417418
    418419 # For testing iChat Theater stuff change the sdk path (HACK ALERT!)
    … …  
    495496        $(PATH_SDK_DXSDK_LIB)/dxguid.lib
    496497ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
    497  VirtualBox4_LIBS         += $(PATH_DLL)/VBoxKeyboard4$(VBOX_SUFF_DLL)
     498 VirtualBox4_LIBS         += $(PATH_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)
    498499endif
    499500
    … …  
    839840#
    840841ifndef USE_KBUILD_QT_UNIT ## @todo later
    841 VirtualBox4.nls_INST = $(INST_BIN)nls4/
     842VirtualBox4.nls_INST = $(INST_BIN)nls/
    842843VirtualBox4.nls_SOURCES =  $(patsubst %.ts,$(PATH_VirtualBox4)/nls/%.qm,$(notdir $(VirtualBox4_QT_TRANSLATIONS)))
    843844VirtualBox4.nls_SOURCES += $(patsubst %.ts,$(PATH_VirtualBox4)/nls/%.qm,$(notdir $(VirtualBox4_QT_TRANSLATIONS_QT)))
    … …  
    851852ifdef VBOX_WITH_TESTCASES
    852853PROGRAMS.darwin += tstDarwinKeyboard4
     854tstDarwinKeyboard4_NAME = tstDarwinKeyboard
    853855tstDarwinKeyboard4_TEMPLATE = VBOXR3TSTEXE
    854856tstDarwinKeyboard4_INCS = include

  • trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp

    r10167 r10420  
    25382538}
    25392539
    2540 extern const char *gVBoxLangSubDir = "/nls4";
     2540extern const char *gVBoxLangSubDir = "/nls";
    25412541extern const char *gVBoxLangFileBase = "VirtualBox_";
    25422542extern const char *gVBoxLangFileExt = ".qm";

  • trunk/src/VBox/Main/MachineImpl.cpp

    r10306 r10420  
    34243424    {
    34253425#ifdef RT_OS_DARWIN /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
    3426         const char VirtualBox_exe[] = "../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM";
     3426        const char VirtualBox_exe[] = "../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM3";
    34273427#else
    3428         const char VirtualBox_exe[] = "VirtualBox" HOSTSUFF_EXE;
     3428        const char VirtualBox_exe[] = "VirtualBox3" HOSTSUFF_EXE;
    34293429#endif
    34303430        Assert (sz >= sizeof (VirtualBox_exe));
    … …  
    34443444    {
    34453445#ifdef RT_OS_DARWIN /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
    3446         const char VirtualBox_exe[] = "../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM4";
     3446        const char VirtualBox_exe[] = "../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM";
    34473447#else
    3448         const char VirtualBox_exe[] = "VirtualBox4" HOSTSUFF_EXE;
     3448        const char VirtualBox_exe[] = "VirtualBox" HOSTSUFF_EXE;
    34493449#endif
    34503450        Assert (sz >= sizeof (VirtualBox_exe));
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