157 ifeq (,$$($1_SKIP_METAINF)) |
157 ifeq (,$$($1_SKIP_METAINF)) |
158 $1_DEPS+=$$(call CacheFind,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS)))) |
158 $1_DEPS+=$$(call CacheFind,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS)))) |
159 endif |
159 endif |
160 endif |
160 endif |
161 |
161 |
162 # Utility macros, to make the shell script receipt somewhat easier to dechipher. |
162 # Utility macros, to make the shell script receipt somewhat easier to decipher. |
163 |
163 |
164 # The capture contents macro finds all files (matching the patterns, typically |
164 # The capture contents macro finds all files (matching the patterns, typically |
165 # .class and .prp) that are newer than the jar-file, ie the new content to be put into the jar. |
165 # .class and .prp) that are newer than the jar-file, ie the new content to be put into the jar. |
166 $1_CAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS),\ |
166 $1_CAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS),\ |
167 (($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \ |
167 (($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \ |
518 $(MV) $$($1_BIN)/_the.batch.tmp $$($1_BIN)/_the.batch) |
518 $(MV) $$($1_BIN)/_the.batch.tmp $$($1_BIN)/_the.batch) |
519 else |
519 else |
520 # Using plain javac to batch compile everything. |
520 # Using plain javac to batch compile everything. |
521 $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.batch |
521 $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.batch |
522 |
522 |
523 # When buliding in batch, put headers in a temp dir to filter out those that actually |
523 # When building in batch, put headers in a temp dir to filter out those that actually |
524 # changed before copying them to the real header dir. |
524 # changed before copying them to the real header dir. |
525 ifneq (,$$($1_HEADERS)) |
525 ifneq (,$$($1_HEADERS)) |
526 $1_HEADERS_ARG := -h $$($1_HEADERS).tmp |
526 $1_HEADERS_ARG := -h $$($1_HEADERS).tmp |
527 |
527 |
528 $$($1_HEADERS)/_the.headers: $$($1_BIN)/_the.batch |
528 $$($1_HEADERS)/_the.headers: $$($1_BIN)/_the.batch |