Changeset 29715 in vbox for trunk/src/libs/xpcom18a4/java/Makefile.kmk

Timestamp:

May 21, 2010 4:39:03 AM (15 years ago)

Author:

vboxsync

Message:

Java glue: intermediate

File:

• trunk/src/libs/xpcom18a4/java/Makefile.kmk (modified) (9 diffs)

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

@@ -27 +27 @@
 
 ifeq ($(KBUILD_TARGET), darwin)
- VBOX_JAVA_HOME = /System/Library/Frameworks/JavaVM.framework/Versions/1.5.0
+ VBOX_JAVA_HOME = /System/Library/Frameworks/JavaVM.framework/Versions/1.6.0
  VBOX_JAVAC = $(VBOX_JAVA_HOME)/Commands/javac
  VBOX_JAVAH = $(VBOX_JAVA_HOME)/Commands/javah
@@ -34 +34 @@
 else
  ifeq ($(KBUILD_TARGET), linux)
-  VBOX_JAVA_HOME ?= /usr/lib/jvm/java-1.5.0-sun
+  VBOX_JAVA_HOME ?= /usr/lib/jvm/java-1.6.0-sun
  endif
  ifeq ($(KBUILD_TARGET), solaris)
- # VBOX_JAVA_HOME ?= /usr/jdk/jdk1.5.0
+ # VBOX_JAVA_HOME ?= /usr/jdk/jdk1.6.0
    VBOX_JAVA_HOME ?= /usr/java
  endif
@@ -48 +48 @@
                 $(VBOX_JAVA_HOME)/include/$(VBOX_MD_OS)
 endif
-JAVAC_OPTS = -source 1.4 -target 1.4
+JAVAC_OPTS = -source 1.5 -target 1.5
 
 VBOX_JXPCOM_TARGET := $(PATH_TARGET)/vboxjxpcom-gen
@@ -66 +66 @@
         EXPORT_XPT_API   \
         VBOX_WITH_XPCOM
-#VBoxJXpcom_DEFS.darwin = XP_MACOSX - already in TEMPLATE_XPCOM_DEFS.darwin ...
 VBoxJXpcom_NAME     = libvboxjxpcom
 VBoxJXpcom_DLLSUFF.darwin = .jnilib
@@ -181 +180 @@
                 $(VBOX_JXPCOM_JDEST)/*/*/*/*/*/*.class \
         )
-VBoxJXpcom-inst-jar_BLDDIRS += $(VBOX_JXPCOM_GEN)/java
+VBoxJXpcom-inst-jar_BLDDIRS += $(VBOX_JXPCOM_GEN)/java $(VBOX_JXPCOM_GEN)/java/glue
 
 
@@ -236 +235 @@
 $(VBOX_JXPCOM_GEN)/jxpcomglue.list:  \
                 $(VBOX_XIDL_FILE)    \
-                $(VBOX_XSLT_DIR)/glue_java.xls \
+                $(VBOX_XSLT_DIR)/glue-java.xsl \
                 $$(TARGET_filesplitter) \
                 | $(VBOX_JXPCOM_GEN)/java/glue/
@@ -244 +243 @@
               --stringparam G_vboxApiSuffix $(VBOX_API_SUFFIX) \
               --stringparam G_vboxGlueStyle xpcom              \
-              -o $(VBOX_JXPCOM_GEN)/java/glue/merged.file $(VBOX_XSLT_DIR)/glue_java.xls $<
-        $(QUIET)$(TARGET_filesplitter) $(VBOX_JXPCOM_GEN)/java/glue/merged.file $(VBOX_JXPCOM_GEN)/java/glue/
+              -o $(VBOX_JXPCOM_GEN)/java/glue/merged.file $(VBOX_XSLT_DIR)/glue-java.xsl $<
+        $(QUIET)$(VBOX_FILESPLIT) $(VBOX_JXPCOM_GEN)/java/glue/merged.file $(VBOX_JXPCOM_GEN)/java/glue/
         $(QUIET)echo $(VBOX_JXPCOM_GEN)/java/glue/*.java > $@
 
@@ -279 +278 @@
         $(QUIET)$(RM) -Rf $(VBOX_JXPCOM_JDEST)
         $(QUIET)$(MKDIR) -p $(VBOX_JXPCOM_JDEST)
-        $(VBOX_JAVAC) $(JAVAC_OPTS) @$ $(VBOX_JXPCOM_GEN)/jxpcomgen.list \
+        $(VBOX_JAVAC) $(JAVAC_OPTS) @$(VBOX_JXPCOM_GEN)/jxpcomgen.list \
                 -d $(VBOX_JXPCOM_JDEST) -classpath $(VBOX_JXPCOM_JDEST)
         $(call MSG_TOOL,javac,$(notdir $@),...,)
@@ -286 +285 @@
                 $(VBOX_JXPCOM_NSERROR) \
                 $(VBOX_JXPCOM_MGR) \
-                $(VBOX_JXPCOM_GEN)/jxpcomglue.list \
+                @$(VBOX_JXPCOM_GEN)/jxpcomglue.list \
                 -d $(VBOX_JXPCOM_JDEST) -classpath $(VBOX_JXPCOM_JDEST)
         $(call MSG_LINK,$(notdir $@),$@)