1294 "" >> $(ERROR_FILE) ; \ 1295 fi 1296 install-previous-jre: $(PREV_JRE_IMAGE_DIR)/bin/java$(EXE_SUFFIX) 1297 install-previous-jdk: $(PREV_JDK_IMAGE_DIR)/bin/java$(EXE_SUFFIX) 1298 1299 # Create the jre comparison report 1300 $(TEMP_PREV_JRE_COMPARISON): install-previous-jre $(DIRDIFF_JARFILE) 1301 $(prep-target) 1302 $(BOOT_JAVA_CMD) -jar $(DIRDIFF_JARFILE) \ 1303 $(PREV_JRE_IMAGE_DIR) $(JRE_IMAGE_DIR) | $(SORT) > $@ 1304 @$(java-vm-cleanup) 1305 1306 # Create the jdk comparison report 1307 $(TEMP_PREV_JDK_COMPARISON): install-previous-jdk $(DIRDIFF_JARFILE) 1308 $(prep-target) 1309 $(BOOT_JAVA_CMD) -jar $(DIRDIFF_JARFILE) \ 1310 $(PREV_JDK_IMAGE_DIR) $(JDK_IMAGE_DIR) | $(SORT) > $@ 1311 @$(java-vm-cleanup) 1312 1313 # Clean up names in the messages printed out 1314 CAT_FILTER = $(SED) -e "s@$(JDK_IMAGE_DIR)@JDK_IMAGE@g" \ 1315 -e "s@$(JRE_IMAGE_DIR)@JRE_IMAGE@g" 1316 1317 # Report on the jre image comparison 1318 compare-image-jre: $(TEMP_PREV_JRE_COMPARISON) 1319 @$(ECHO) "JRE Image Comparison to version $(PREVIOUS_JDK_VERSION)" 1320 @$(ECHO) " Previous: $(PREV_JRE_IMAGE_DIR)" 1321 @$(ECHO) " Current: $(JRE_IMAGE_DIR)" 1322 @$(CAT) $< $(COMPARE_FILTER) | $(CAT_FILTER) 1323 ( $(ECHO) " " ; $(CAT) $< | $(CAT_FILTER) ; $(ECHO) " " ) >> $(WARNING_FILE) 1324 1325 # Report on the jdk image comparison 1326 compare-image-jdk: $(TEMP_PREV_JDK_COMPARISON) 1327 @$(ECHO) "JDK Image Comparison to version $(PREVIOUS_JDK_VERSION)" 1328 @$(ECHO) " Previous: $(PREV_JDK_IMAGE_DIR)" 1329 @$(ECHO) " Current: $(JDK_IMAGE_DIR)" 1330 $(CAT) $< $(COMPARE_FILTER) | $(CAT_FILTER) 1331 ( $(ECHO) " " ; $(CAT) $< | $(CAT_FILTER) ; $(ECHO) " " ) >> $(WARNING_FILE) 1332 1333 # Do both image comparisons 1334 compare-image:: compare-image-jre compare-image-jdk 1335 | 1294 "" >> $(ERROR_FILE) ; \ 1295 fi 1296 install-previous-jre: $(PREV_JRE_IMAGE_DIR)/bin/java$(EXE_SUFFIX) 1297 install-previous-jdk: $(PREV_JDK_IMAGE_DIR)/bin/java$(EXE_SUFFIX) 1298 1299 # Create the jre comparison report 1300 $(TEMP_PREV_JRE_COMPARISON): install-previous-jre $(DIRDIFF_JARFILE) 1301 $(prep-target) 1302 $(BOOT_JAVA_CMD) -jar $(DIRDIFF_JARFILE) \ 1303 $(PREV_JRE_IMAGE_DIR) $(JRE_IMAGE_DIR) | $(SORT) > $@ 1304 @$(java-vm-cleanup) 1305 1306 # Create the jdk comparison report 1307 $(TEMP_PREV_JDK_COMPARISON): install-previous-jdk $(DIRDIFF_JARFILE) 1308 $(prep-target) 1309 $(BOOT_JAVA_CMD) -jar $(DIRDIFF_JARFILE) \ 1310 $(PREV_JDK_IMAGE_DIR) $(JDK_IMAGE_DIR) | $(SORT) > $@ 1311 @$(java-vm-cleanup) 1312 1313 # Clean up names in the messages printed out 1314 CAT_FILTER = $(SED) -e "s|$(JDK_IMAGE_DIR)|JDK_IMAGE|g" \ 1315 -e "s|$(JRE_IMAGE_DIR)|JRE_IMAGE|g" 1316 1317 # Report on the jre image comparison 1318 compare-image-jre: $(TEMP_PREV_JRE_COMPARISON) 1319 @$(ECHO) "JRE Image Comparison to version $(PREVIOUS_JDK_VERSION)" 1320 @$(ECHO) " Previous: $(PREV_JRE_IMAGE_DIR)" 1321 @$(ECHO) " Current: $(JRE_IMAGE_DIR)" 1322 @$(CAT) $< $(COMPARE_FILTER) | $(CAT_FILTER) 1323 ( $(ECHO) " " ; $(CAT) $< | $(CAT_FILTER) ; $(ECHO) " " ) >> $(WARNING_FILE) 1324 1325 # Report on the jdk image comparison 1326 compare-image-jdk: $(TEMP_PREV_JDK_COMPARISON) 1327 @$(ECHO) "JDK Image Comparison to version $(PREVIOUS_JDK_VERSION)" 1328 @$(ECHO) " Previous: $(PREV_JDK_IMAGE_DIR)" 1329 @$(ECHO) " Current: $(JDK_IMAGE_DIR)" 1330 $(CAT) $< $(COMPARE_FILTER) | $(CAT_FILTER) 1331 ( $(ECHO) " " ; $(CAT) $< | $(CAT_FILTER) ; $(ECHO) " " ) >> $(WARNING_FILE) 1332 1333 # Do both image comparisons 1334 compare-image:: compare-image-jre compare-image-jdk 1335 |