equal
deleted
inserted
replaced
31 |
31 |
32 # Note: Some of the more complex logic here is most likely not needed anymore. |
32 # Note: Some of the more complex logic here is most likely not needed anymore. |
33 |
33 |
34 GENSRC_X11WRAPPERS := |
34 GENSRC_X11WRAPPERS := |
35 GENSRC_X11WRAPPERS_TMP := $(JDK_OUTPUTDIR)/gensrc_x11wrappers |
35 GENSRC_X11WRAPPERS_TMP := $(JDK_OUTPUTDIR)/gensrc_x11wrappers |
|
36 GENSRC_X11WRAPPERS_DST := $(JDK_OUTPUTDIR)/gensrc |
36 |
37 |
37 GENSRC_SIZER_SRC := $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator |
38 GENSRC_SIZER_SRC := $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator |
38 |
39 |
39 # Normal case is to generate version according to target bits |
40 # Normal case is to generate version according to target bits |
40 GENSRC_SIZES := sizes.$(OPENJDK_TARGET_CPU_BITS) |
41 GENSRC_SIZES := sizes.$(OPENJDK_TARGET_CPU_BITS) |
43 ifneq ($(OPENJDK_TARGET_OS), linux) |
44 ifneq ($(OPENJDK_TARGET_OS), linux) |
44 # On all 64-bit systems except Linux, generate both 32 and 64 bit versions |
45 # On all 64-bit systems except Linux, generate both 32 and 64 bit versions |
45 GENSRC_SIZES := sizes.32 sizes.64 |
46 GENSRC_SIZES := sizes.32 sizes.64 |
46 endif |
47 endif |
47 else |
48 else |
48 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-x86) |
49 ifeq ($(OPENJDK_TARGET_OS), solaris) |
49 # As a special case, solaris on x86 (32-bit) also generates the 64-bit version |
50 # As a special case, solaris 32-bit also generates the 64-bit version |
50 GENSRC_SIZES := sizes.32 sizes.64 |
51 GENSRC_SIZES := sizes.32 sizes.64 |
51 endif |
52 endif |
52 endif |
53 endif |
53 |
54 |
54 ########################################################################################## |
55 ########################################################################################## |
55 |
56 |
56 $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.c : $(GENSRC_SIZER_SRC)/xlibtypes.txt |
57 $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.c : $(GENSRC_SIZER_SRC)/xlibtypes.txt |
|
58 $(ECHO) "Generating X11 wrapper ($*-bit version)" |
57 $(MKDIR) -p $(@D) |
59 $(MKDIR) -p $(@D) |
58 $(RM) $@ |
60 $(RM) $@ |
59 $(TOOL_WRAPPERGENERATOR) $(@D) $< "sizer" $* |
61 $(TOOL_WRAPPERGENERATOR) $(@D) $< "sizer" $* |
60 |
62 |
61 $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.exe : $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.c |
63 $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.exe : $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.c |
86 $(MKDIR) -p $(@D) |
88 $(MKDIR) -p $(@D) |
87 $(RM) $@ |
89 $(RM) $@ |
88 $(CP) $< $@ |
90 $(CP) $< $@ |
89 endif |
91 endif |
90 |
92 |
91 $(GENSRC_X11WRAPPERS_TMP)/classes/_the.classes : $(foreach S,$(GENSRC_SIZES),$(GENSRC_X11WRAPPERS_TMP)/sizer/$(S)) |
93 $(GENSRC_X11WRAPPERS_DST)/_the.generated.x11 : $(foreach S,$(GENSRC_SIZES),$(GENSRC_X11WRAPPERS_TMP)/sizer/$(S)) |
92 $(RM) $@ |
94 $(RM) $@ |
93 $(MKDIR) -p $(@D)/sun/awt/X11 |
95 $(MKDIR) -p $(@D)/sun/awt/X11 |
94 $(RM) $(@D)/sun/awt/X11/* |
|
95 $(TOOL_WRAPPERGENERATOR) $(@D)/sun/awt/X11 $(GENSRC_SIZER_SRC)/xlibtypes.txt "gen" $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes |
96 $(TOOL_WRAPPERGENERATOR) $(@D)/sun/awt/X11 $(GENSRC_SIZER_SRC)/xlibtypes.txt "gen" $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes |
96 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-x86_64) |
97 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-x86_64) |
97 # On solaris-x86_64, as a safety measure, compare the generated file with the checked-in version |
98 # On solaris-x86_64, as a safety measure, compare the generated file with the checked-in version |
98 $(ECHO) COMPARING $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.64 and $(GENSRC_SIZER_SRC)/sizes.64-solaris-i386 |
99 $(ECHO) COMPARING $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.64 and $(GENSRC_SIZER_SRC)/sizes.64-solaris-i386 |
99 $(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.64 $(GENSRC_SIZER_SRC)/sizes.64-solaris-i386 |
100 $(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.64 $(GENSRC_SIZER_SRC)/sizes.64-solaris-i386 |
100 endif |
101 endif |
101 $(TOUCH) $@ |
102 $(TOUCH) $@ |
102 |
103 |
103 GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/classes/_the.classes |
104 GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_DST)/_the.generated.x11 |