equal
deleted
inserted
replaced
152 endif |
152 endif |
153 |
153 |
154 ifeq ($(BUILD_DEPLOY), true) |
154 ifeq ($(BUILD_DEPLOY), true) |
155 generic_build_repo_series:: $(DEPLOY) |
155 generic_build_repo_series:: $(DEPLOY) |
156 clobber:: deploy-clobber |
156 clobber:: deploy-clobber |
157 endif |
|
158 |
|
159 ifeq ($(BUILD_JDK), true) |
|
160 ifeq ($(BUNDLE_RULES_AVAILABLE), true) |
|
161 generic_build_repo_series:: openjdk-binary-plugs-bundles |
|
162 endif |
|
163 endif |
157 endif |
164 |
158 |
165 # The debug build, fastdebug or debug. Needs special handling. |
159 # The debug build, fastdebug or debug. Needs special handling. |
166 # Note that debug builds do NOT do INSTALL steps, but must be done |
160 # Note that debug builds do NOT do INSTALL steps, but must be done |
167 # after the product build and before the INSTALL step of the product build. |
161 # after the product build and before the INSTALL step of the product build. |
299 |
293 |
300 ifneq ($(SKIP_OPENJDK_BUILD), true) |
294 ifneq ($(SKIP_OPENJDK_BUILD), true) |
301 ifeq ($(BUILD_JDK), true) |
295 ifeq ($(BUILD_JDK), true) |
302 ifeq ($(BUNDLE_RULES_AVAILABLE), true) |
296 ifeq ($(BUNDLE_RULES_AVAILABLE), true) |
303 |
297 |
304 OPENJDK_PLUGS=$(ABS_OUTPUTDIR)/$(OPENJDK_BINARY_PLUGS_INAME) |
|
305 OPENJDK_OUTPUTDIR=$(ABS_OUTPUTDIR)/open-output |
298 OPENJDK_OUTPUTDIR=$(ABS_OUTPUTDIR)/open-output |
306 OPENJDK_BUILD_NAME \ |
299 OPENJDK_BUILD_NAME \ |
307 = openjdk-$(JDK_MINOR_VERSION)-$(BUILD_NUMBER)-$(PLATFORM)-$(ARCH)-$(BUNDLE_DATE) |
300 = openjdk-$(JDK_MINOR_VERSION)-$(BUILD_NUMBER)-$(PLATFORM)-$(ARCH)-$(BUNDLE_DATE) |
308 OPENJDK_BUILD_BINARY_ZIP=$(ABS_BIN_BUNDLEDIR)/$(OPENJDK_BUILD_NAME).zip |
301 OPENJDK_BUILD_BINARY_ZIP=$(ABS_BIN_BUNDLEDIR)/$(OPENJDK_BUILD_NAME).zip |
309 BUILT_IMAGE=$(ABS_OUTPUTDIR)/j2sdk-image |
302 BUILT_IMAGE=$(ABS_OUTPUTDIR)/j2sdk-image |
328 ($(CD) $(OPENJDK_BUILDDIR) && $(MAKE) \ |
321 ($(CD) $(OPENJDK_BUILDDIR) && $(MAKE) \ |
329 OPENJDK=true \ |
322 OPENJDK=true \ |
330 GENERATE_DOCS=false \ |
323 GENERATE_DOCS=false \ |
331 ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR) \ |
324 ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR) \ |
332 ALT_OUTPUTDIR=$(OPENJDK_OUTPUTDIR) \ |
325 ALT_OUTPUTDIR=$(OPENJDK_OUTPUTDIR) \ |
333 ALT_BINARY_PLUGS_PATH=$(OPENJDK_PLUGS) \ |
|
334 ALT_BOOTDIR=$(OPENJDK_BOOTDIR) \ |
326 ALT_BOOTDIR=$(OPENJDK_BOOTDIR) \ |
335 ALT_JDK_IMPORT_PATH=$(OPENJDK_IMPORTJDK) \ |
327 ALT_JDK_IMPORT_PATH=$(OPENJDK_IMPORTJDK) \ |
336 product_build ) |
328 product_build ) |
337 $(RM) $(OPENJDK_BUILD_BINARY_ZIP) |
329 $(RM) $(OPENJDK_BUILD_BINARY_ZIP) |
338 ( $(CD) $(OPENJDK_OUTPUTDIR)/j2sdk-image && \ |
330 ( $(CD) $(OPENJDK_OUTPUTDIR)/j2sdk-image && \ |
454 COMPILER_PATH.desc = Compiler install directory |
446 COMPILER_PATH.desc = Compiler install directory |
455 CACERTS_FILE.desc = Location of certificates file |
447 CACERTS_FILE.desc = Location of certificates file |
456 DEVTOOLS_PATH.desc = Directory containing zip and gnumake |
448 DEVTOOLS_PATH.desc = Directory containing zip and gnumake |
457 CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files |
449 CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files |
458 DXSDK_PATH.desc = Root directory of DirectX SDK |
450 DXSDK_PATH.desc = Root directory of DirectX SDK |
459 MSDEVTOOLS_PATH.desc = Root directory of VC++ tools (e.g. rc.exe) |
|
460 MSVCRT_DLL_PATH.desc = Directory containing mscvrt.dll |
451 MSVCRT_DLL_PATH.desc = Directory containing mscvrt.dll |
461 |
452 |
462 # Make variables to print out (description and value) |
453 # Make variables to print out (description and value) |
463 VARIABLE_PRINTVAL_LIST += \ |
454 VARIABLE_PRINTVAL_LIST += \ |
464 OUTPUTDIR \ |
455 OUTPUTDIR \ |
485 # Some are windows specific |
476 # Some are windows specific |
486 ifeq ($(PLATFORM), windows) |
477 ifeq ($(PLATFORM), windows) |
487 |
478 |
488 VARIABLE_PRINTVAL_LIST += \ |
479 VARIABLE_PRINTVAL_LIST += \ |
489 DXSDK_PATH \ |
480 DXSDK_PATH \ |
490 MSDEVTOOLS_PATH \ |
|
491 MSVCRT_DLL_PATH |
481 MSVCRT_DLL_PATH |
492 |
482 |
493 VARIABLE_CHECKDIR_LIST += \ |
483 VARIABLE_CHECKDIR_LIST += \ |
494 DXSDK_PATH \ |
484 DXSDK_PATH \ |
495 MSDEVTOOLS_PATH \ |
|
496 MSVCRT_DLL_PATH |
485 MSVCRT_DLL_PATH |
497 |
486 |
498 endif |
487 endif |
499 |
488 |
500 # For pattern rules below, so all are treated the same |
489 # For pattern rules below, so all are treated the same |
546 $(MAKE) ALT_BOOTDIR=/opt/java/jdk1.5.0 \n\ |
535 $(MAKE) ALT_BOOTDIR=/opt/java/jdk1.5.0 \n\ |
547 $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk1.6.0 \n\ |
536 $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk1.6.0 \n\ |
548 " |
537 " |
549 |
538 |
550 ################################################################ |
539 ################################################################ |
551 # Source and binary plug bundling |
540 # Source bundling |
552 ################################################################ |
541 ################################################################ |
553 ifeq ($(BUNDLE_RULES_AVAILABLE), true) |
542 ifeq ($(BUNDLE_RULES_AVAILABLE), true) |
554 include $(BUNDLE_RULES) |
543 include $(BUNDLE_RULES) |
555 endif |
544 endif |
556 |
545 |