From 708c2d8f03d1104cf1987d5e30c74391ce670553 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Thu, 13 Feb 2014 17:40:43 +0100 Subject: [PATCH] 8034193: Move X11 wrapper generator files to make/src and make/data Reviewed-by: ihse, alanb, tbell --- jdk/make/CompileJavaClasses.gmk | 2 -- jdk/make/Tools.gmk | 10 ++-------- .../data/x11wrappergen}/functions.txt | 0 .../X11/generator => make/data/x11wrappergen}/sizes.32 | 0 .../X11/generator => make/data/x11wrappergen}/sizes.64 | 0 .../data/x11wrappergen}/sizes.64-solaris-i386 | 0 .../data/x11wrappergen}/xlibtypes.txt | 0 jdk/make/gensrc/GensrcX11Wrappers.gmk | 2 +- .../build/tools/x11wrappergen}/WrapperGenerator.java | 2 ++ 9 files changed, 5 insertions(+), 11 deletions(-) rename jdk/{src/solaris/classes/sun/awt/X11/generator => make/data/x11wrappergen}/functions.txt (100%) rename jdk/{src/solaris/classes/sun/awt/X11/generator => make/data/x11wrappergen}/sizes.32 (100%) rename jdk/{src/solaris/classes/sun/awt/X11/generator => make/data/x11wrappergen}/sizes.64 (100%) rename jdk/{src/solaris/classes/sun/awt/X11/generator => make/data/x11wrappergen}/sizes.64-solaris-i386 (100%) rename jdk/{src/solaris/classes/sun/awt/X11/generator => make/data/x11wrappergen}/xlibtypes.txt (100%) rename jdk/{src/solaris/classes/sun/awt/X11/generator => make/src/classes/build/tools/x11wrappergen}/WrapperGenerator.java (99%) diff --git a/jdk/make/CompileJavaClasses.gmk b/jdk/make/CompileJavaClasses.gmk index 2c65d12cc8b..e993d75a8dd 100644 --- a/jdk/make/CompileJavaClasses.gmk +++ b/jdk/make/CompileJavaClasses.gmk @@ -100,8 +100,6 @@ ifneq ($(OPENJDK_TARGET_OS), solaris) EXCLUDES += com/oracle/security endif -EXFILES += WrapperGenerator.java - ifneq ($(OPENJDK_TARGET_OS), windows) # Exclude Window security related files in src/share/classes EXFILES += NTLoginModule.java \ diff --git a/jdk/make/Tools.gmk b/jdk/make/Tools.gmk index 661bf3e3b03..52a843bce8e 100644 --- a/jdk/make/Tools.gmk +++ b/jdk/make/Tools.gmk @@ -26,17 +26,11 @@ # Cache all finds needed for this file. Only used on windows. $(eval $(call FillCacheFind, $(JDK_TOPDIR)/make/src/classes)) -TOOLS_SRC := $(JDK_TOPDIR)/make/src/classes - -ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),) - TOOLS_SRC += $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator -endif - # The exception handling of swing beaninfo which have the own tool directory ifeq (, $(BUILD_TOOLS)) $(eval $(call SetupJavaCompilation,BUILD_TOOLS, \ SETUP := GENERATE_OLDBYTECODE, \ - SRC := $(TOOLS_SRC), \ + SRC := $(JDK_TOPDIR)/make/src/classes, \ BIN := $(JDK_OUTPUTDIR)/btclasses)) endif @@ -111,7 +105,7 @@ TOOL_GENERATENIMBUS = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ build.tools.generatenimbus.Generator TOOL_WRAPPERGENERATOR = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ - WrapperGenerator + build.tools.x11wrappergen.WrapperGenerator TOOL_AWT_TOBIN = $(JAVA) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \ build.tools.icondata.awt.ToBin diff --git a/jdk/src/solaris/classes/sun/awt/X11/generator/functions.txt b/jdk/make/data/x11wrappergen/functions.txt similarity index 100% rename from jdk/src/solaris/classes/sun/awt/X11/generator/functions.txt rename to jdk/make/data/x11wrappergen/functions.txt diff --git a/jdk/src/solaris/classes/sun/awt/X11/generator/sizes.32 b/jdk/make/data/x11wrappergen/sizes.32 similarity index 100% rename from jdk/src/solaris/classes/sun/awt/X11/generator/sizes.32 rename to jdk/make/data/x11wrappergen/sizes.32 diff --git a/jdk/src/solaris/classes/sun/awt/X11/generator/sizes.64 b/jdk/make/data/x11wrappergen/sizes.64 similarity index 100% rename from jdk/src/solaris/classes/sun/awt/X11/generator/sizes.64 rename to jdk/make/data/x11wrappergen/sizes.64 diff --git a/jdk/src/solaris/classes/sun/awt/X11/generator/sizes.64-solaris-i386 b/jdk/make/data/x11wrappergen/sizes.64-solaris-i386 similarity index 100% rename from jdk/src/solaris/classes/sun/awt/X11/generator/sizes.64-solaris-i386 rename to jdk/make/data/x11wrappergen/sizes.64-solaris-i386 diff --git a/jdk/src/solaris/classes/sun/awt/X11/generator/xlibtypes.txt b/jdk/make/data/x11wrappergen/xlibtypes.txt similarity index 100% rename from jdk/src/solaris/classes/sun/awt/X11/generator/xlibtypes.txt rename to jdk/make/data/x11wrappergen/xlibtypes.txt diff --git a/jdk/make/gensrc/GensrcX11Wrappers.gmk b/jdk/make/gensrc/GensrcX11Wrappers.gmk index 0afe0664104..2aff2f48b0a 100644 --- a/jdk/make/gensrc/GensrcX11Wrappers.gmk +++ b/jdk/make/gensrc/GensrcX11Wrappers.gmk @@ -42,7 +42,7 @@ GENSRC_X11WRAPPERS_TMP := $(JDK_OUTPUTDIR)/gensrc_x11wrappers GENSRC_X11WRAPPERS_DST := $(JDK_OUTPUTDIR)/gensrc/sun/awt/X11 # The pre-calculated offset file are stored here: -GENSRC_SIZER_DIR := $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator +GENSRC_SIZER_DIR := $(JDK_TOPDIR)/make/data/x11wrappergen # Normal case is to generate only according to target bits GENSRC_X11_VERSION := $(OPENJDK_TARGET_CPU_BITS) diff --git a/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java b/jdk/make/src/classes/build/tools/x11wrappergen/WrapperGenerator.java similarity index 99% rename from jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java rename to jdk/make/src/classes/build/tools/x11wrappergen/WrapperGenerator.java index 9da0fd93442..e3a68c42afb 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java +++ b/jdk/make/src/classes/build/tools/x11wrappergen/WrapperGenerator.java @@ -23,6 +23,8 @@ * questions. */ +package build.tools.x11wrappergen; + import java.util.*; import java.io.*; import java.nio.charset.*;