Changeset 309 for trunk/openjdk/hotspot/make/windows/projectfiles

Timestamp:

Feb 13, 2012, 10:07:12 PM (14 years ago)

Author:

dmik

Message:

trunk: Merged in openjdk6 b24 from branches/vendor/oracle.

Location:

trunk/openjdk

Files:

• . (modified) (1 prop)
• hotspot/make/windows/projectfiles/common/Makefile (modified) (7 diffs)
• hotspot/make/windows/projectfiles/compiler1/Makefile (modified) (2 diffs)
• hotspot/make/windows/projectfiles/compiler1/vm.def (modified) (1 diff)
• hotspot/make/windows/projectfiles/compiler2/Makefile (modified) (2 diffs)
• hotspot/make/windows/projectfiles/compiler2/vm.def (modified) (1 diff)
• hotspot/make/windows/projectfiles/core/Makefile (modified) (2 diffs)
• hotspot/make/windows/projectfiles/core/vm.def (modified) (1 diff)
• hotspot/make/windows/projectfiles/kernel/Makefile (modified) (2 diffs)
• hotspot/make/windows/projectfiles/kernel/vm.def (modified) (1 diff)
• hotspot/make/windows/projectfiles/tiered/Makefile (modified) (2 diffs)
• hotspot/make/windows/projectfiles/tiered/vm.def (modified) (1 diff)

trunk/openjdk/hotspot/make/windows/projectfiles/common/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -23 +23 @@
 #
 
+!ifdef LOCAL_MAKE
+!include $(LOCAL_MAKE)
+!endif
+
+
 WorkSpace=$(HOTSPOTWORKSPACE)
 
@@ -33 +38 @@
 !ifdef JAVA_HOME
 BootStrapDir=$(JAVA_HOME)
+!else
+!ifdef HOTSPOTJDKDIST
+BootStrapDir=$(HOTSPOTJDKDIST)
+!endif
 !endif
 !endif
 !endif
 
-!include $(HOTSPOTWORKSPACE)/make/windows/makefiles/makedeps.make
+
+
+!include $(HOTSPOTWORKSPACE)/make/windows/makefiles/projectcreator.make
+!include $(WorkSpace)/make/windows/makefiles/compile.make
 
 # Pick up rules for building JVMTI (JSR-163)
-JvmtiOutDir=$(HOTSPOTBUILDSPACE)\jvmtifiles
+JvmtiOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\jvmtifiles
 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/jvmti.make
 
 Platform=$(HOTSPOTWORKSPACE)/make/windows/platform_$(BUILDARCH)
 
-default:: $(AdditionalTargets) $(JvmtiGeneratedFiles)
-
-IncludeDBs_base=$(HOTSPOTWORKSPACE)/src/share/vm/includeDB_core  \
-                $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_jvmti \
-                $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_gc    \
-                $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_serial
-
-# Parallel gc files
-IncludeDBs_gc=$(HOTSPOTWORKSPACE)/src/share/vm/includeDB_gc_parallel       \
-    $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_shared \
-    $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_parNew \
-    $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge \
-    $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep \
-    $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_g1
-
-
-IncludeDBs_kernel =$(IncludeDBs_base) \
-                    $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler1
-
-IncludeDBs_core =$(IncludeDBs_base) $(IncludeDBs_gc) \
-                 $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_features
-
-IncludeDBs_compiler1=$(IncludeDBs_core) \
-                     $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler1
-
-IncludeDBs_compiler2=$(IncludeDBs_core) \
-                    $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler2
-
-IncludeDBs_tiered=$(IncludeDBs_core) \
-                    $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler1 \
-                    $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler2
-
-
-!if "$(Variant)" == "compiler1"
-IncludeDBs = $(IncludeDBs_compiler1)
-!endif
-
 !if "$(Variant)" == "compiler2"
-IncludeDBs = $(IncludeDBs_compiler2)
 # Pick up rules for building adlc
 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make
@@ -89 +63 @@
 
 !if "$(Variant)" == "tiered"
-IncludeDBs = $(IncludeDBs_tiered)
 # Pick up rules for building adlc
 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make
 !endif
 
-!if "$(Variant)" == "core"
-IncludeDBs = $(IncludeDBs_core)
-!endif
+HS_INTERNAL_NAME=jvm
+!include $(HOTSPOTWORKSPACE)/make/windows/makefiles/launcher.make
 
-!if "$(Variant)" == "kernel"
-IncludeDBs = $(IncludeDBs_kernel)
-!endif
+default:: $(AdditionalTargets) $(JvmtiGeneratedFiles)
 
 !include $(HOTSPOTWORKSPACE)/make/hotspot_version
@@ -109 +79 @@
 HOTSPOT_RELEASE_VERSION="$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER)"
 !endif
+!if "$(USER_RELEASE_SUFFIX)" != ""
+HOTSPOT_BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = internal-$(USER_RELEASE_SUFFIX)
+!else
 HOTSPOT_BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = internal
+!endif
 !if "$(HOTSPOT_BUILD_VERSION)" != ""
 HOTSPOT_RELEASE_VERSION="$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION)"
@@ -131 +105 @@
 !endif
 
-MakeDepsIDEOptions =       $(MakeDepsIDEOptions) \
-      -includeDB_kernel    $(HOTSPOTBUILDSPACE)\includeDB_kernel \
-      -includeDB_core      $(HOTSPOTBUILDSPACE)\includeDB_core \
-      -includeDB_compiler1 $(HOTSPOTBUILDSPACE)\includeDB_compiler1 \
-      -includeDB_compiler2 $(HOTSPOTBUILDSPACE)\includeDB_compiler2 \
-      -includeDB_tiered    $(HOTSPOTBUILDSPACE)\includeDB_tiered \
+ProjectCreatorIDEOptions =       $(ProjectCreatorIDEOptions) \
       -platform            $(Platform) \
       -define              HOTSPOT_RELEASE_VERSION=\\\"$(HOTSPOT_RELEASE_VERSION)\\\" \
@@ -142 +111 @@
       -define              HOTSPOT_VM_DISTRO=\\\"$(HOTSPOT_VM_DISTRO)\\\"
 
-incls:
-        @mkdir incls
-
-includeDB.current $(ProjectFile) Dependencies: local.make $(HOTSPOTBUILDSPACE)/classes/MakeDeps.class \
-                                               $(IncludeDBs) incls
-        @rm -f includeDB $(HOTSPOTBUILDSPACE)\includeDB_kernel \
-                         $(HOTSPOTBUILDSPACE)\includeDB_core \
-                         $(HOTSPOTBUILDSPACE)\includeDB_compiler1 \
-                         $(HOTSPOTBUILDSPACE)\includeDB_compiler2 \
-                         $(HOTSPOTBUILDSPACE)\includeDB_tiered
-        @cat $(IncludeDBs_kernel) > $(HOTSPOTBUILDSPACE)\includeDB_kernel
-        @cat $(IncludeDBs_core) > $(HOTSPOTBUILDSPACE)\includeDB_core
-        @cat $(IncludeDBs_compiler1)   > $(HOTSPOTBUILDSPACE)\includeDB_compiler1
-        @cat $(IncludeDBs_compiler2)   > $(HOTSPOTBUILDSPACE)\includeDB_compiler2
-        @cat $(IncludeDBs_tiered)      > $(HOTSPOTBUILDSPACE)\includeDB_tiered
-        @echo java.cpp jni.h >  includeDB
-        @$(RUN_JAVA) -Djava.class.path=$(HOTSPOTBUILDSPACE)/classes MakeDeps diffs WinGammaPlatform$(VcVersion) \
-                  $(Platform) includeDB.current $(Platform) includeDB $(MakeDepsOptions) $(MakeDepsIDEOptions)
-        @rm -f includeDB.current
-        @cp includeDB includeDB.current
-
-lists: $(HOTSPOTBUILDSPACE)/classes/MakeDeps.class FORCE
-        @if exist incls rmdir /s /q incls
-        @rm -f includeDB
-        @cat $(IncludeDBs) > includeDB
-        @mkdir incls
-        @$(RUN_JAVA) -Djava.class.path=$(HOTSPOTBUILDSPACE)/classes MakeDeps WinGammaPlatform$(VcVersion) \
-                 $(Platform) includeDB $(MakeDepsOptions) $(MakeDepsIDEOptions)
-        @rm -f includeDB.current
-        @cp includeDB includeDB.current
+$(HOTSPOTBUILDROOT)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class
+        @$(RUN_JAVA) -Djava.class.path=$(HOTSPOTBUILDSPACE)/classes ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions)
 
 clean:
-        @rm -rf incls $(HOTSPOTBUILDSPACE)/classes
-        @rm -f includeDB includeDB.current $(ProjectFile) Dependencies
+        @rm -rf $(HOTSPOTBUILDSPACE)/classes
+        @rm -r ../$(ProjectFile)
 
-$(HOTSPOTBUILDSPACE)/classes/MakeDeps.class: $(MakeDepsSources)
+$(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class: $(ProjectCreatorSources)
         @if exist $(HOTSPOTBUILDSPACE)\classes rmdir /s /q $(HOTSPOTBUILDSPACE)\classes
         @mkdir $(HOTSPOTBUILDSPACE)\classes
-        @$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\MakeDeps -d $(HOTSPOTBUILDSPACE)/classes $(MakeDepsSources)
+        @$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\ProjectCreator -d $(HOTSPOTBUILDSPACE)/classes $(ProjectCreatorSources)
 
 FORCE:

trunk/openjdk/hotspot/make/windows/projectfiles/compiler1/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -23 +23 @@
 #
 
-Variant=compiler1
-!include local.make
+!include ../local.make
 
 !include $(HOTSPOTWORKSPACE)/make/windows/projectfiles/common/Makefile

trunk/openjdk/hotspot/make/windows/projectfiles/compiler1/vm.def

@@ -3 +3 @@
 ; generated during the build process. See
 ; make\windows\build_vm_def.sh and
-; make\windows\makefiles\makedeps.make (esp. the "-prelink"
+; make\windows\makefiles\projectcreator.make (esp. the "-prelink"
 ; options).
 ;

trunk/openjdk/hotspot/make/windows/projectfiles/compiler2/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -23 +23 @@
 #
 
-Variant=compiler2
-!include local.make
-AdditionalTargets=incls/ad_$(Platform_arch_model).cpp incls/dfa_$(Platform_arch_model).cpp
+!include ../local.make
+AdlcOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\adfiles
+AdditionalTargets=$(AdlcOutDir)\ad_$(Platform_arch_model).cpp $(AdlcOutDir)\dfa_$(Platform_arch_model).cpp
 
 !include $(HOTSPOTWORKSPACE)/make/windows/projectfiles/common/Makefile

trunk/openjdk/hotspot/make/windows/projectfiles/compiler2/vm.def

@@ -3 +3 @@
 ; generated during the build process. See
 ; make\windows\build_vm_def.sh and
-; make\windows\makefiles\makedeps.make (esp. the "-prelink"
+; make\windows\makefiles\projectcreator.make (esp. the "-prelink"
 ; options).
 ;

trunk/openjdk/hotspot/make/windows/projectfiles/core/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -23 +23 @@
 #
 
-Variant=core
-!include local.make
+!include ../local.make
 
 !include $(HOTSPOTWORKSPACE)/make/windows/projectfiles/common/Makefile

trunk/openjdk/hotspot/make/windows/projectfiles/core/vm.def

@@ -3 +3 @@
 ; generated during the build process. See
 ; make\windows\build_vm_def.sh and
-; make\windows\makefiles\makedeps.make (esp. the "-prelink"
+; make\windows\makefiles\projectcreator.make (esp. the "-prelink"
 ; options).
 ;

trunk/openjdk/hotspot/make/windows/projectfiles/kernel/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010 Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #   
@@ -23 +23 @@
 #
 
-Variant=compiler1
-!include local.make
+!include ../local.make
 
 !include $(HOTSPOTWORKSPACE)/make/windows/projectfiles/common/Makefile

trunk/openjdk/hotspot/make/windows/projectfiles/kernel/vm.def

@@ -3 +3 @@
 ; generated during the build process. See
 ; make\windows\build_vm_def.sh and
-; make\windows\makefiles\makedeps.make (esp. the "-prelink"
+; make\windows\makefiles\projectcreator.make (esp. the "-prelink"
 ; options).
 ;

trunk/openjdk/hotspot/make/windows/projectfiles/tiered/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -23 +23 @@
 #
 
-Variant=tiered
-!include local.make
-AdditionalTargets=incls/ad_$(Platform_arch_model).cpp incls/dfa_$(Platform_arch_model).cpp
+!include ../local.make
+AdlcOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\adfiles
+AdditionalTargets=$(AdlcOutDir)\ad_$(Platform_arch_model).cpp $(AdlcOutDir)\dfa_$(Platform_arch_model).cpp
 
 !include $(HOTSPOTWORKSPACE)/make/windows/projectfiles/common/Makefile

trunk/openjdk/hotspot/make/windows/projectfiles/tiered/vm.def

@@ -3 +3 @@
 ; generated during the build process. See
 ; make\windows\build_vm_def.sh and
-; make\windows\makefiles\makedeps.make (esp. the "-prelink"
+; make\windows\makefiles\projectcreator.make (esp. the "-prelink"
 ; options).
 ;