Mercurial Mercurial > jdk-sandbox / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make/gensrc/Gensrc-java.desktop.gmk
changeset 47217 72e3ae9a25eb
parent 47216 71c04702a3d5
child 47314 743814386712 
--- a/make/gensrc/Gensrc-java.desktop.gmk	Tue Sep 12 19:03:39 2017 +0200
+++ b/make/gensrc/Gensrc-java.desktop.gmk	Tue Sep 12 19:03:56 2017 +0200
@@ -23,10 +23,10 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, gensrc/Gensrc-java.desktop.gmk))
+$(eval $(call IncludeCustomExtension, , gensrc/Gensrc-java.desktop.gmk))
 
 ifneq ($(OPENJDK_TARGET_OS), windows)
   include GensrcIcons.gmk
@@ -43,29 +43,29 @@
 include GensrcProperties.gmk
 
 PROP_SRC_DIRS := \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/sun/awt/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/accessibility/internal/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/sun/print/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/sun/awt/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/com/sun/accessibility/internal/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/sun/print/resources \
     #
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   PROP_SRC_DIRS += \
-      $(JDK_TOPDIR)/src/java.desktop/macosx/classes/com/apple/laf/resources \
-      $(JDK_TOPDIR)/src/java.desktop/macosx/classes/sun/awt/resources \
+      $(TOPDIR)/src/java.desktop/macosx/classes/com/apple/laf/resources \
+      $(TOPDIR)/src/java.desktop/macosx/classes/sun/awt/resources \
       #
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
-  PROP_SRC_DIRS += $(JDK_TOPDIR)/src/java.desktop/windows/classes/sun/awt/windows
+  PROP_SRC_DIRS += $(TOPDIR)/src/java.desktop/windows/classes/sun/awt/windows
 endif
 
 ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx), )
-  PROP_SRC_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources
+  PROP_SRC_DIRS += $(TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources
 endif
 
 $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
@@ -79,7 +79,7 @@
 # Some resources bundles are already present as java files but still need to be
 # copied to zh_HK locale.
 $(eval $(call SetupCopy-zh_HK,COPY_ZH_HK, \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java))
+    $(TOPDIR)/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java))
 
 GENSRC_JAVA_DESKTOP += $(COPY_ZH_HK)
jdk-sandbox