< prev index next >

make/common/JavaCompilation.gmk

Print this page

        

*** 343,353 **** $$(eval $$(call ListPathsSafely,$1_SRCS, $$@.tmp)) ifneq ($$($1_SJAVAC_ARGS_FILE), ) $$(eval $$(call ListPathsSafely,$1_SJAVAC_ARGS_STRING, $$($1_SJAVAC_ARGS_FILE))) endif $(ECHO) Compiling $1 ! $(call LogFailures, $$($1_BIN)/_the.$$($1_SAFE_NAME)_batch.log, $$($1_SAFE_NAME), \ $$($1_JVM) $$($1_SJAVAC) \ $$($1_REMOTE) \ -j 1 \ --permit-unidentified-artifacts \ --permit-sources-without-package \ --- 343,353 ---- $$(eval $$(call ListPathsSafely,$1_SRCS, $$@.tmp)) ifneq ($$($1_SJAVAC_ARGS_FILE), ) $$(eval $$(call ListPathsSafely,$1_SJAVAC_ARGS_STRING, $$($1_SJAVAC_ARGS_FILE))) endif $(ECHO) Compiling $1 ! $(call LogFailures, $$($1_BIN)/_the.$$($1_SAFE_NAME)_batch, $$($1_SAFE_NAME), \ $$($1_JVM) $$($1_SJAVAC) \ $$($1_REMOTE) \ -j 1 \ --permit-unidentified-artifacts \ --permit-sources-without-package \
*** 407,417 **** # When not using sjavac, pass along all sources to javac using an @file. $$($1_COMPILE_TARGET): $$($1_SRCS) $$($1_DEPENDS) $$($1_VARDEPS_FILE) $(MKDIR) -p $$(@D) $$(eval $$(call ListPathsSafely,$1_SRCS, $$@.tmp)) $(ECHO) Compiling `$(WC) $$@.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1 ! $(call LogFailures, $$($1_BIN)/_the.$$($1_SAFE_NAME)_batch.log, $$($1_SAFE_NAME), \ $$($1_JVM) $$($1_JAVAC_CMD) $$($1_FLAGS) \ -implicit:none \ -d $$($1_BIN) $$($1_HEADERS_ARG) @$$@.tmp) && \ $(MV) $$@.tmp $$@ endif --- 407,417 ---- # When not using sjavac, pass along all sources to javac using an @file. $$($1_COMPILE_TARGET): $$($1_SRCS) $$($1_DEPENDS) $$($1_VARDEPS_FILE) $(MKDIR) -p $$(@D) $$(eval $$(call ListPathsSafely,$1_SRCS, $$@.tmp)) $(ECHO) Compiling `$(WC) $$@.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1 ! $(call LogFailures, $$($1_BIN)/_the.$$($1_SAFE_NAME)_batch, $$($1_SAFE_NAME), \ $$($1_JVM) $$($1_JAVAC_CMD) $$($1_FLAGS) \ -implicit:none \ -d $$($1_BIN) $$($1_HEADERS_ARG) @$$@.tmp) && \ $(MV) $$@.tmp $$@ endif
< prev index next >