<div><br></div><div><div><br><div class="gmail_quote">2011/6/8 Daniel D. Daugherty <span dir="ltr"><<a href="mailto:daniel.daugherty@oracle.com">daniel.daugherty@oracle.com</a>></span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Adding Zhengyu since he is the RE on 6988099 and I'm not sure<br>
if he is on the serviceability-dev alias...<br>
<br>
Zhengyu, I don't know if you have a fix already in process for<br>
this issue or not.<br>
<br>
Comments on the Makefile change below.<br>
<br>
<br>
Dan<div><div></div><div class="h5"><br>
<br>
On 6/6/2011 8:59 PM, David Holmes wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Sean,<br>
<br>
Because this is a JVMTI demo it falls under serviceability, so I've cc'ed that list.<br>
<br>
David<br>
<br>
Sean Chou said the following on 06/07/11 12:18:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Is there any comment ?<br>
<br>
2011/5/26 Sean Chou <<a href="mailto:zhouyx@linux.vnet.ibm.com" target="_blank">zhouyx@linux.vnet.ibm.com</a> <mailto:<a href="mailto:zhouyx@linux.vnet.ibm.com" target="_blank">zhouyx@linux.vnet.ibm.com</a>>><br>
<br>
Hi all,<br>
<br>
I made a simple patch for bug<br>
<a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6988099" target="_blank">http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6988099</a> (jvmti demos missing Publisher (COMPANY resource) in dll and exe<br>
files on windows) . Will anyone have a look at my patch ? Thanks.<br>
<br>
<br>
diff --git make/common/Demo.gmk make/common/Demo.gmk<br>
index a3788ae..8c43cf9 100644<br>
--- make/common/Demo.gmk<br>
+++ make/common/Demo.gmk<br>
@@ -158,6 +158,7 @@ ifneq ($(strip $(DEMO_ALL_NATIVE_SOURCES)),)<br>
# bit between them.<br>
LINK.demo = $(LINK.c)<br>
LDLIBS.demo = $(EXTRA_LIBS) $(LFLAGS_$(COMPILER_VERSION))<br>
+ DEMO_VERSION_INFO = $(OBJDIR)/$(LIBRARY).res<br>
else<br>
ifneq ($(DEMO_NEEDS_CPP),)<br>
LINK.demo = $(LINK.cpp)<br>
@@ -288,6 +289,13 @@ ifndef DEMO_SKIP_SRCZIP<br>
$(install-file)<br>
endif<br>
</blockquote></blockquote>
<br></div></div>
The change below is not bracketed by "ifeq ($(PLATFORM),windows)"<br>
but it certainly looks Windows specific.<div class="im"><br></div></blockquote><div><br></div><div>Yes, it is Windows specific and only used by RC.exe. I copied this piece of</div><div> flag from Library.gmk, it is not bracketed by "ifeq ($(PLATFORM),windows)"</div>
<div> in that file.</div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;"><div class="im">
<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+# JDK name required here<br>
+RC_FLAGS += /D "JDK_FNAME=$(LIBRARY).dll" \<br>
+ /D "JDK_INTERNAL_NAME=$(LIBRARY)" \<br>
+ /D "JDK_FTYPE=0x2L"<br>
+<br>
+<br>
+<br>
# Native library building<br>
ifdef DEMO_LIBRARY<br>
@@ -308,8 +316,11 @@ $(OBJDIR)/%.$(OBJECT_SUFFIX): $(DEMO_BUILD_SRCDIR)/%.cpp<br>
# Actual creation of the native shared library (C++ and C are different)<br>
$(DEMO_LIBRARY): $(DEMO_FULL_OBJECTS)<br>
@$(prep-target)<br>
+ ifeq ($(PLATFORM),windows)<br>
+ $(RC) $(RC_FLAGS) $(CC_OBJECT_OUTPUT_FLAG)$(DEMO_VERSION_INFO) $(VERSIONINFO_RESOURCE)<br>
+ endif<br>
$(LINK.demo) $(SHARED_LIBRARY_FLAG) $(CC_PROGRAM_OUTPUT_FLAG)$@ \<br>
- $(DEMO_FULL_OBJECTS) $(LDLIBS.demo)<br>
+ $(DEMO_FULL_OBJECTS) $(LDLIBS.demo) $(DEMO_VERSION_INFO)<br>
</blockquote></blockquote>
<br></div>
The above change uses "$(DEMO_VERSION_INFO)" but that variable is<br>
only set under "ifeq ($(PLATFORM),windows)" above. That won't break<br>
make, but I wanted to be sure that was intentional.<div><div></div><div class="h5"><br></div></div></blockquote><div>"$(DEMO_VERSION_INFO)" should be left blank on platforms other than windows. And</div><div>I found it would be blank if it was not set, so I removed the code to set it blank.</div>
<div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;"><div><div class="h5">
<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
@$(call binary_file_verification,$@)<br>
# Generation of any javah include file, make sure objects are dependent on it<br>
<br>
<br>
<br>
-- Best Regards,<br>
Sean Chou<br>
<br>
<br>
<br>
<br>
-- <br>
Best Regards,<br>
Sean Chou<br>
<br>
</blockquote></blockquote>
</div></div></blockquote></div><br><br clear="all"><br>-- <br>Best Regards,<br>Sean Chou<br><br>
</div></div>