Changeset 36612 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 7, 2011 10:37:52 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

71060

Message:

SDK: fixed some installed files, restore copyright notice

File:

• trunk/src/VBox/Main/webservice/Makefile.kmk (modified) (8 diffs)

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

@@ -298 +298 @@
  endif # !VBOX_ONLY_SDK
 
-ifdef VBOX_WITH_JWS
+ ifdef VBOX_WITH_JWS
 INSTALLS += VBoxJWs-inst-jar
 
@@ -358 +358 @@
         $(VBOX_JAR) cf $@ -C $(VBOX_JWS_JDEST) .
 
-endif # VBOX_WITH_JWS
+ endif # VBOX_WITH_JWS
 
  ifndef VBOX_ONLY_SDK
@@ -422 +422 @@
  VBOXWEB_WS_PERL               = $(VBOX_PATH_SDK)/bindings/webservice/perl/lib/vboxService.pm
  VBOXWEB_WS_PHP                = $(VBOX_PATH_SDK)/bindings/webservice/php/lib/vboxServiceWrappers.php
- VBOXWEB_SAMPLES_AXIS_DIR      = $(VBOX_PATH_SDK)/bindings/webservice/java/axis/samples
  VBOXWEB_SAMPLES_JAXWS_DIR     = $(VBOX_PATH_SDK)/bindings/webservice/java/jax-ws/samples
  VBOXWEB_JAXWSSAMPLE           = $(VBOXWEB_SAMPLES_JAXWS_DIR)/clienttest.java
@@ -433 +432 @@
  VBOXWEB_JAVA16_JAR            = $(VBOXWEB_JAVALIB)/vboxws_java16.jar
 
-define find_java_files
- $(shell find $(1) -name \*.java)
-endef
-
+ define find_java_files
+  $(shell find $(1) -name \*.java)
+ endef
+
+ ifdef VBOX_WITH_OLD_JWS
  VBOX_JAXWS_LIBDIR             = $(VBOX_PATH_WEBSERVICE)/jaxlibs
  # well, not really good
@@ -444 +444 @@
         /opt/sun-jdk-1.5*/bin/java \
         /System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Commands/java))
- ifeq ($(strip $(VBOX_JAVA15)),)
-  $(error Failed to autodetect VBOX_JAVA15, please set it manually)
- endif
+  ifeq ($(strip $(VBOX_JAVA15)),)
+   $(error Failed to autodetect VBOX_JAVA15, please set it manually)
+  endif
  VBOX_JAVA16                   = java
  VBOX_JAVAC15                  = javac -target 1.5
@@ -455 +455 @@
         /usr/bin/wsimport \
         /opt/sun-jdk-1.6*/bin/wsimport))
- ifeq ($(strip $(VBOX_WSIMPORT16)),)
-  $(error Failed to autodetect VBOX_WSIMPORT16, please set it manually)
- endif
-
- VBOXWEB_OTHERS               += \
-        $(VBOXWEB_GLUE_PYTHON)   \
-        $(VBOXWEB_WS_PYTHON)     \
-        $(VBOXWEB_WS_PERL)       \
-        $(VBOXWEB_WS_PHP)        \
-        $(VBOXWEB_PYTHONWSSAMPLE)
-
-ifdef VBOX_WITH_OLD_JWS
+  ifeq ($(strip $(VBOX_WSIMPORT16)),)
+   $(error Failed to autodetect VBOX_WSIMPORT16, please set it manually)
+  endif
+ endif # VBOX_WITH_OLD_JWS
+
+ VBOXWEB_OTHERS               +=  \
+        $(VBOXWEB_GLUE_PYTHON)    \
+        $(VBOXWEB_WS_PYTHON)      \
+        $(VBOXWEB_WS_PERL)        \
+        $(VBOXWEB_WS_PHP)         \
+        $(VBOXWEB_PYTHONWSSAMPLE) \
+        $(PATH_ROOT)
+
+ ifdef VBOX_WITH_OLD_JWS
   VBOXWEB_OTHERS               += \
         $(VBOXWEB_GLUE_JAVA_TMP)  \
@@ -473 +475 @@
         $(VBOXWEB_JAVA15_JAR)     \
         $(VBOXWEB_JAVA16_JAR)
-endif
+ endif
 
  #
@@ -482 +484 @@
  vboxwebinst_MODE = a+rx,u+w
  vboxwebinst_SOURCES = \
+        samples/perl/clienttest.pl=>perl/samples/clienttest.pl \
+        samples/php/clienttest.php=>php/samples/clienttest.php
+
+ INSTALLS += vboxwebinst_nox
+ vboxwebinst_nox_INST = $(INST_SDK)bindings/webservice/
+ vboxwebinst_nox_MODE = a+r,u+w
+ vboxwebinst_nox_SOURCES = \
+        samples/python/Makefile=>python/samples/Makefile \
+        samples/python/Makefile.glue=>python/lib/Makefile \
+        $(PATH_ROOT)/COPYING.LIB=>java/jax-ws/COPYING.LIB
+
+ ifdef VBOX_WITH_OLD_JWS
+  vboxwebinst_nox_SOURCES += \
         samples/java/axis/clienttest.java=>java/axis/samples/clienttest.java \
         samples/java/jax-ws/Makefile.glue=>java/jax-ws/src/Makefile \
-        samples/java/jax-ws/Makefile=>java/jax-ws/samples/Makefile \
-        samples/perl/clienttest.pl=>perl/samples/clienttest.pl \
-        samples/php/clienttest.php=>php/samples/clienttest.php \
-        samples/python/Makefile=>python/samples/Makefile \
-        samples/python/Makefile.glue=>python/lib/Makefile
+        samples/java/jax-ws/Makefile=>java/jax-ws/samples/Makefile
+ endif
 
 endif # VBOX_ONLY_SDK