Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Even more cleaning up. ihse-jdk-library-branch
authorihse
Fri, 04 May 2018 00:23:32 +0200
branchihse-jdk-library-branch
changeset 56518 e3340e2f594f
parent 56517 cb0f21f5f307
child 56519 1b154e6d8bb2
Even more cleaning up.
make/lib/Awt2dLibraries.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.accessibility.gmk file | annotate | diff | comparison | revisions 
--- a/make/lib/Awt2dLibraries.gmk	Thu May 03 23:33:28 2018 +0200
+++ b/make/lib/Awt2dLibraries.gmk	Fri May 04 00:23:32 2018 +0200
@@ -27,6 +27,14 @@
 
 WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib
 
+LIBAWT_DEFAULT_HEADER_DIRS := \
+    $(call FindSrcDirsForComponent, $(MODULE), libawt/awt/image) \
+    $(call FindSrcDirsForComponent, $(MODULE), libawt/awt/image/cvutils) \
+    $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d) \
+    $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/loops) \
+    $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/pipe) \
+    #
+
 ################################################################################
 
 # We must not include java.desktop/unix/native/libmlib_image, which is only
@@ -193,22 +201,18 @@
 endif
 
 LIBAWT_EXTRA_HEADER_DIRS := \
+    $(LIBAWT_DEFAULT_HEADER_DIRS) \
     $(call FindHeaderDirForModule, java.base) \
-    $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d) \
+    $(call FindSrcDirsForComponent, $(MODULE), libawt/awt/medialib) \
     $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/d3d) \
-    $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/loops) \
     $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/opengl) \
     $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/windows) \
     $(call FindSrcDirsForComponent, $(MODULE), libawt/windows) \
     $(call FindSrcDirsForComponent, $(MODULE), common/awt/medialib) \
     $(call FindSrcDirsForComponent, $(MODULE), libmlib_image) \
+    $(call FindSrcDirsForComponent, $(MODULE), include) \
     $(call FindSrcDirsForComponent, java.base, libjava) \
     $(call FindSrcDirsForComponent, java.base, include) \
-    $(call FindSrcDirsForComponent, $(MODULE), include) \
-    $(TOPDIR)/src/$(MODULE)/share/native/libawt/awt/image \
-    $(TOPDIR)/src/$(MODULE)/share/native/libawt/awt/image/cvutils \
-    $(TOPDIR)/src/$(MODULE)/share/native/libawt/awt/medialib \
-    $(TOPDIR)/src/$(MODULE)/share/native/libawt/java2d/pipe \
     #
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
@@ -308,19 +312,15 @@
     endif
 
     LIBAWT_XAWT_EXTRA_HEADER_DIRS := \
+        $(LIBAWT_DEFAULT_HEADER_DIRS) \
         $(call FindSrcDirsForComponent, $(MODULE), libawt_xawt/awt) \
         $(call FindSrcDirsForComponent, $(MODULE), include) \
+        $(call FindSrcDirsForComponent, $(MODULE), common/awt/debug) \
         $(call FindSrcDirsForComponent, $(MODULE), common/awt/systemscale) \
         $(call FindSrcDirsForComponent, $(MODULE), common/font) \
         $(call FindSrcDirsForComponent, $(MODULE), common/java2d/opengl) \
         $(call FindSrcDirsForComponent, $(MODULE), common/java2d/x11) \
-        $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d) \
-        $(TOPDIR)/src/$(MODULE)/share/native/libawt/awt/image \
-        $(TOPDIR)/src/$(MODULE)/share/native/libawt/awt/image/cvutils \
-        $(TOPDIR)/src/$(MODULE)/share/native/libawt/java2d/loops \
-        $(TOPDIR)/src/$(MODULE)/share/native/libawt/java2d/pipe \
-        $(TOPDIR)/src/$(MODULE)/share/native/common/awt/debug \
-    #
+        #
 
     $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \
         NAME := awt_xawt, \
@@ -453,14 +453,10 @@
       -DHEADLESS=true -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
 
   LIBAWT_HEADLESS_EXTRA_HEADER_DIRS := \
+      $(LIBAWT_DEFAULT_HEADER_DIRS) \
       $(call FindSrcDirsForComponent, $(MODULE), common/awt/debug) \
       $(call FindSrcDirsForComponent, $(MODULE), common/font) \
       $(call FindSrcDirsForComponent, $(MODULE), common/java2d/opengl) \
-      $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d) \
-      $(TOPDIR)/src/$(MODULE)/share/native/libawt/awt/image \
-      $(TOPDIR)/src/$(MODULE)/share/native/libawt/awt/image/cvutils \
-      $(TOPDIR)/src/$(MODULE)/share/native/libawt/java2d/loops \
-      $(TOPDIR)/src/$(MODULE)/share/native/libawt/java2d/pipe \
   #
 
   $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \
@@ -585,13 +581,13 @@
 endif
 
 LIBFONTMANAGER_EXTRA_HEADER_DIRS := \
+    $(call FindSrcDirsForComponent, $(MODULE), libfontmanager/harfbuzz) \
+    $(call FindSrcDirsForComponent, $(MODULE), libfontmanager/harfbuzz/hb-ucdn) \
     $(call FindSrcDirsForComponent, $(MODULE), common/awt) \
     $(call FindSrcDirsForComponent, $(MODULE), common/font) \
     $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d) \
-    $(TOPDIR)/src/$(MODULE)/share/native/libfontmanager/harfbuzz \
-    $(TOPDIR)/src/$(MODULE)/share/native/libfontmanager/harfbuzz/hb-ucdn \
-    $(TOPDIR)/src/$(MODULE)/share/native/libawt/java2d/loops \
-    $(TOPDIR)/src/$(MODULE)/share/native/libawt/java2d/pipe \
+    $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/pipe) \
+    $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/loops) \
     #
 
 #
@@ -664,13 +660,13 @@
   endif
 
   LIBJAWT_EXTRA_HEADER_DIRS := \
-      $(call FindSrcDirsForComponent, java.base, include) \
       $(call FindSrcDirsForComponent, $(MODULE), include) \
       $(call FindSrcDirsForComponent, $(MODULE), common/awt/debug) \
       $(call FindSrcDirsForComponent, $(MODULE), libawt/awt/image/cvutils) \
       $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d) \
       $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/windows) \
       $(call FindSrcDirsForComponent, $(MODULE), libawt/windows) \
+      $(call FindSrcDirsForComponent, java.base, include) \
       $(call FindSrcDirsForComponent, java.base, libjava) \
   #
 
@@ -845,9 +841,9 @@
   endif
 
   LIBSPLASHSCREEN_HEADER_DIRS += \
-      $(call FindSrcDirsForComponent, java.base, libjava) \
       $(call FindSrcDirsForComponent, $(MODULE), libosxapp) \
       $(call FindSrcDirsForComponent, java.base, include) \
+      $(call FindSrcDirsForComponent, java.base, libjava) \
   #
 
   $(eval $(call SetupJdkLibrary, BUILD_LIBSPLASHSCREEN, \
@@ -900,19 +896,15 @@
   LIBAWT_LWAWT_EXCLUDES := $(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib
 
   LIBAWT_LWAWT_EXTRA_HEADER_DIRS := \
-      $(call FindSrcDirsForComponent, $(MODULE), libawt_lwawt/java2d/opengl) \
+      $(LIBAWT_DEFAULT_HEADER_DIRS) \
       $(call FindSrcDirsForComponent, $(MODULE), libawt_lwawt/awt) \
       $(call FindSrcDirsForComponent, $(MODULE), libawt_lwawt/font) \
+      $(call FindSrcDirsForComponent, $(MODULE), libawt_lwawt/java2d/opengl) \
       $(call FindSrcDirsForComponent, $(MODULE), include) \
       $(call FindSrcDirsForComponent, $(MODULE), common/awt/debug) \
       $(call FindSrcDirsForComponent, $(MODULE), common/java2d/opengl) \
-      $(call FindSrcDirsForComponent, $(MODULE), libawt/awt/image) \
-      $(call FindSrcDirsForComponent, $(MODULE), libawt/awt/image/cvutils) \
-      $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d) \
-      $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/loops) \
-      $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/pipe) \
       $(call FindSrcDirsForComponent, $(MODULE), libosxapp) \
-  #
+      #
 
   $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_LWAWT, \
       NAME := awt_lwawt, \
--- a/make/lib/Lib-jdk.accessibility.gmk	Thu May 03 23:33:28 2018 +0200
+++ b/make/lib/Lib-jdk.accessibility.gmk	Fri May 04 00:23:32 2018 +0200
@@ -29,18 +29,14 @@
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
 
-  ROOT_SRCDIR := $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS)/native
-  JAVA_AB_SRCDIR := $(ROOT_SRCDIR)/libjavaaccessbridge $(ROOT_SRCDIR)/common
-  WIN_AB_SRCDIR := $(ROOT_SRCDIR)/libwindowsaccessbridge $(ROOT_SRCDIR)/common
-  SYSINFO_SRCDIR := $(ROOT_SRCDIR)/libjabsysinfo
-
   define SetupJavaDLL
     # Parameter 1 Suffix
     # Parameter 2 ACCESSBRIDGE_ARCH_ suffix
 
     $(call SetupJdkLibrary, BUILD_JAVAACCESSBRIDGE$1, \
         NAME := javaaccessbridge$1, \
-        SRC := $(JAVA_AB_SRCDIR), \
+        SRC := $(call FindSrcDirsForComponent, $(MODULE), libjavaaccessbridge), \
+        EXTRA_SRC := $(call FindSrcDirsForComponent, $(MODULE), common), \
         OPTIMIZATION := LOW, \
         DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
         CFLAGS := $(CFLAGS_JDKLIB) \
@@ -67,7 +63,8 @@
     # Parameter 2 ACCESSBRIDGE_ARCH_ suffix
     $(call SetupJdkLibrary, BUILD_WINDOWSACCESSBRIDGE$1, \
         NAME := windowsaccessbridge$1, \
-        SRC := $(WIN_AB_SRCDIR), \
+        SRC := $(call FindSrcDirsForComponent, $(MODULE), libwindowsaccessbridge), \
+        EXTRA_SRC := $(call FindSrcDirsForComponent, $(MODULE), common), \
         OPTIMIZATION := LOW, \
         DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
         CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT \
@@ -91,7 +88,6 @@
 
     $(call SetupJdkLibrary, BUILD_ACCESSBRIDGESYSINFO, \
         NAME := jabsysinfo, \
-        SRC := $(SYSINFO_SRCDIR), \
         OPTIMIZATION := LOW, \
         CFLAGS := $(CFLAGS_JDKLIB), \
         LDFLAGS := $(LDFLAGS_JDKLIB), \
jdk-sandbox