VirtualBox

Changeset 29759 in vbox


Ignore:
Timestamp:
May 24, 2010 9:22:00 AM (15 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
61953
Message:

Java: move tools to Config.kmk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r29715 r29759  
    42824282VBOX_XIDL_FILE         = $(PATH_OUT)/obj/VirtualBox_stripped.xidl
    42834283
     4284# Java stuff, move to tools eventually
     4285ifeq ($(KBUILD_TARGET), darwin)
     4286 VBOX_JAVA_HOME = /System/Library/Frameworks/JavaVM.framework/Versions/1.6.0
     4287 VBOX_JAVAC = $(VBOX_JAVA_HOME)/Commands/javac
     4288 VBOX_JAVAH = $(VBOX_JAVA_HOME)/Commands/javah
     4289 VBOX_JAR   = $(VBOX_JAVA_HOME)/Commands/jar
     4290 VBOX_JAVA_INC = $(VBOX_JAVA_HOME)/Headers
     4291else
     4292 ifeq ($(KBUILD_TARGET), linux)
     4293  VBOX_JAVA_HOME ?= /usr/lib/jvm/java-6-sun
     4294 endif
     4295 ifeq ($(KBUILD_TARGET), solaris)
     4296 # VBOX_JAVA_HOME ?= /usr/jdk/jdk1.6.0
     4297   VBOX_JAVA_HOME ?= /usr/java
     4298 endif
     4299 VBOX_JAVAC = $(VBOX_JAVA_HOME)/bin/javac
     4300 VBOX_JAVAH = $(VBOX_JAVA_HOME)/bin/javah
     4301 VBOX_JAR   = $(VBOX_JAVA_HOME)/bin/jar
     4302 # correct for targets we care about
     4303 VBOX_MD_OS = $(KBUILD_TARGET)
     4304 VBOX_JAVA_INC = $(VBOX_JAVA_HOME)/include               \
     4305                $(VBOX_JAVA_HOME)/include/$(VBOX_MD_OS)
     4306endif
     4307VBOX_JAVAC_OPTS = -source 1.5 -target 1.5
    42844308
    42854309#
  • trunk/src/libs/xpcom18a4/java/Makefile.kmk

    r29757 r29759  
    2626VBOX_JXPCOM_SRC := $(PATH_SUB_CURRENT)
    2727
    28 ifeq ($(KBUILD_TARGET), darwin)
    29  VBOX_JAVA_HOME = /System/Library/Frameworks/JavaVM.framework/Versions/1.6.0
    30  VBOX_JAVAC = $(VBOX_JAVA_HOME)/Commands/javac
    31  VBOX_JAVAH = $(VBOX_JAVA_HOME)/Commands/javah
    32  VBOX_JAR   = $(VBOX_JAVA_HOME)/Commands/jar
    33  VBOX_JAVA_INC = $(VBOX_JAVA_HOME)/Headers
    34 else
    35  ifeq ($(KBUILD_TARGET), linux)
    36   VBOX_JAVA_HOME ?= /usr/lib/jvm/java-6-sun
    37  endif
    38  ifeq ($(KBUILD_TARGET), solaris)
    39  # VBOX_JAVA_HOME ?= /usr/jdk/jdk1.6.0
    40    VBOX_JAVA_HOME ?= /usr/java
    41  endif
    42  VBOX_JAVAC = $(VBOX_JAVA_HOME)/bin/javac
    43  VBOX_JAVAH = $(VBOX_JAVA_HOME)/bin/javah
    44  VBOX_JAR   = $(VBOX_JAVA_HOME)/bin/jar
    45  # correct for targets we care about
    46  VBOX_MD_OS = $(KBUILD_TARGET)
    47  VBOX_JAVA_INC = $(VBOX_JAVA_HOME)/include               \
    48                 $(VBOX_JAVA_HOME)/include/$(VBOX_MD_OS)
    49 endif
    50 JAVAC_OPTS = -source 1.5 -target 1.5
    51 
    5228VBOX_JXPCOM_TARGET := $(PATH_TARGET)/vboxjxpcom-gen
    5329VBOX_JXPCOM_JDEST  := $(VBOX_JXPCOM_TARGET)/jdest
    5430
    55 VBOX_XSLT_DIR := $(PATH_ROOT)/src/VBox/Main/glue
     31VBOX_GLUE_XSLT_DIR := $(PATH_ROOT)/src/VBox/Main/glue
    5632
    5733#
     
    170146        $(VBOX_JXPCOM_JAR) \
    171147        $(VBOX_JXPCOM_NSERROR) \
    172         $(VBOX_JXPCOM_GEN)/jxpcomgen.list \
     148        $(VBOX_JXPCOM_GEN)/jxpcomgen.list  \
     149        $(VBOX_JXPCOM_GEN)/jxpcomglue.list \
    173150        $(wildcard \
    174151                $(VBOX_JXPCOM_GEN)/java/*.java \
     152                $(VBOX_JXPCOM_GEN)/java/glue/*.java \
    175153                $(VBOX_JXPCOM_JDEST)/*.class \
    176154                $(VBOX_JXPCOM_JDEST)/*/*.class \
     
    181159        )
    182160VBoxJXpcom-inst-jar_BLDDIRS += $(VBOX_JXPCOM_GEN)/java $(VBOX_JXPCOM_GEN)/java/glue
    183 
    184161
    185162#
     
    235212$(VBOX_JXPCOM_GEN)/jxpcomglue.list:  \
    236213                $(VBOX_XIDL_FILE)    \
    237                 $(VBOX_XSLT_DIR)/glue-java.xsl \
     214                $(VBOX_GLUE_XSLT_DIR)/glue-java.xsl \
    238215                $$(TARGET_filesplitter) \
    239216                | $(VBOX_JXPCOM_GEN)/java/glue/
    240217        $(call MSG_L1,Generating Java glue files from XIDL)
    241218        $(QUIET)$(RM) -f $(wildcard $(VBOX_JXPCOM_GEN)/java/glue/*.java)
    242         $(QUIET)$(VBOX_XSLTPROC) $(VBOXWEB_XSLTPROC_VERBOSE)   \
     219        $(QUIET)$(VBOX_XSLTPROC)   \
    243220              --stringparam G_vboxApiSuffix $(VBOX_API_SUFFIX) \
    244221              --stringparam G_vboxGlueStyle xpcom              \
    245               -o $(VBOX_JXPCOM_GEN)/java/glue/merged.file $(VBOX_XSLT_DIR)/glue-java.xsl $<
     222              -o $(VBOX_JXPCOM_GEN)/java/glue/merged.file $(VBOX_GLUE_XSLT_DIR)/glue-java.xsl $<
    246223        $(QUIET)$(VBOX_FILESPLIT) $(VBOX_JXPCOM_GEN)/java/glue/merged.file $(VBOX_JXPCOM_GEN)/java/glue/
    247224        $(QUIET)echo $(VBOX_JXPCOM_GEN)/java/glue/*.java > $@
     
    275252        $(QUIET)$(RM) -Rf $(VBOX_JXPCOM_JDEST)
    276253        $(QUIET)$(MKDIR) -p $(VBOX_JXPCOM_JDEST)
    277         $(VBOX_JAVAC) $(JAVAC_OPTS) @$(VBOX_JXPCOM_GEN)/jxpcomgen.list \
     254        $(VBOX_JAVAC) $(VBOX_JAVAC_OPTS) @$(VBOX_JXPCOM_GEN)/jxpcomgen.list \
    278255                -d $(VBOX_JXPCOM_JDEST) -classpath $(VBOX_JXPCOM_JDEST)
    279256        $(call MSG_TOOL,javac,$(notdir $@),...,)
    280         $(VBOX_JAVAC) $(JAVAC_OPTS) \
     257        $(VBOX_JAVAC) $(VBOX_JAVAC_OPTS) \
    281258                $(VBOX_JXPCOM_JAR_SRC) \
    282259                $(VBOX_JXPCOM_NSERROR) \
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette