make/windows/makefiles/generated.make

*** 1,7 ****
  #
! # Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
--- 1,7 ----
  #
! # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
*** 21,99 ****
  # questions.
  #  
  #
  
  !include ../local.make
! !include $(WorkSpace)/make/windows/makefiles/makedeps.make
  !include local.make
  
  # Pick up rules for building JVMTI (JSR-163)
  JvmtiOutDir=jvmtifiles
  !include $(WorkSpace)/make/windows/makefiles/jvmti.make
  
  # Pick up rules for building SA
  !include $(WorkSpace)/make/windows/makefiles/sa.make
  
  !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered")
! default:: includeDB.current Dependencies incls/ad_$(Platform_arch_model).cpp incls/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles)
  !else
! default:: includeDB.current Dependencies $(JvmtiGeneratedFiles)
  !endif
  
! # core plus serial gc
! IncludeDBs_base=$(WorkSpace)/src/share/vm/includeDB_core \
!            $(WorkSpace)/src/share/vm/includeDB_jvmti \
!            $(WorkSpace)/src/share/vm/includeDB_gc \
!            $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_serial
! 
! # parallel gc
! IncludeDBs_gc= $(WorkSpace)/src/share/vm/includeDB_gc_parallel \
!            $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge \
!            $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_shared \
!            $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parNew \
!            $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep \
!            $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_g1
  
! IncludeDBs_core=$(IncludeDBs_base) $(IncludeDBs_gc) \
!                 $(WorkSpace)/src/share/vm/includeDB_features
! 
! !if "$(Variant)" == "core"
! IncludeDBs=$(IncludeDBs_core)
! !endif
! 
! !if "$(Variant)" == "kernel"
! IncludeDBs=$(IncludeDBs_base) $(WorkSpace)/src/share/vm/includeDB_compiler1
! !endif
! 
! !if "$(Variant)" == "compiler1"
! IncludeDBs=$(IncludeDBs_core) $(WorkSpace)/src/share/vm/includeDB_compiler1
! !endif
! 
! 
! !if "$(Variant)" == "compiler2"
! IncludeDBs=$(IncludeDBs_core) $(WorkSpace)/src/share/vm/includeDB_compiler2
! !endif
! 
! !if "$(Variant)" == "tiered"
! IncludeDBs=$(IncludeDBs_core) $(WorkSpace)/src/share/vm/includeDB_compiler1 \
!            $(WorkSpace)/src/share/vm/includeDB_compiler2
! !endif
! 
! # Note we don't generate a Visual C++ project file using MakeDeps for
! # the batch build.
! includeDB.current Dependencies: classes/MakeDeps.class $(IncludeDBs)
!         cat $(IncludeDBs) > includeDB
!         if exist incls rmdir /s /q incls
!         mkdir incls
!         $(RUN_JAVA) -Djava.class.path=classes MakeDeps WinGammaPlatform$(VcVersion) $(WorkSpace)/make/windows/platform_$(BUILDARCH) includeDB $(MakeDepsOptions)
!         rm -f includeDB.current
!         cp includeDB includeDB.current
! 
! classes/MakeDeps.class: $(MakeDepsSources)
          if exist classes rmdir /s /q classes
          mkdir classes
!         $(COMPILE_JAVAC) -classpath $(WorkSpace)\src\share\tools\MakeDeps -d classes $(MakeDepsSources)
  
  !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered")
  
  !include $(WorkSpace)/make/windows/makefiles/adlc.make
  
--- 21,53 ----
  # questions.
  #  
  #
  
  !include ../local.make
! !include $(WorkSpace)/make/windows/makefiles/projectcreator.make
  !include local.make
  
  # Pick up rules for building JVMTI (JSR-163)
  JvmtiOutDir=jvmtifiles
  !include $(WorkSpace)/make/windows/makefiles/jvmti.make
  
  # Pick up rules for building SA
  !include $(WorkSpace)/make/windows/makefiles/sa.make
  
  !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered")
! default:: adfiles/ad_$(Platform_arch_model).cpp adfiles/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles) buildobjfiles
  !else
! default:: $(JvmtiGeneratedFiles) buildobjfiles
  !endif
  
! buildobjfiles:
!         @ sh $(WorkSpace)/make/windows/create_obj_files.sh $(Variant) $(Platform_arch) $(Platform_arch_model) $(WorkSpace) .    > objfiles.make
  
! classes/ProjectCreator.class: $(ProjectCreatorSources)
          if exist classes rmdir /s /q classes
          mkdir classes
!         $(COMPILE_JAVAC) -classpath $(WorkSpace)\src\share\tools\ProjectCreator -d classes $(ProjectCreatorSources)
  
  !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered")
  
  !include $(WorkSpace)/make/windows/makefiles/adlc.make