Changeset 29759 in vbox
- Timestamp:
- May 24, 2010 9:22:00 AM (15 years ago)
- svn:sync-xref-src-repo-rev:
- 61953
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r29715 r29759 4282 4282 VBOX_XIDL_FILE = $(PATH_OUT)/obj/VirtualBox_stripped.xidl 4283 4283 4284 # Java stuff, move to tools eventually 4285 ifeq ($(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 4291 else 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) 4306 endif 4307 VBOX_JAVAC_OPTS = -source 1.5 -target 1.5 4284 4308 4285 4309 # -
trunk/src/libs/xpcom18a4/java/Makefile.kmk
r29757 r29759 26 26 VBOX_JXPCOM_SRC := $(PATH_SUB_CURRENT) 27 27 28 ifeq ($(KBUILD_TARGET), darwin)29 VBOX_JAVA_HOME = /System/Library/Frameworks/JavaVM.framework/Versions/1.6.030 VBOX_JAVAC = $(VBOX_JAVA_HOME)/Commands/javac31 VBOX_JAVAH = $(VBOX_JAVA_HOME)/Commands/javah32 VBOX_JAR = $(VBOX_JAVA_HOME)/Commands/jar33 VBOX_JAVA_INC = $(VBOX_JAVA_HOME)/Headers34 else35 ifeq ($(KBUILD_TARGET), linux)36 VBOX_JAVA_HOME ?= /usr/lib/jvm/java-6-sun37 endif38 ifeq ($(KBUILD_TARGET), solaris)39 # VBOX_JAVA_HOME ?= /usr/jdk/jdk1.6.040 VBOX_JAVA_HOME ?= /usr/java41 endif42 VBOX_JAVAC = $(VBOX_JAVA_HOME)/bin/javac43 VBOX_JAVAH = $(VBOX_JAVA_HOME)/bin/javah44 VBOX_JAR = $(VBOX_JAVA_HOME)/bin/jar45 # correct for targets we care about46 VBOX_MD_OS = $(KBUILD_TARGET)47 VBOX_JAVA_INC = $(VBOX_JAVA_HOME)/include \48 $(VBOX_JAVA_HOME)/include/$(VBOX_MD_OS)49 endif50 JAVAC_OPTS = -source 1.5 -target 1.551 52 28 VBOX_JXPCOM_TARGET := $(PATH_TARGET)/vboxjxpcom-gen 53 29 VBOX_JXPCOM_JDEST := $(VBOX_JXPCOM_TARGET)/jdest 54 30 55 VBOX_ XSLT_DIR := $(PATH_ROOT)/src/VBox/Main/glue31 VBOX_GLUE_XSLT_DIR := $(PATH_ROOT)/src/VBox/Main/glue 56 32 57 33 # … … 170 146 $(VBOX_JXPCOM_JAR) \ 171 147 $(VBOX_JXPCOM_NSERROR) \ 172 $(VBOX_JXPCOM_GEN)/jxpcomgen.list \ 148 $(VBOX_JXPCOM_GEN)/jxpcomgen.list \ 149 $(VBOX_JXPCOM_GEN)/jxpcomglue.list \ 173 150 $(wildcard \ 174 151 $(VBOX_JXPCOM_GEN)/java/*.java \ 152 $(VBOX_JXPCOM_GEN)/java/glue/*.java \ 175 153 $(VBOX_JXPCOM_JDEST)/*.class \ 176 154 $(VBOX_JXPCOM_JDEST)/*/*.class \ … … 181 159 ) 182 160 VBoxJXpcom-inst-jar_BLDDIRS += $(VBOX_JXPCOM_GEN)/java $(VBOX_JXPCOM_GEN)/java/glue 183 184 161 185 162 # … … 235 212 $(VBOX_JXPCOM_GEN)/jxpcomglue.list: \ 236 213 $(VBOX_XIDL_FILE) \ 237 $(VBOX_ XSLT_DIR)/glue-java.xsl \214 $(VBOX_GLUE_XSLT_DIR)/glue-java.xsl \ 238 215 $$(TARGET_filesplitter) \ 239 216 | $(VBOX_JXPCOM_GEN)/java/glue/ 240 217 $(call MSG_L1,Generating Java glue files from XIDL) 241 218 $(QUIET)$(RM) -f $(wildcard $(VBOX_JXPCOM_GEN)/java/glue/*.java) 242 $(QUIET)$(VBOX_XSLTPROC) $(VBOXWEB_XSLTPROC_VERBOSE)\219 $(QUIET)$(VBOX_XSLTPROC) \ 243 220 --stringparam G_vboxApiSuffix $(VBOX_API_SUFFIX) \ 244 221 --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 $< 246 223 $(QUIET)$(VBOX_FILESPLIT) $(VBOX_JXPCOM_GEN)/java/glue/merged.file $(VBOX_JXPCOM_GEN)/java/glue/ 247 224 $(QUIET)echo $(VBOX_JXPCOM_GEN)/java/glue/*.java > $@ … … 275 252 $(QUIET)$(RM) -Rf $(VBOX_JXPCOM_JDEST) 276 253 $(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 \ 278 255 -d $(VBOX_JXPCOM_JDEST) -classpath $(VBOX_JXPCOM_JDEST) 279 256 $(call MSG_TOOL,javac,$(notdir $@),...,) 280 $(VBOX_JAVAC) $( JAVAC_OPTS) \257 $(VBOX_JAVAC) $(VBOX_JAVAC_OPTS) \ 281 258 $(VBOX_JXPCOM_JAR_SRC) \ 282 259 $(VBOX_JXPCOM_NSERROR) \
Note:
See TracChangeset
for help on using the changeset viewer.