- Timestamp:
- Mar 6, 2012 4:14:40 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 5 added
- 2 deleted
- 5 edited
- 3 copied
-
Config.kmk (modified) (1 diff)
-
configure (modified) (3 diffs)
-
doc/License-gpl-2.html (copied) (copied from trunk/doc/License-gpl-2.0.html ) (1 diff)
-
doc/License-gpl-2.rtf (copied) (copied from trunk/doc/License-gpl-2.0.rtf )
-
doc/License-gpl-2.txt (copied) (copied from trunk/doc/License-gpl-2.0.txt ) (3 diffs)
-
include/VBox/log.h (modified) (3 diffs)
-
src/VBox/ExtPacks/VNC (added)
-
src/VBox/ExtPacks/VNC/ExtPack.xml (added)
-
src/VBox/ExtPacks/VNC/Makefile.kmk (added)
-
src/VBox/ExtPacks/VNC/VBoxVNC.cpp (added)
-
src/VBox/ExtPacks/VNC/VBoxVNCMain.cpp (added)
-
src/VBox/Frontends/VBoxHeadless/FramebufferVNC.cpp (deleted)
-
src/VBox/Frontends/VBoxHeadless/FramebufferVNC.h (deleted)
-
src/VBox/Frontends/VBoxHeadless/Makefile.kmk (modified) (2 diffs)
-
src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r40378 r40383 561 561 VBOX_WITH_CROGL = 1 562 562 endif 563 # Enable the VNC server in VBoxHeadless(GPL only).564 #VBOX_WITH_ VNC = 1563 # Enable the VNC server extension pack (GPL only). 564 #VBOX_WITH_EXTPACK_VNC = 1 565 565 # Enable S3 support (requires libcurl) 566 566 VBOX_WITH_S3 = 1 -
trunk/configure
r40219 r40383 4 4 5 5 # 6 # Copyright (C) 2006-201 1Oracle Corporation6 # Copyright (C) 2006-2012 Oracle Corporation 7 7 # 8 8 # This file is part of VirtualBox Open Source Edition (OSE), as … … 915 915 if test_compile "$LIBVNCSERVER $INCVNCSERVER" libvncserver libvncserver; then 916 916 if test_execute; then 917 cnf_append "VBOX_WITH_ VNC" "1"917 cnf_append "VBOX_WITH_EXTPACK_VNC" "1" 918 918 fi 919 919 fi … … 2563 2563 check_vncserver 2564 2564 else 2565 cnf_append "VBOX_WITH_ VNC" ""2565 cnf_append "VBOX_WITH_EXTPACK_VNC" "" 2566 2566 fi 2567 2567 fi -
trunk/doc/License-gpl-2.html
r40364 r40383 10 10 <!-- comments: StarWriter --> 11 11 </head> 12 <body>Preliminary notes:<br> 13 <br> 14 1) The majority of code in the VirtualBox Open Source Edition (OSE) is<br> 15 copyrighted by Oracle Corporation. This code is combined with third-party code<br> 16 that was originally released under licenses which the Free Software Foundation<br> 17 considers incompatible with the GPL, such as the Apache License 2.0, the OpenSSL<br> 18 license, the Mozilla Public License (MPL) and the Slirp license. (Please see the<br> 19 VirtualBox User Manual for a complete list of third-party code and their<br> 20 licenses.) As a special exception to the terms and conditions of the GPL listed<br> 21 below, Oracle gives you explicit permission to combine its GPL code contained in<br> 22 VirtualBox OSE with third-party code under the aforementioned licenses. You may<br> 23 copy and distribute such a combination provided that you adhere to the terms and<br> 24 conditions of all of the GPL and the licenses of the third-party code; in<br> 25 particular, you must include the source code of the entire combination insofar<br> 26 as the GPL requires distribution of source code.<br> 27 <br> 28 2) The GPL listed below does not bind software which uses VirtualBox services by<br> 29 merely linking to VirtualBox libraries so long as all VirtualBox interfaces used<br> 30 by that software are multi-licensed. A VirtualBox interface is deemed<br> 31 multi-licensed if it is declared in a VirtualBox header file that is licensed<br> 32 under both the GPL version 2 (below) *and* the Common Development and<br> 33 Distribution License Version 1.0 (CDDL), as it comes in the "COPYING.CDDL" file.<br> 34 In other words, calling such a multi-licensed interface is merely considered<br> 35 normal use of VirtualBox and does not turn the calling code into a derived work<br> 36 of VirtualBox. In particular, this applies to code that wants to extend<br> 37 VirtualBox by way of the Extension Pack mechanism declared in the ExtPack.h<br> 38 header file.<br> 39 <br> 40 3) Whoever creates or distributes a derived work based on VirtualBox OSE is not<br> 41 obligated to grant the above exceptions for such a version. The GPL allows for<br> 42 releasing a modified version without the above exception; in addition, Oracle<br> 43 hereby also allows you to release a modified version which carries forward these<br> 44 exceptions.<br> 45 <br> 46 Oracle Corporation<br> 47 <br> 48 -------------------------------------------------------<br> 49 <br> 12 <body> 50 13 GNU GENERAL PUBLIC LICENSE<br> 51 14 Version 2, June 1991<br> -
trunk/doc/License-gpl-2.txt
r40364 r40383 1 Preliminary notes:2 3 1) The majority of code in the VirtualBox Open Source Edition (OSE) is4 copyrighted by Oracle Corporation. This code is combined with third-party code5 that was originally released under licenses which the Free Software Foundation6 considers incompatible with the GPL, such as the Apache License 2.0, the OpenSSL7 license, the Mozilla Public License (MPL) and the Slirp license. (Please see the8 VirtualBox User Manual for a complete list of third-party code and their9 licenses.) As a special exception to the terms and conditions of the GPL listed10 below, Oracle gives you explicit permission to combine its GPL code contained in11 VirtualBox OSE with third-party code under the aforementioned licenses. You may12 copy and distribute such a combination provided that you adhere to the terms and13 conditions of all of the GPL and the licenses of the third-party code; in14 particular, you must include the source code of the entire combination insofar15 as the GPL requires distribution of source code.16 17 2) The GPL listed below does not bind software which uses VirtualBox services by18 merely linking to VirtualBox libraries so long as all VirtualBox interfaces used19 by that software are multi-licensed. A VirtualBox interface is deemed20 multi-licensed if it is declared in a VirtualBox header file that is licensed21 under both the GPL version 2 (below) *and* the Common Development and22 Distribution License Version 1.0 (CDDL), as it comes in the "COPYING.CDDL" file.23 In other words, calling such a multi-licensed interface is merely considered24 normal use of VirtualBox and does not turn the calling code into a derived work25 of VirtualBox. In particular, this applies to code that wants to extend26 VirtualBox by way of the Extension Pack mechanism declared in the ExtPack.h27 header file.28 29 3) Whoever creates or distributes a derived work based on VirtualBox OSE is not30 obligated to grant the above exceptions for such a version. The GPL allows for31 releasing a modified version without the above exception; in addition, Oracle32 hereby also allows you to release a modified version which carries forward these33 exceptions.34 35 Oracle Corporation36 37 ---38 39 40 1 GNU GENERAL PUBLIC LICENSE 41 2 Version 2, June 1991 42 3 43 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 44 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA4 Copyright (C) 1989, 1991 Free Software Foundation, Inc., 5 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 45 6 Everyone is permitted to copy and distribute verbatim copies 46 7 of this license document, but changing it is not allowed. … … 55 16 Foundation's software and to any other program whose authors commit to 56 17 using it. (Some other Free Software Foundation software is covered by 57 the GNU L ibraryGeneral Public License instead.) You can apply it to18 the GNU Lesser General Public License instead.) You can apply it to 58 19 your programs, too. 59 20 … … 343 304 GNU General Public License for more details. 344 305 345 You should have received a copy of the GNU General Public License 346 along with this program; if not, write to the Free Software 347 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA 348 306 You should have received a copy of the GNU General Public License along 307 with this program; if not, write to the Free Software Foundation, Inc., 308 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 349 309 350 310 Also add information on how to contact you by electronic and paper mail. -
trunk/include/VBox/log.h
r38736 r40383 4 4 5 5 /* 6 * Copyright (C) 2006-201 1Oracle Corporation6 * Copyright (C) 2006-2012 Oracle Corporation 7 7 * 8 8 * This file is part of VirtualBox Open Source Edition (OSE), as … … 362 362 /** VMM group. */ 363 363 LOG_GROUP_VMM, 364 /** VRDE group */ 365 LOG_GROUP_VRDE, 364 366 /** VRDP group */ 365 367 LOG_GROUP_VRDP, … … 540 542 "VM", \ 541 543 "VMM", \ 544 "VRDE", \ 542 545 "VRDP", \ 543 546 "VSCSI", \ -
trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk
r38626 r40383 5 5 6 6 # 7 # Copyright (C) 2006-20 07Oracle Corporation7 # Copyright (C) 2006-2012 Oracle Corporation 8 8 # 9 9 # This file is part of VirtualBox Open Source Edition (OSE), as … … 56 56 VBoxHeadless_LDFLAGS.darwin += -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxHeadless.dylib 57 57 endif 58 ifdef VBOX_WITH_VNC # (GPL only)59 VBoxHeadless_DEFS += VBOX_WITH_VNC60 VBoxHeadless_SOURCES += FramebufferVNC.cpp61 VBoxHeadless_LIBS += vncserver62 endif63 58 64 59 include $(KBUILD_PATH)/subfooter.kmk -
trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp
r38735 r40383 5 5 6 6 /* 7 * Copyright (C) 2006-201 1Oracle Corporation7 * Copyright (C) 2006-2012 Oracle Corporation 8 8 * 9 9 * This file is part of VirtualBox Open Source Edition (OSE), as … … 59 59 60 60 #include "Framebuffer.h" 61 #ifdef VBOX_WITH_VNC62 # include "FramebufferVNC.h"63 #endif64 61 65 62 #include "NullFramebuffer.h" … … 81 78 /* flag whether frontend should terminate */ 82 79 static volatile bool g_fTerminateFE = false; 83 84 #ifdef VBOX_WITH_VNC85 static VNCFB *g_pFramebufferVNC;86 #endif87 80 88 81 //////////////////////////////////////////////////////////////////////////////// … … 318 311 } 319 312 } 320 #ifdef VBOX_WITH_VNC321 if (g_pFramebufferVNC)322 g_pFramebufferVNC->enableAbsMouse(fSupportsAbsolute);323 #endif324 313 break; 325 314 } … … 474 463 RTPrintf("Usage:\n" 475 464 " -s, -startvm, --startvm <name|uuid> Start given VM (required argument)\n" 476 #ifdef VBOX_WITH_VNC477 " -n, --vnc Enable the built in VNC server\n"478 " -m, --vncport <port> TCP port number to use for the VNC server\n"479 " -o, --vncpass <pw> Set the VNC server password\n"480 #endif481 465 " -v, -vrde, --vrde on|off|config Enable (default) or disable the VRDE\n" 482 466 " server or don't change the setting\n" … … 560 544 unsigned cVRDEProperties = 0; 561 545 const char *aVRDEProperties[16]; 562 #ifdef VBOX_WITH_VNC563 bool fVNCEnable = false;564 unsigned uVNCPort = 0; /* default port */565 char const *pszVNCPassword = NULL; /* no password */566 #endif567 546 unsigned fRawR0 = ~0U; 568 547 unsigned fRawR3 = ~0U; … … 615 594 { "-vrdeproperty", 'e', RTGETOPT_REQ_STRING }, 616 595 { "--vrdeproperty", 'e', RTGETOPT_REQ_STRING }, 617 #ifdef VBOX_WITH_VNC618 { "--vncport", 'm', RTGETOPT_REQ_INT32 },619 { "--vncpass", 'o', RTGETOPT_REQ_STRING },620 { "--vnc", 'n', 0 },621 #endif /* VBOX_WITH_VNC */622 596 { "-rawr0", OPT_RAW_R0, 0 }, 623 597 { "--rawr0", OPT_RAW_R0, 0 }, … … 679 653 RTPrintf("Warning: too many VRDE properties. Ignored: '%s'\n", ValueUnion.psz); 680 654 break; 681 #ifdef VBOX_WITH_VNC682 case 'n':683 fVNCEnable = true;684 break;685 case 'm':686 uVNCPort = ValueUnion.i32;687 break;688 case 'o':689 pszVNCPassword = ValueUnion.psz;690 break;691 #endif /* VBOX_WITH_VNC */692 655 case OPT_RAW_R0: 693 656 fRawR0 = true; … … 916 879 } 917 880 #endif /* defined(VBOX_FFMPEG) */ 918 #ifdef VBOX_WITH_VNC919 if (fVNCEnable)920 {921 Bstr machineName;922 machine->COMGETTER(Name)(machineName.asOutParam());923 g_pFramebufferVNC = new VNCFB(console, uVNCPort, pszVNCPassword);924 rc = g_pFramebufferVNC->init(machineName.raw() ? Utf8Str(machineName.raw()).c_str() : "");925 if (rc != S_OK)926 {927 LogError("Failed to load the vnc server extension, possibly due to a damaged file\n", rc);928 delete g_pFramebufferVNC;929 break;930 }931 932 Log2(("VBoxHeadless: Registering VNC framebuffer\n"));933 g_pFramebufferVNC->AddRef();934 display->SetFramebuffer(VBOX_VIDEO_PRIMARY_SCREEN, g_pFramebufferVNC);935 }936 if (rc != S_OK)937 break;938 #endif939 881 ULONG cMonitors = 1; 940 882 machine->COMGETTER(MonitorCount)(&cMonitors); … … 945 887 # ifdef VBOX_FFMPEG 946 888 if (fFFMPEG && uScreenId == 0) 947 {948 /* Already registered. */949 continue;950 }951 # endif952 # ifdef VBOX_WITH_VNC953 if (fVNCEnable && uScreenId == 0)954 889 { 955 890 /* Already registered. */
Note:
See TracChangeset
for help on using the changeset viewer.
