Changeset 48479 in vbox

Timestamp:

Sep 15, 2013 9:53:12 PM (12 years ago)

Author:

vboxsync

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

88962

Message:

Config.kmk,Main/Makefile.kmk: Use quotes instead of escaping the semicolon on dos-systems. The VBOX_SEP is useless outside shell command lines otherwise.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -5609 +5609 @@
 endif
 
-ifeq ($(KBUILD_TARGET), win)
-  VBOX_SEP=\;
+
+#
+# VBOX_SEP needs to be quoted when used on the shell command line.
+#
+if1of ($(KBUILD_TARGET), os2 win)
+ VBOX_SEP = $(SEMICOLON)
 else
-  VBOX_SEP=:
+ VBOX_SEP = $(COLON)
 endif
 VBOX_JAVAC_OPTS   = -encoding UTF-8 -source 1.5 -target 1.5 -Xlint:unchecked
 VBOX_JAVADOC_OPTS = -encoding UTF-8
+
 
 #

trunk/src/VBox/Main/Makefile.kmk

@@ -1014 +1014 @@
         $(VBOX_JAVAC) $(VBOX_JAVAC_OPTS) \
                 @$(VBOX_JMSCOM_GEN)/jmscomglue.list \
-                -d $(VBOX_JMSCOM_JDEST) -classpath $(VBOX_JMSCOM_JDEST)$(VBOX_SEP)$(VBOX_JACOB_DIR)/jacob.jar
+                -d $(VBOX_JMSCOM_JDEST) -classpath "$(VBOX_JMSCOM_JDEST)$(VBOX_SEP)$(VBOX_JACOB_DIR)/jacob.jar"
         $(call MSG_LINK,$(notdir $@),$@)
         $(VBOX_JAR) cf $@ -C $(VBOX_JMSCOM_JDEST) .