41 $(eval $(call IncludeCustomExtension, CompileDemos-pre.gmk)) |
41 $(eval $(call IncludeCustomExtension, CompileDemos-pre.gmk)) |
42 |
42 |
43 # Prepare the find cache. |
43 # Prepare the find cache. |
44 DEMO_SRC_DIRS += $(TOPDIR)/src/demo |
44 DEMO_SRC_DIRS += $(TOPDIR)/src/demo |
45 |
45 |
46 $(eval $(call FillCacheFind, $(wildcard $(DEMO_SRC_DIRS)))) |
46 $(call FillFindCache, $(DEMO_SRC_DIRS)) |
47 |
47 |
48 # Append demo goals to this variable. |
48 # Append demo goals to this variable. |
49 TARGETS = |
49 TARGETS = |
50 |
50 |
51 # The demo structure and contents should really be cleaned up. |
51 # The demo structure and contents should really be cleaned up. |
240 $(CHMOD) -f ug+w $@ |
240 $(CHMOD) -f ug+w $@ |
241 |
241 |
242 ifeq ($(call isTargetOs, solaris), true) |
242 ifeq ($(call isTargetOs, solaris), true) |
243 TARGETS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \ |
243 TARGETS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \ |
244 $(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%, \ |
244 $(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%, \ |
245 $(call CacheFind, $(DEMO_SHARE_SRC)/nbproject)) |
245 $(call FindFiles, $(DEMO_SHARE_SRC)/nbproject)) |
246 else |
246 else |
247 TARGETS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \ |
247 TARGETS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \ |
248 $(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%, \ |
248 $(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%, \ |
249 $(call CacheFind, $(DEMO_SHARE_SRC)/nbproject)) |
249 $(call FindFiles, $(DEMO_SHARE_SRC)/nbproject)) |
250 endif |
250 endif |
251 |
251 |
252 ################################################################################ |
252 ################################################################################ |
253 |
253 |
254 ifneq ($(filter images, $(MAKECMDGOALS)), ) |
254 ifneq ($(filter images, $(MAKECMDGOALS)), ) |
255 $(eval $(call SetupCopyFiles, COPY_TO_TEST_IMAGE, \ |
255 $(eval $(call SetupCopyFiles, COPY_TO_TEST_IMAGE, \ |
256 SRC := $(SUPPORT_OUTPUTDIR)/demos/image, \ |
256 SRC := $(SUPPORT_OUTPUTDIR)/demos/image, \ |
257 DEST := $(TEST_IMAGE_DIR)/jdk/demos, \ |
257 DEST := $(TEST_IMAGE_DIR)/jdk/demos, \ |
258 FILES := $(call CacheFind, $(SUPPORT_OUTPUTDIR)/demos/image), \ |
258 FILES := $(call FindFiles, $(SUPPORT_OUTPUTDIR)/demos/image), \ |
259 )) |
259 )) |
260 |
260 |
261 IMAGES_TARGETS := $(COPY_TO_TEST_IMAGE) |
261 IMAGES_TARGETS := $(COPY_TO_TEST_IMAGE) |
262 endif |
262 endif |
263 |
263 |