Changeset 31234 in vbox for trunk

Timestamp:

Jul 30, 2010 10:01:46 AM (15 years ago)

Author:

vboxsync

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

64246

Message:

Java: few final touches

Location:

trunk/src

Files:

• VBox/Main/webservice/Makefile.kmk (modified) (1 diff)
• libs/xpcom18a4/java/Makefile.kmk (modified) (4 diffs)

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

@@ -451 +451 @@
 
  VBOXWEB_OTHERS               += \
-        $(VBOXWEB_GLUE_JAVA_TMP) \
-        $(VBOXWEB_GLUE_PYTHON) \
-        $(VBOXWEB_WS_PYTHON) \
-        $(VBOXWEB_WS_PERL) \
-        $(VBOXWEB_WS_PHP) \
-        $(VBOXWEB_PYTHONWSSAMPLE)\
-        $(VBOXWEB_JAXWSSAMPLE) \
-        $(VBOXWEB_METRICSAMPLE)
+        $(VBOXWEB_GLUE_PYTHON)   \
+        $(VBOXWEB_WS_PYTHON)     \
+        $(VBOXWEB_WS_PERL)       \
+        $(VBOXWEB_WS_PHP)        \
+        $(VBOXWEB_PYTHONWSSAMPLE)
 
 ifdef VBOX_WITH_OLD_JWS
   VBOXWEB_OTHERS               += \
-        $(VBOXWEB_JAVA15_JAR) \
+        $(VBOXWEB_GLUE_JAVA_TMP)  \
+        $(VBOXWEB_JAXWSSAMPLE)    \
+        $(VBOXWEB_METRICSAMPLE)   \
+        $(VBOXWEB_JAVA15_JAR)     \
         $(VBOXWEB_JAVA16_JAR)
 endif

trunk/src/libs/xpcom18a4/java/Makefile.kmk

@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-ifndef VBOX_ONLY_SDK
-
 #
 # Globals
@@ -31 +29 @@
 VBOX_GLUE_XSLT_DIR := $(PATH_ROOT)/src/VBox/Main/glue
 
-#
-# VBoxJXpcom - missing description.
+ifndef VBOX_ONLY_SDK
+#
+# VBoxJXpcom - Java<->XPCOM native library
 #
 DLLS += VBoxJXpcom
@@ -72 +71 @@
         $(VBOX_JXPCOM_JDEST)/org_mozilla_xpcom_ProfileLock.h
 
+
+else # VBOX_ONLY_SDK
+# Nothing yet
+endif # VBOX_ONLY_SDK
+
 #
 # Install JAR files
@@ -212 +216 @@
         $(VBOX_JAR) cf $@ -C $(VBOX_JXPCOM_JDEST) .
 
-else # VBOX_ONLY_SDK
-# Nothing yet
-endif # VBOX_ONLY_SDK
-
 include $(KBUILD_PATH)/subfooter.kmk