Add version information to jvmti demos. (original) (raw)
Sean Chou zhouyx at linux.vnet.ibm.com
Thu May 26 05:25:24 UTC 2011
- Previous message (by thread): hg: jdk7/build/langtools: 7044486: open jdk repos have files with incorrect copyright headers, which can end up in src bundles
- Next message (by thread): Update on code review system for OpenJDK (web-discuss)
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Hi all,
I made a simple patch for bug http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6988099 (jvmti demos missing Publisher (COMPANY resource) in dll and exe files on windows) . Will anyone have a look at my patch ? Thanks.
diff --git make/common/Demo.gmk make/common/Demo.gmk index a3788ae..8c43cf9 100644 --- make/common/Demo.gmk +++ make/common/Demo.gmk @@ -158,6 +158,7 @@ ifneq ($(strip $(DEMO_ALL_NATIVE_SOURCES)),) # bit between them. LINK.demo = $(LINK.c) LDLIBS.demo = (EXTRALIBS)(EXTRA_LIBS) (EXTRALIBS)(LFLAGS_$(COMPILER_VERSION)) + DEMO_VERSION_INFO = (OBJDIR)/(OBJDIR)/(OBJDIR)/(LIBRARY).res else ifneq ($(DEMO_NEEDS_CPP),) LINK.demo = $(LINK.cpp) @@ -288,6 +289,13 @@ ifndef DEMO_SKIP_SRCZIP $(install-file) endif
+# JDK name required here +RC_FLAGS += /D "JDK_FNAME=$(LIBRARY).dll" \
/D "JDK_INTERNAL_NAME=$(LIBRARY)" \/D "JDK_FTYPE=0x2L"Native library building
ifdef DEMO_LIBRARY
@@ -308,8 +316,11 @@ (OBJDIR)/(OBJDIR)/%.(OBJDIR)/(OBJECT_SUFFIX): $(DEMO_BUILD_SRCDIR)/%.cpp
Actual creation of the native shared library (C++ and C are different)
(DEMOLIBRARY):(DEMO_LIBRARY): (DEMOLIBRARY):(DEMO_FULL_OBJECTS) @$(prep-target)
- ifeq ($(PLATFORM),windows)
- (RC)(RC) (RC)(RC_FLAGS) (CCOBJECTOUTPUTFLAG)(CC_OBJECT_OUTPUT_FLAG)(CCOBJECTOUTPUTFLAG)(DEMO_VERSION_INFO) $(VERSIONINFO_RESOURCE)
- endif (LINK.demo)(LINK.demo) (LINK.demo)(SHARED_LIBRARY_FLAG) (CCPROGRAMOUTPUTFLAG)(CC_PROGRAM_OUTPUT_FLAG)(CCPROGRAMOUTPUTFLAG)@ \
<span class="katex"><span class="katex-mathml"><math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><mo stretchy="false">(</mo><mi>D</mi><mi>E</mi><mi>M</mi><msub><mi>O</mi><mi>F</mi></msub><mi>U</mi><mi>L</mi><msub><mi>L</mi><mi>O</mi></msub><mi>B</mi><mi>J</mi><mi>E</mi><mi>C</mi><mi>T</mi><mi>S</mi><mo stretchy="false">)</mo></mrow><annotation encoding="application/x-tex">(DEMO_FULL_OBJECTS) </annotation></semantics></math></span><span class="katex-html" aria-hidden="true"><span class="base"><span class="strut" style="height:1em;vertical-align:-0.25em;"></span><span class="mopen">(</span><span class="mord mathnormal" style="margin-right:0.02778em;">D</span><span class="mord mathnormal" style="margin-right:0.10903em;">EM</span><span class="mord"><span class="mord mathnormal" style="margin-right:0.02778em;">O</span><span class="msupsub"><span class="vlist-t vlist-t2"><span class="vlist-r"><span class="vlist" style="height:0.3283em;"><span style="top:-2.55em;margin-left:-0.0278em;margin-right:0.05em;"><span class="pstrut" style="height:2.7em;"></span><span class="sizing reset-size6 size3 mtight"><span class="mord mathnormal mtight" style="margin-right:0.13889em;">F</span></span></span></span><span class="vlist-s"></span></span><span class="vlist-r"><span class="vlist" style="height:0.15em;"><span></span></span></span></span></span></span><span class="mord mathnormal">UL</span><span class="mord"><span class="mord mathnormal">L</span><span class="msupsub"><span class="vlist-t vlist-t2"><span class="vlist-r"><span class="vlist" style="height:0.3283em;"><span style="top:-2.55em;margin-left:0em;margin-right:0.05em;"><span class="pstrut" style="height:2.7em;"></span><span class="sizing reset-size6 size3 mtight"><span class="mord mathnormal mtight" style="margin-right:0.02778em;">O</span></span></span></span><span class="vlist-s"></span></span><span class="vlist-r"><span class="vlist" style="height:0.15em;"><span></span></span></span></span></span></span><span class="mord mathnormal" style="margin-right:0.05017em;">B</span><span class="mord mathnormal" style="margin-right:0.09618em;">J</span><span class="mord mathnormal" style="margin-right:0.05764em;">ECTS</span><span class="mclose">)</span></span></span></span>(LDLIBS.demo)
<span class="katex"><span class="katex-mathml"><math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><mo stretchy="false">(</mo><mi>D</mi><mi>E</mi><mi>M</mi><msub><mi>O</mi><mi>F</mi></msub><mi>U</mi><mi>L</mi><msub><mi>L</mi><mi>O</mi></msub><mi>B</mi><mi>J</mi><mi>E</mi><mi>C</mi><mi>T</mi><mi>S</mi><mo stretchy="false">)</mo></mrow><annotation encoding="application/x-tex">(DEMO_FULL_OBJECTS) </annotation></semantics></math></span><span class="katex-html" aria-hidden="true"><span class="base"><span class="strut" style="height:1em;vertical-align:-0.25em;"></span><span class="mopen">(</span><span class="mord mathnormal" style="margin-right:0.02778em;">D</span><span class="mord mathnormal" style="margin-right:0.10903em;">EM</span><span class="mord"><span class="mord mathnormal" style="margin-right:0.02778em;">O</span><span class="msupsub"><span class="vlist-t vlist-t2"><span class="vlist-r"><span class="vlist" style="height:0.3283em;"><span style="top:-2.55em;margin-left:-0.0278em;margin-right:0.05em;"><span class="pstrut" style="height:2.7em;"></span><span class="sizing reset-size6 size3 mtight"><span class="mord mathnormal mtight" style="margin-right:0.13889em;">F</span></span></span></span><span class="vlist-s"></span></span><span class="vlist-r"><span class="vlist" style="height:0.15em;"><span></span></span></span></span></span></span><span class="mord mathnormal">UL</span><span class="mord"><span class="mord mathnormal">L</span><span class="msupsub"><span class="vlist-t vlist-t2"><span class="vlist-r"><span class="vlist" style="height:0.3283em;"><span style="top:-2.55em;margin-left:0em;margin-right:0.05em;"><span class="pstrut" style="height:2.7em;"></span><span class="sizing reset-size6 size3 mtight"><span class="mord mathnormal mtight" style="margin-right:0.02778em;">O</span></span></span></span><span class="vlist-s"></span></span><span class="vlist-r"><span class="vlist" style="height:0.15em;"><span></span></span></span></span></span></span><span class="mord mathnormal" style="margin-right:0.05017em;">B</span><span class="mord mathnormal" style="margin-right:0.09618em;">J</span><span class="mord mathnormal" style="margin-right:0.05764em;">ECTS</span><span class="mclose">)</span></span></span></span>(LDLIBS.demo) $(DEMO_VERSION_INFO) @$(call binary_file_verification,$@)Generation of any javah include file, make sure objects are dependent on it
-- Best Regards, Sean Chou -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://mail.openjdk.org/pipermail/build-dev/attachments/20110526/2192dc50/attachment.htm>
- Previous message (by thread): hg: jdk7/build/langtools: 7044486: open jdk repos have files with incorrect copyright headers, which can end up in src bundles
- Next message (by thread): Update on code review system for OpenJDK (web-discuss)
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]