Changeset 61379 in vbox

Timestamp:

Jun 1, 2016 4:29:08 PM (8 years ago)

Author:

vboxsync

Message:

Main/webservice: don't ship webtest any longer (to save space) and create a new SDK cpp example instead

Location:

trunk/src/VBox

Files:

• Installer/freebsd/Makefile.kmk (modified) (1 diff)
• Installer/freebsd/pkg_plist (modified) (1 diff)
• Installer/linux/Makefile.kmk (modified) (1 diff)
• Installer/linux/debian/lintian-override.in (modified) (1 diff)
• Installer/linux/postinst-common.sh (modified) (1 diff)
• Installer/solaris/Makefile.kmk (modified) (1 diff)
• Installer/solaris/makepackage.sh (modified) (1 diff)
• Main/webservice/Makefile.kmk (modified) (1 diff)
• Main/webservice/Makefile.webtest (added)

trunk/src/VBox/Installer/freebsd/Makefile.kmk

@@ -208 +208 @@
 ifdef VBOX_WITH_WEBSERVICES
  VBOX_FBSD_STRIP_BIN += \
-        vboxwebsrv \
-        webtest
+        vboxwebsrv
  VBOX_FBSD_SYMLINKS += \
         vboxwebsrv

trunk/src/VBox/Installer/freebsd/pkg_plist

@@ -30 +30 @@
 lib/virtualbox/VBoxOGLrenderspu.so
 lib/virtualbox/vboxwebsrv
-lib/virtualbox/webtest
 lib/virtualbox/rdesktop-vrdp
 lib/virtualbox/VBoxTestOGL

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -338 +338 @@
 ifdef VBOX_WITH_WEBSERVICES
  VBOX_LNX_STRIP_BIN += \
-        vboxwebsrv \
-        webtest
+        vboxwebsrv
 endif
 

trunk/src/VBox/Installer/linux/debian/lintian-override.in

@@ -116 +116 @@
 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxBalloonCtrl /usr/lib/virtualbox
 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/vboxwebsrv /usr/lib/virtualbox
-%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/webtest /usr/lib/virtualbox
 %VERPKG%: postrm-contains-additional-updaterc.d-calls /etc/init.d/vboxnet
 %VERPKG%: package-contains-empty-directory usr/lib/virtualbox/ExtensionPacks/

trunk/src/VBox/Installer/linux/postinst-common.sh

@@ -89 +89 @@
         > /dev/null 2>&1
     chcon -t java_exec_t    "${MY_PATH}"/vboxwebsrv > /dev/null 2>&1
-    chcon -t java_exec_t    "${MY_PATH}"/webtest > /dev/null 2>&1
     chcon -t bin_t          "${MY_PATH}"/src/vboxhost/build_in_tmp \
          > /dev/null 2>&1

trunk/src/VBox/Installer/solaris/Makefile.kmk

@@ -517 +517 @@
         VBoxAutostart \
         $(if $(VBOX_WITH_WEBSERVICES),vboxwebsrv) \
-        $(if $(VBOX_WITH_WEBSERVICES),webtest) \
         $(if $(VBOX_WITH_VBOX_IMG)$(VBOX_WITH_TESTCASES),vbox-img)
 

trunk/src/VBox/Installer/solaris/makepackage.sh

@@ -121 +121 @@
 create_hardlink VBoxAutostart
 create_hardlink vboxwebsrv
-create_hardlink webtest
 create_hardlink VBoxZoneAccess
 create_hardlink VBoxSVC

trunk/src/VBox/Main/webservice/Makefile.kmk

@@ -580 +580 @@
         $(VBOXWEBSERVICE_WSDL)=>vboxwebService.wsdl
 
+ INSTALLS += vboxwebinst_webtest
+ vboxwebinst_webtest_INST = $(INST_SDK)bindings/webservice
+ vboxwebinst_webtest_MODE = a+r,u+w
+ vboxwebinst_webtest_SOURCES = \
+        $(VBOX_PATH_WEBSERVICE)/websrv-wsdl2gsoapH.xsl=>xsl/websrv-wsdl2gsoapH.xsl \
+        $(VBOX_PATH_WEBSERVICE)/websrv-nsmap.xsl=>xsl/websrv-nsmap.xsl \
+        $(VBOX_PATH_IDL)/typemap-shared.inc.xsl=>idl/typemap-shared.inc.xsl \
+        $(VBOX_PATH_WEBSERVICE)/split-soapC.cpp=>tools/split-soapC.cpp \
+        $(VBOX_PATH_WEBSERVICE)/webtest.cpp=>cpp/samples/webtest/webtest.cpp \
+        $(VBOX_PATH_WEBSERVICE)/Makefile.webtest=>cpp/samples/webtest/Makefile
+
 endif # VBOX_ONLY_SDK