< prev index next >

jdk/make/CompileJavaClasses.gmk

Print this page

        

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, 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.  Oracle designates this

@@ -52,10 +52,18 @@
 ifdef OPENJDK
   EXCLUDES += sun/dc \
       com/sun/jmx/snmp \
       sun/management/snmp \
       com/sun/script
+
+  # AccessBridge is compiled separately below.
+  EXFILES += AccessBridge.java \
+    AccessBridgeLoader.java \
+    com/sun/java/accessibility/util/java/awt/ChoiceTranslator.java
+  # This seems to never be built
+  EXCLUDES += com/sun/java/accessibility/extensions
+
 endif
 
 ifndef OPENJDK
   # There exists two versions of these files...
   EXFILES += $(JDK_TOPDIR)/src/share/classes/javax/crypto/JarVerifier.java

@@ -63,16 +71,10 @@
   ifeq ($(OPENJDK_TARGET_OS), windows)
     # This gets built on unix platforms implicitly in the old build even though
     # it's excluded in the closed build.
     EXCLUDES += sun/java2d/pisces
 
-    # AccessBridge is compiled separately below.
-    EXFILES += AccessBridge.java \
-        AccessBridgeLoader.java \
-        com/sun/java/accessibility/util/java/awt/ChoiceTranslator.java
-    # This seems to never be built
-    EXCLUDES += com/sun/java/accessibility/extensions
   endif
 
 endif
 
 ifneq ($(OPENJDK_TARGET_OS), solaris)

@@ -269,12 +271,16 @@
 # Acquire a list of files that should be copied straight over to the classes.
 include CopyIntoClasses.gmk
 # Now we have COPY_PATTERNS, COPY_FILES and COPY_EXTRA
 
 ifndef OPENJDK
+  ifeq ($(OPENJDK_TARGET_OS), windows) 
+    CLOSED_SRC_DIRS := $(JDK_TOPDIR)/src/closed/share/classes
+  else
   CLOSED_SRC_DIRS := $(JDK_TOPDIR)/src/closed/share/classes \
       $(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS_API_DIR)/classes
+  endif
 endif
 
 MACOSX_SRC_DIRS :=
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/classes

@@ -377,11 +383,11 @@
 ##########################################################################################
 
 
 ##########################################################################################
 
-ifndef OPENJDK
+ifdef OPENJDK
   ifeq ($(OPENJDK_TARGET_OS), windows)
     ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
       $(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_32, \
           SETUP := GENERATE_JDKBYTECODE, \
           JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \
< prev index next >