Attachment 93496 Details for Bug 223830 – patch (moved from Bug 209342)

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch (moved from Bug 209342)

patch.txt (text/plain), 17.99 KB, created by Alexander N. Alexeev

on 2008-03-25 16:57:43 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander N. Alexeev

Created: 2008-03-25 16:57:43 EDT

Size: 17.99 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.jvmti.runtime
>Index: src-native/src/JPIAgent/binformat.cpp
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.jvmti.runtime/src-native/src/JPIAgent/binformat.cpp,v
>retrieving revision 1.2
>diff -u -r1.2 binformat.cpp
>--- src-native/src/JPIAgent/binformat.cpp	24 Mar 2008 22:39:29 -0000	1.2
>+++ src-native/src/JPIAgent/binformat.cpp	25 Mar 2008 16:41:08 -0000
>@@ -31,7 +31,7 @@
> 	void *buffer = buf;
> 
> 	buffer = write(buffer, message_id);
>-	buffer = write(buffer, message_len);
>+	buffer = write(buffer, static_cast<bf_int_t>(message_len));
> 
> 	return (buffer);
> }
>@@ -1384,7 +1384,7 @@
> 	buffer = write(buffer, timestamp);
> 	buffer = write(buffer, obj_id_ref);
> 	buffer = write(buffer, timeout);
>-	buffer = write(buffer, stack_depth);
>+	buffer = write(buffer, static_cast<bf_int_t>(stack_depth));
> 	buffer = write(buffer, stack_methods, stack_depth);
> 	buffer = write(buffer, stack_lines, stack_depth);
> 
>@@ -1398,7 +1398,7 @@
> 			getSize(timestamp) +
> 			getSize(obj_id_ref) +
> 			getSize(timeout) +
>-			getSize(stack_depth)) +
>+			getSize(static_cast<bf_int_t>(stack_depth))) +
> 			getSize(stack_methods, stack_depth) +
> 			getSize(stack_lines, stack_depth);
> }
>@@ -1428,7 +1428,7 @@
> 	buffer = write(buffer, timestamp);
> 	buffer = write(buffer, obj_id_ref);
> 	buffer = write(buffer, thread_owner_id_ref);
>-	buffer = write(buffer, stack_depth);
>+	buffer = write(buffer, static_cast<bf_int_t>(stack_depth));
> 	buffer = write(buffer, stack_methods, stack_depth);
> 	buffer = write(buffer, stack_lines, stack_depth);
> 
>@@ -1442,7 +1442,7 @@
> 			getSize(timestamp) +
> 			getSize(obj_id_ref) +
> 			getSize(thread_owner_id_ref) +
>-			getSize(stack_depth)) +
>+			getSize(static_cast<bf_int_t>(stack_depth))) +
> 			getSize(stack_methods, stack_depth) +
> 			getSize(stack_lines, stack_depth);
> }
>@@ -1465,7 +1465,7 @@
> 	buffer = write(buffer, thread_id_ref);
> 	buffer = write(buffer, timestamp);
> 	buffer = write(buffer, obj_id_ref);
>-	buffer = write(buffer, stack_depth);
>+	buffer = write(buffer, static_cast<bf_int_t>(stack_depth));
> 	buffer = write(buffer, stack_methods, stack_depth);
> 	buffer = write(buffer, stack_lines, stack_depth);
> 
>@@ -1478,7 +1478,7 @@
> 	return (getSize(thread_id_ref) +
> 			getSize(timestamp) +
> 			getSize(obj_id_ref) +
>-			getSize(stack_depth)) +
>+			getSize(static_cast<bf_int_t>(stack_depth))) +
> 			getSize(stack_methods, stack_depth) +
> 			getSize(stack_lines, stack_depth);
> }
>@@ -1684,7 +1684,7 @@
> 	buffer = write(buffer, timestamp);
> 	buffer = write(buffer, static_obj_id_ref);
> 	buffer = write(buffer, notify_all);
>-	buffer = write(buffer, stack_depth);
>+	buffer = write(buffer, static_cast<bf_int_t>(stack_depth));
> 	buffer = write(buffer, stack_methods, stack_depth);
> 	buffer = write(buffer, stack_lines, stack_depth);
> 
>@@ -1698,7 +1698,7 @@
> 			getSize(timestamp) +
> 			getSize(static_obj_id_ref) +
> 			getSize(notify_all) +
>-			getSize(stack_depth)) +
>+			getSize(static_cast<bf_int_t>(stack_depth))) +
> 			getSize(stack_methods, stack_depth) +
> 			getSize(stack_lines, stack_depth);
> }
>Index: src-native/src/JPIAgent/PrintBinary.cpp
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.jvmti.runtime/src-native/src/JPIAgent/PrintBinary.cpp,v
>retrieving revision 1.3
>diff -u -r1.3 PrintBinary.cpp
>--- src-native/src/JPIAgent/PrintBinary.cpp	24 Mar 2008 23:33:20 -0000	1.3
>+++ src-native/src/JPIAgent/PrintBinary.cpp	25 Mar 2008 16:41:08 -0000
>@@ -727,11 +727,16 @@
>     }
> 
>     if (m_pOptions->isStackInfoNormal()) {
>+		msg->stack_methods = static_cast<bf_string_t*>(malloc(sizeof(void *) * stackTrace->uiSize));
>+		msg->stack_lines = static_cast<bf_long_t*>(malloc(sizeof(bf_long_t) * stackTrace->uiSize));
> 		AppendAnnotations(msg->stack_methods, msg->stack_lines, &msg->stack_depth, stackTrace);
>     }
> 
> 	printMessage(msg, &elb);
> 
>+	if (msg->stack_methods != NULL) free(msg->stack_methods);
>+	if (msg->stack_lines != NULL) free(msg->stack_lines);
>+
> 	delete msg;
> }
> 
>Index: src-native/build/BuildJPIAgent32.mak
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.jvmti.runtime/src-native/build/BuildJPIAgent32.mak,v
>retrieving revision 1.8
>diff -u -r1.8 BuildJPIAgent32.mak
>--- src-native/build/BuildJPIAgent32.mak	7 Feb 2008 14:47:28 -0000	1.8
>+++ src-native/build/BuildJPIAgent32.mak	25 Mar 2008 16:41:08 -0000
>@@ -41,6 +41,7 @@
> 
> 
> CLEAN :
>+	-@erase "$(INTDIR)\binformat.obj"
> 	-@erase "$(INTDIR)\ECCallbacks.obj"
> 	-@erase "$(INTDIR)\ECJvmtiAgent.obj"
> 	-@erase "$(INTDIR)\ECWrapper.obj"
>@@ -48,11 +49,13 @@
> 	-@erase "$(INTDIR)\Options.obj"
> 	-@erase "$(INTDIR)\Performance.obj"
> 	-@erase "$(INTDIR)\Print.obj"
>-	-@erase "$(INTDIR)\Profiler.obj"
>+	-@erase "$(INTDIR)\PrintBinary.obj"
>+	-@erase "$(INTDIR)\PrintWrapper.obj"
> 	-@erase "$(INTDIR)\PrintXML.obj"
>+	-@erase "$(INTDIR)\Profiler.obj"
> 	-@erase "$(INTDIR)\utility.obj"
> 	-@erase "$(INTDIR)\vc*.idb"
>-	-@erase "$(INTDIR)\BuildJPIAgent32.pch"
>+	-@erase "$(INTDIR)\vc*.pdb"
> 	-@erase "$(OUTDIR)\JPIAgent.dll"
> 	-@erase "$(OUTDIR)\JPIAgent.exp"
> 	-@erase "$(OUTDIR)\JPIAgent.lib"
>@@ -72,6 +75,7 @@
> LINK32=link.exe
> LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib MartiniOSA.lib Rpcrt4.lib /nologo /dll /pdb:none /machine:I386 /out:"$(OUTDIR)\JPIAgent.dll" /implib:"$(OUTDIR)\JPIAgent.lib" /libpath:"..\bin\windows\release\IA-32" /libpath:"..\windows\debug\IA-32"
> LINK32_OBJS= \
>+	"$(INTDIR)\binformat.obj" \
> 	"$(INTDIR)\ECCallbacks.obj" \
> 	"$(INTDIR)\ECJvmtiAgent.obj" \
> 	"$(INTDIR)\ECWrapper.obj" \
>@@ -79,6 +83,8 @@
> 	"$(INTDIR)\Options.obj" \
> 	"$(INTDIR)\Performance.obj" \
> 	"$(INTDIR)\Print.obj" \
>+	"$(INTDIR)\PrintBinary.obj" \
>+	"$(INTDIR)\PrintWrapper.obj" \
> 	"$(INTDIR)\PrintXML.obj" \
> 	"$(INTDIR)\Profiler.obj" \
> 	"$(INTDIR)\utility.obj"
>@@ -100,6 +106,7 @@
> 
> 
> CLEAN :
>+	-@erase "$(INTDIR)\binformat.obj"
> 	-@erase "$(INTDIR)\ECCallbacks.obj"
> 	-@erase "$(INTDIR)\ECJvmtiAgent.obj"
> 	-@erase "$(INTDIR)\ECWrapper.obj"
>@@ -107,16 +114,16 @@
> 	-@erase "$(INTDIR)\Options.obj"
> 	-@erase "$(INTDIR)\Performance.obj"
> 	-@erase "$(INTDIR)\Print.obj"
>+	-@erase "$(INTDIR)\PrintBinary.obj"
>+	-@erase "$(INTDIR)\PrintWrapper.obj"
> 	-@erase "$(INTDIR)\PrintXML.obj"
> 	-@erase "$(INTDIR)\Profiler.obj"
> 	-@erase "$(INTDIR)\utility.obj"
> 	-@erase "$(INTDIR)\vc*.idb"
> 	-@erase "$(INTDIR)\vc*.pdb"
>-	-@erase "$(INTDIR)\BuildJPIAgent32.pch"
> 	-@erase "$(OUTDIR)\JPIAgent.dll"
> 	-@erase "$(OUTDIR)\JPIAgent.exp"
> 	-@erase "$(OUTDIR)\JPIAgent.lib"
>-	-@erase "$(OUTDIR)\JPIAgent.ilk"
> 
> "$(OUTDIR)" :
>     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
>@@ -133,6 +140,7 @@
> LINK32=link.exe
> LINK32_FLAGS=Rpcrt4.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib MartiniOSA.lib /nologo /dll /pdb:none /debug /machine:I386 /out:"$(OUTDIR)\JPIAgent.dll" /implib:"$(OUTDIR)\JPIAgent.lib" /libpath:"..\bin\windows\debug\IA-32"
> LINK32_OBJS= \
>+	"$(INTDIR)\binformat.obj" \
> 	"$(INTDIR)\ECCallbacks.obj" \
> 	"$(INTDIR)\ECJvmtiAgent.obj" \
> 	"$(INTDIR)\ECWrapper.obj" \
>@@ -140,6 +148,8 @@
> 	"$(INTDIR)\Options.obj" \
> 	"$(INTDIR)\Performance.obj" \
> 	"$(INTDIR)\Print.obj" \
>+	"$(INTDIR)\PrintBinary.obj" \
>+	"$(INTDIR)\PrintWrapper.obj" \
> 	"$(INTDIR)\PrintXML.obj" \
> 	"$(INTDIR)\Profiler.obj" \
> 	"$(INTDIR)\utility.obj"
>@@ -192,6 +202,12 @@
> 
> 
> !IF "$(CFG)" == "BuildJPIAgent32 - Win32 Release" || "$(CFG)" == "BuildJPIAgent32 - Win32 Debug"
>+SOURCE=..\src\JPIAgent\binformat.cpp
>+
>+"$(INTDIR)\binformat.obj" : $(SOURCE) "$(INTDIR)"
>+	$(CPP) $(CPP_PROJ) $(SOURCE)
>+
>+
> SOURCE=..\src\JPIAgent\ECCallbacks.cpp
> 
> "$(INTDIR)\ECCallbacks.obj" : $(SOURCE) "$(INTDIR)"
>@@ -233,16 +249,31 @@
> "$(INTDIR)\Print.obj" : $(SOURCE) "$(INTDIR)"
> 	$(CPP) $(CPP_PROJ) $(SOURCE)
> 
>+
>+SOURCE=..\src\JPIAgent\PrintBinary.cpp
>+
>+"$(INTDIR)\PrintBinary.obj" : $(SOURCE) "$(INTDIR)"
>+	$(CPP) $(CPP_PROJ) $(SOURCE)
>+
>+
>+SOURCE=..\src\JPIAgent\PrintWrapper.cpp
>+
>+"$(INTDIR)\PrintWrapper.obj" : $(SOURCE) "$(INTDIR)"
>+	$(CPP) $(CPP_PROJ) $(SOURCE)
>+
>+
> SOURCE=..\src\JPIAgent\PrintXML.cpp
> 
> "$(INTDIR)\PrintXML.obj" : $(SOURCE) "$(INTDIR)"
> 	$(CPP) $(CPP_PROJ) $(SOURCE)
> 
>+
> SOURCE=..\src\JPIAgent\Profiler.c
> 
> "$(INTDIR)\Profiler.obj" : $(SOURCE) "$(INTDIR)"
> 	$(CPP) $(CPP_PROJ) $(SOURCE)
> 
>+
> SOURCE=..\src\JPIAgent\utility.c
> 
> "$(INTDIR)\utility.obj" : $(SOURCE) "$(INTDIR)"
>Index: src-native/build/BuildJPIAgentEM64T.mak
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.jvmti.runtime/src-native/build/BuildJPIAgentEM64T.mak,v
>retrieving revision 1.7
>diff -u -r1.7 BuildJPIAgentEM64T.mak
>--- src-native/build/BuildJPIAgentEM64T.mak	7 Feb 2008 14:47:28 -0000	1.7
>+++ src-native/build/BuildJPIAgentEM64T.mak	25 Mar 2008 16:41:08 -0000
>@@ -38,6 +38,7 @@
> ALL : "$(OUTDIR)\JPIAgent.dll"
> 
> CLEAN :
>+	-@erase "$(INTDIR)\binformat.obj"
> 	-@erase "$(INTDIR)\ECCallbacks.obj"
> 	-@erase "$(INTDIR)\ECJvmtiAgent.obj"
> 	-@erase "$(INTDIR)\ECWrapper.obj"
>@@ -45,11 +46,13 @@
> 	-@erase "$(INTDIR)\Options.obj"
> 	-@erase "$(INTDIR)\Performance.obj"
> 	-@erase "$(INTDIR)\Print.obj"
>+	-@erase "$(INTDIR)\PrintBinary.obj"
>+	-@erase "$(INTDIR)\PrintWrapper.obj"
> 	-@erase "$(INTDIR)\PrintXML.obj"
> 	-@erase "$(INTDIR)\Profiler.obj"
> 	-@erase "$(INTDIR)\utility.obj"
> 	-@erase "$(INTDIR)\vc*.idb"
>-	-@erase "$(INTDIR)\BuildJPIAgent32.pch"
>+	-@erase "$(INTDIR)\vc*.pdb"
> 	-@erase "$(OUTDIR)\JPIAgent.dll"
> 	-@erase "$(OUTDIR)\JPIAgent.exp"
> 	-@erase "$(OUTDIR)\JPIAgent.lib"
>@@ -65,6 +68,7 @@
> LINKEM64T=link.exe
> LINKEM64T_FLAGS=Rpcrt4.lib bufferoverflowu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib MartiniOSA.lib /nologo /dll /pdb:none /machine:amd64 /out:"$(OUTDIR)\JPIAgent.dll" /implib:"$(OUTDIR)\JPIAgent.lib" /libpath:"..\bin\windows\release\EM64T" /libpath:"..\windows\debug\EM64T" 
> LINKEM64T_OBJS= \
>+	"$(INTDIR)\binformat.obj" \
> 	"$(INTDIR)\ECCallbacks.obj" \
> 	"$(INTDIR)\ECJvmtiAgent.obj" \
> 	"$(INTDIR)\ECWrapper.obj" \
>@@ -72,6 +76,8 @@
> 	"$(INTDIR)\Options.obj" \
> 	"$(INTDIR)\Performance.obj" \
> 	"$(INTDIR)\Print.obj" \
>+	"$(INTDIR)\PrintBinary.obj" \
>+	"$(INTDIR)\PrintWrapper.obj" \
> 	"$(INTDIR)\PrintXML.obj" \
> 	"$(INTDIR)\Profiler.obj" \
> 	"$(INTDIR)\utility.obj"
>@@ -93,6 +99,7 @@
> 
> 
> CLEAN :
>+	-@erase "$(INTDIR)\binformat.obj"
> 	-@erase "$(INTDIR)\ECCallbacks.obj"
> 	-@erase "$(INTDIR)\ECJvmtiAgent.obj"
> 	-@erase "$(INTDIR)\ECWrapper.obj"
>@@ -100,16 +107,16 @@
> 	-@erase "$(INTDIR)\Options.obj"
> 	-@erase "$(INTDIR)\Performance.obj"
> 	-@erase "$(INTDIR)\Print.obj"
>+	-@erase "$(INTDIR)\PrintBinary.obj"
>+	-@erase "$(INTDIR)\PrintWrapper.obj"
> 	-@erase "$(INTDIR)\PrintXML.obj"
> 	-@erase "$(INTDIR)\Profiler.obj"
> 	-@erase "$(INTDIR)\utility.obj"
> 	-@erase "$(INTDIR)\vc*.idb"
> 	-@erase "$(INTDIR)\vc*.pdb"
>-	-@erase "$(INTDIR)\BuildJPIAgent32.pch"
> 	-@erase "$(OUTDIR)\JPIAgent.dll"
> 	-@erase "$(OUTDIR)\JPIAgent.exp"
> 	-@erase "$(OUTDIR)\JPIAgent.lib"
>-	-@erase "$(OUTDIR)\JPIAgent.ilk"
> 
> "$(OUTDIR)" :
>     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
>@@ -122,6 +129,7 @@
> LINKEM64T=link.exe
> LINKEM64T_FLAGS=Rpcrt4.lib bufferoverflowu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib MartiniOSA.lib /nologo /dll /pdb:none /debug /machine:amd64 /out:"$(OUTDIR)\JPIAgent.dll" /implib:"$(OUTDIR)\JPIAgent.lib" /libpath:"..\bin\windows\debug\EM64T"
> LINKEM64T_OBJS= \
>+	"$(INTDIR)\binformat.obj" \
> 	"$(INTDIR)\ECCallbacks.obj" \
> 	"$(INTDIR)\ECJvmtiAgent.obj" \
> 	"$(INTDIR)\ECWrapper.obj" \
>@@ -129,8 +137,10 @@
> 	"$(INTDIR)\Options.obj" \
> 	"$(INTDIR)\Performance.obj" \
> 	"$(INTDIR)\Print.obj" \
>-	"$(INTDIR)\Profiler.obj" \
>+	"$(INTDIR)\PrintBinary.obj" \
>+	"$(INTDIR)\PrintWrapper.obj" \
> 	"$(INTDIR)\PrintXML.obj" \
>+	"$(INTDIR)\Profiler.obj" \
> 	"$(INTDIR)\utility.obj"
> 
> "$(OUTDIR)\JPIAgent.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINKEM64T_OBJS)
>@@ -181,6 +191,12 @@
> 
> 
> !IF "$(CFG)" == "BuildJPIAgentEM64T - Win32 Release" || "$(CFG)" == "BuildJPIAgentEM64T - Win32 Debug"
>+SOURCE=..\src\JPIAgent\binformat.cpp
>+
>+"$(INTDIR)\binformat.obj" : $(SOURCE) "$(INTDIR)"
>+	$(CPP) $(CPP_PROJ) $(SOURCE)
>+
>+
> SOURCE=..\src\JPIAgent\ECCallbacks.cpp
> 
> "$(INTDIR)\ECCallbacks.obj" : $(SOURCE) "$(INTDIR)"
>@@ -222,6 +238,19 @@
> "$(INTDIR)\Print.obj" : $(SOURCE) "$(INTDIR)"
> 	$(CPP) $(CPP_PROJ) $(SOURCE)
> 
>+
>+SOURCE=..\src\JPIAgent\PrintBinary.cpp
>+
>+"$(INTDIR)\PrintBinary.obj" : $(SOURCE) "$(INTDIR)"
>+	$(CPP) $(CPP_PROJ) $(SOURCE)
>+
>+
>+SOURCE=..\src\JPIAgent\PrintWrapper.cpp
>+
>+"$(INTDIR)\PrintWrapper.obj" : $(SOURCE) "$(INTDIR)"
>+	$(CPP) $(CPP_PROJ) $(SOURCE)
>+
>+
> SOURCE=..\src\JPIAgent\PrintXML.cpp
> 
> "$(INTDIR)\PrintXML.obj" : $(SOURCE) "$(INTDIR)"
>@@ -233,10 +262,12 @@
> "$(INTDIR)\Profiler.obj" : $(SOURCE) "$(INTDIR)"
> 	$(CPP) $(CPP_PROJ) $(SOURCE)
> 
>+
> SOURCE=..\src\JPIAgent\utility.c
> 
> "$(INTDIR)\utility.obj" : $(SOURCE) "$(INTDIR)"
> 	$(CPP) $(CPP_PROJ) $(SOURCE)
> 
>+
> !ENDIF 
> 
>Index: src-native/build/BuildJPIAgentIPF.mak
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.jvmti.runtime/src-native/build/BuildJPIAgentIPF.mak,v
>retrieving revision 1.9
>diff -u -r1.9 BuildJPIAgentIPF.mak
>--- src-native/build/BuildJPIAgentIPF.mak	14 Feb 2008 16:26:16 -0000	1.9
>+++ src-native/build/BuildJPIAgentIPF.mak	25 Mar 2008 16:41:08 -0000
>@@ -38,6 +38,7 @@
> ALL : "$(OUTDIR)\JPIAgent.dll"
> 
> CLEAN :
>+	-@erase "$(INTDIR)\binformat.obj"
> 	-@erase "$(INTDIR)\ECCallbacks.obj"
> 	-@erase "$(INTDIR)\ECJvmtiAgent.obj"
> 	-@erase "$(INTDIR)\ECWrapper.obj"
>@@ -45,11 +46,13 @@
> 	-@erase "$(INTDIR)\Options.obj"
> 	-@erase "$(INTDIR)\Performance.obj"
> 	-@erase "$(INTDIR)\Print.obj"
>+	-@erase "$(INTDIR)\PrintBinary.obj"
>+	-@erase "$(INTDIR)\PrintWrapper.obj"
> 	-@erase "$(INTDIR)\PrintXML.obj"
> 	-@erase "$(INTDIR)\Profiler.obj"
> 	-@erase "$(INTDIR)\utility.obj"
> 	-@erase "$(INTDIR)\vc*.idb"
>-	-@erase "$(INTDIR)\BuildJPIAgent32.pch"
>+	-@erase "$(INTDIR)\vc*.pdb"
> 	-@erase "$(OUTDIR)\JPIAgent.dll"
> 	-@erase "$(OUTDIR)\JPIAgent.exp"
> 	-@erase "$(OUTDIR)\JPIAgent.lib"
>@@ -65,6 +68,7 @@
> LINKIPF=link.exe  
> LINKIPF_FLAGS=Rpcrt4.lib bufferoverflowu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib MartiniOSA.lib /nologo /dll /pdb:none /machine:ia64 /out:"$(OUTDIR)\JPIAgent.dll" /implib:"$(OUTDIR)\JPIAgent.lib" /libpath:"..\bin\windows\release\IPF" /libpath:"..\windows\debug\IPF" 
> LINKIPF_OBJS= \
>+	"$(INTDIR)\binformat.obj" \
> 	"$(INTDIR)\ECCallbacks.obj" \
> 	"$(INTDIR)\ECJvmtiAgent.obj" \
> 	"$(INTDIR)\ECWrapper.obj" \
>@@ -72,8 +76,10 @@
> 	"$(INTDIR)\Options.obj" \
> 	"$(INTDIR)\Performance.obj" \
> 	"$(INTDIR)\Print.obj" \
>-	"$(INTDIR)\Profiler.obj" \
>+	"$(INTDIR)\PrintBinary.obj" \
>+	"$(INTDIR)\PrintWrapper.obj" \
> 	"$(INTDIR)\PrintXML.obj" \
>+	"$(INTDIR)\Profiler.obj" \
> 	"$(INTDIR)\utility.obj"
> 
> "$(OUTDIR)\JPIAgent.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINKIPF_OBJS)
>@@ -93,6 +99,7 @@
> 
> 
> CLEAN :
>+	-@erase "$(INTDIR)\binformat.obj"
> 	-@erase "$(INTDIR)\ECCallbacks.obj"
> 	-@erase "$(INTDIR)\ECJvmtiAgent.obj"
> 	-@erase "$(INTDIR)\ECWrapper.obj"
>@@ -100,16 +107,16 @@
> 	-@erase "$(INTDIR)\Options.obj"
> 	-@erase "$(INTDIR)\Performance.obj"
> 	-@erase "$(INTDIR)\Print.obj"
>+	-@erase "$(INTDIR)\PrintBinary.obj"
>+	-@erase "$(INTDIR)\PrintWrapper.obj"
> 	-@erase "$(INTDIR)\PrintXML.obj"
> 	-@erase "$(INTDIR)\Profiler.obj"
> 	-@erase "$(INTDIR)\utility.obj"
> 	-@erase "$(INTDIR)\vc*.idb"
> 	-@erase "$(INTDIR)\vc*.pdb"
>-	-@erase "$(INTDIR)\BuildJPIAgent32.pch"
> 	-@erase "$(OUTDIR)\JPIAgent.dll"
> 	-@erase "$(OUTDIR)\JPIAgent.exp"
> 	-@erase "$(OUTDIR)\JPIAgent.lib"
>-	-@erase "$(OUTDIR)\JPIAgent.ilk"
> 
> "$(OUTDIR)" :
>     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
>@@ -122,6 +129,7 @@
> LINKIPF=link.exe
> LINKIPF_FLAGS=Rpcrt4.lib bufferoverflowu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib MartiniOSA.lib /nologo /dll /pdb:none /debug /machine:ia64 /out:"$(OUTDIR)\JPIAgent.dll" /implib:"$(OUTDIR)\JPIAgent.lib" /libpath:"..\bin\windows\debug\IPF" 
> LINKIPF_OBJS= \
>+	"$(INTDIR)\binformat.obj" \
> 	"$(INTDIR)\ECCallbacks.obj" \
> 	"$(INTDIR)\ECJvmtiAgent.obj" \
> 	"$(INTDIR)\ECWrapper.obj" \
>@@ -129,8 +137,10 @@
> 	"$(INTDIR)\Options.obj" \
> 	"$(INTDIR)\Performance.obj" \
> 	"$(INTDIR)\Print.obj" \
>-	"$(INTDIR)\Profiler.obj" \
>+	"$(INTDIR)\PrintBinary.obj" \
>+	"$(INTDIR)\PrintWrapper.obj" \
> 	"$(INTDIR)\PrintXML.obj" \
>+	"$(INTDIR)\Profiler.obj" \
> 	"$(INTDIR)\utility.obj"
> 
> "$(OUTDIR)\JPIAgent.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINKIPF_OBJS)
>@@ -181,6 +191,12 @@
> 
> 
> !IF "$(CFG)" == "BuildJPIAgentIPF - Win32 Release" || "$(CFG)" == "BuildJPIAgentIPF - Win32 Debug"
>+SOURCE=..\src\JPIAgent\binformat.cpp
>+
>+"$(INTDIR)\binformat.obj" : $(SOURCE) "$(INTDIR)"
>+	$(CPP) $(CPP_PROJ) $(SOURCE)
>+
>+
> SOURCE=..\src\JPIAgent\ECCallbacks.cpp
> 
> "$(INTDIR)\ECCallbacks.obj" : $(SOURCE) "$(INTDIR)"
>@@ -223,20 +239,35 @@
> 	$(CPP) $(CPP_PROJ) $(SOURCE)
> 
> 
>+SOURCE=..\src\JPIAgent\PrintBinary.cpp
>+
>+"$(INTDIR)\PrintBinary.obj" : $(SOURCE) "$(INTDIR)"
>+	$(CPP) $(CPP_PROJ) $(SOURCE)
>+
>+
>+SOURCE=..\src\JPIAgent\PrintWrapper.cpp
>+
>+"$(INTDIR)\PrintWrapper.obj" : $(SOURCE) "$(INTDIR)"
>+	$(CPP) $(CPP_PROJ) $(SOURCE)
>+
>+
> SOURCE=..\src\JPIAgent\PrintXML.cpp
> 
> "$(INTDIR)\PrintXML.obj" : $(SOURCE) "$(INTDIR)"
> 	$(CPP) $(CPP_PROJ) $(SOURCE)
> 
>+
> SOURCE=..\src\JPIAgent\Profiler.c
> 
> "$(INTDIR)\Profiler.obj" : $(SOURCE) "$(INTDIR)"
> 	$(CPP) $(CPP_PROJ) $(SOURCE)
> 
>+
> SOURCE=..\src\JPIAgent\utility.c
> 
> "$(INTDIR)\utility.obj" : $(SOURCE) "$(INTDIR)"
> 	$(CPP) $(CPP_PROJ) $(SOURCE)
> 
>+
> !ENDIF 
>

Actions: View | Diff

Attachments on bug 223830: 93424 | 93496 | 93782