make-rules/ant.mk
changeset 3558 2cec274f17fc
parent 2164 b580bc10e31a
child 3817 30b42c38bbc4
equal deleted inserted replaced
3557:39d5a85cfd14 3558:2cec274f17fc
    44 	(cd $(@D) ; $(ENV) $(COMPONENT_INSTALL_ENV) \
    44 	(cd $(@D) ; $(ENV) $(COMPONENT_INSTALL_ENV) \
    45 		$(ANT) $(COMPONENT_INSTALL_ARGS) $(COMPONENT_INSTALL_TARGETS))
    45 		$(ANT) $(COMPONENT_INSTALL_ARGS) $(COMPONENT_INSTALL_TARGETS))
    46 	$(COMPONENT_POST_INSTALL_ACTION)
    46 	$(COMPONENT_POST_INSTALL_ACTION)
    47 	$(TOUCH) [email protected]
    47 	$(TOUCH) [email protected]
    48 
    48 
       
    49 COMPONENT_TEST_ENV_CMD = $(ENV)
    49 COMPONENT_TEST_ENV += JAVA_HOME="$(JAVA_HOME)"
    50 COMPONENT_TEST_ENV += JAVA_HOME="$(JAVA_HOME)"
    50 COMPONENT_TEST_CMD = $(ANT)
    51 COMPONENT_TEST_CMD = $(ANT)
       
    52 
    51 # test the built source
    53 # test the built source
    52 $(BUILD_DIR)/%/.tested: $(BUILD_DIR)/%/.built
    54 $(BUILD_DIR)/%/.tested-and-compared:    $(BUILD_DIR)/%/.built
    53 	$(COMPONENT_PRE_TEST_ACTION)
    55 	$(COMPONENT_PRE_TEST_ACTION)
    54 	(cd $(COMPONENT_TEST_DIR) ; $(ENV) $(COMPONENT_TEST_ENV) \
    56 	-(cd $(COMPONENT_TEST_DIR) ; \
       
    57 		$(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \
    55 		$(COMPONENT_TEST_CMD) \
    58 		$(COMPONENT_TEST_CMD) \
    56 			$(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))
    59 		$(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS)) \
       
    60 		&> $(COMPONENT_TEST_OUTPUT)
    57 	$(COMPONENT_POST_TEST_ACTION)
    61 	$(COMPONENT_POST_TEST_ACTION)
       
    62 	$(COMPONENT_TEST_CREATE_TRANSFORMS)
       
    63 	$(COMPONENT_TEST_PERFORM_TRANSFORM)
       
    64 	$(COMPONENT_TEST_COMPARE)
       
    65 	$(COMPONENT_TEST_CLEANUP)
       
    66 	$(TOUCH) [email protected]
       
    67 
       
    68 $(BUILD_DIR)/%/.tested:    $(BUILD_DIR)/%/.built
       
    69 	$(COMPONENT_PRE_TEST_ACTION)
       
    70 	(cd $(COMPONENT_TEST_DIR) ; \
       
    71 		$(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \
       
    72 		$(COMPONENT_TEST_CMD) \
       
    73 		$(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))
       
    74 	$(COMPONENT_POST_TEST_ACTION)
       
    75 	$(COMPONENT_TEST_CLEANUP)
    58 	$(TOUCH) [email protected]
    76 	$(TOUCH) [email protected]
    59 
    77 
    60 ifeq   ($(strip $(PARFAIT_BUILD)),yes)
    78 ifeq   ($(strip $(PARFAIT_BUILD)),yes)
    61 parfait: build
    79 parfait: build
    62 else
    80 else