Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 223830 | Differences between
and this patch

Collapse All | Expand All

(-)src-native/src/JPIAgent/binformat.cpp (-9 / +9 lines)
Lines 31-37 Link Here
31
	void *buffer = buf;
31
	void *buffer = buf;
32
32
33
	buffer = write(buffer, message_id);
33
	buffer = write(buffer, message_id);
34
	buffer = write(buffer, message_len);
34
	buffer = write(buffer, static_cast<bf_int_t>(message_len));
35
35
36
	return (buffer);
36
	return (buffer);
37
}
37
}
Lines 1384-1390 Link Here
1384
	buffer = write(buffer, timestamp);
1384
	buffer = write(buffer, timestamp);
1385
	buffer = write(buffer, obj_id_ref);
1385
	buffer = write(buffer, obj_id_ref);
1386
	buffer = write(buffer, timeout);
1386
	buffer = write(buffer, timeout);
1387
	buffer = write(buffer, stack_depth);
1387
	buffer = write(buffer, static_cast<bf_int_t>(stack_depth));
1388
	buffer = write(buffer, stack_methods, stack_depth);
1388
	buffer = write(buffer, stack_methods, stack_depth);
1389
	buffer = write(buffer, stack_lines, stack_depth);
1389
	buffer = write(buffer, stack_lines, stack_depth);
1390
1390
Lines 1398-1404 Link Here
1398
			getSize(timestamp) +
1398
			getSize(timestamp) +
1399
			getSize(obj_id_ref) +
1399
			getSize(obj_id_ref) +
1400
			getSize(timeout) +
1400
			getSize(timeout) +
1401
			getSize(stack_depth)) +
1401
			getSize(static_cast<bf_int_t>(stack_depth))) +
1402
			getSize(stack_methods, stack_depth) +
1402
			getSize(stack_methods, stack_depth) +
1403
			getSize(stack_lines, stack_depth);
1403
			getSize(stack_lines, stack_depth);
1404
}
1404
}
Lines 1428-1434 Link Here
1428
	buffer = write(buffer, timestamp);
1428
	buffer = write(buffer, timestamp);
1429
	buffer = write(buffer, obj_id_ref);
1429
	buffer = write(buffer, obj_id_ref);
1430
	buffer = write(buffer, thread_owner_id_ref);
1430
	buffer = write(buffer, thread_owner_id_ref);
1431
	buffer = write(buffer, stack_depth);
1431
	buffer = write(buffer, static_cast<bf_int_t>(stack_depth));
1432
	buffer = write(buffer, stack_methods, stack_depth);
1432
	buffer = write(buffer, stack_methods, stack_depth);
1433
	buffer = write(buffer, stack_lines, stack_depth);
1433
	buffer = write(buffer, stack_lines, stack_depth);
1434
1434
Lines 1442-1448 Link Here
1442
			getSize(timestamp) +
1442
			getSize(timestamp) +
1443
			getSize(obj_id_ref) +
1443
			getSize(obj_id_ref) +
1444
			getSize(thread_owner_id_ref) +
1444
			getSize(thread_owner_id_ref) +
1445
			getSize(stack_depth)) +
1445
			getSize(static_cast<bf_int_t>(stack_depth))) +
1446
			getSize(stack_methods, stack_depth) +
1446
			getSize(stack_methods, stack_depth) +
1447
			getSize(stack_lines, stack_depth);
1447
			getSize(stack_lines, stack_depth);
1448
}
1448
}
Lines 1465-1471 Link Here
1465
	buffer = write(buffer, thread_id_ref);
1465
	buffer = write(buffer, thread_id_ref);
1466
	buffer = write(buffer, timestamp);
1466
	buffer = write(buffer, timestamp);
1467
	buffer = write(buffer, obj_id_ref);
1467
	buffer = write(buffer, obj_id_ref);
1468
	buffer = write(buffer, stack_depth);
1468
	buffer = write(buffer, static_cast<bf_int_t>(stack_depth));
1469
	buffer = write(buffer, stack_methods, stack_depth);
1469
	buffer = write(buffer, stack_methods, stack_depth);
1470
	buffer = write(buffer, stack_lines, stack_depth);
1470
	buffer = write(buffer, stack_lines, stack_depth);
1471
1471
Lines 1478-1484 Link Here
1478
	return (getSize(thread_id_ref) +
1478
	return (getSize(thread_id_ref) +
1479
			getSize(timestamp) +
1479
			getSize(timestamp) +
1480
			getSize(obj_id_ref) +
1480
			getSize(obj_id_ref) +
1481
			getSize(stack_depth)) +
1481
			getSize(static_cast<bf_int_t>(stack_depth))) +
1482
			getSize(stack_methods, stack_depth) +
1482
			getSize(stack_methods, stack_depth) +
1483
			getSize(stack_lines, stack_depth);
1483
			getSize(stack_lines, stack_depth);
1484
}
1484
}
Lines 1684-1690 Link Here
1684
	buffer = write(buffer, timestamp);
1684
	buffer = write(buffer, timestamp);
1685
	buffer = write(buffer, static_obj_id_ref);
1685
	buffer = write(buffer, static_obj_id_ref);
1686
	buffer = write(buffer, notify_all);
1686
	buffer = write(buffer, notify_all);
1687
	buffer = write(buffer, stack_depth);
1687
	buffer = write(buffer, static_cast<bf_int_t>(stack_depth));
1688
	buffer = write(buffer, stack_methods, stack_depth);
1688
	buffer = write(buffer, stack_methods, stack_depth);
1689
	buffer = write(buffer, stack_lines, stack_depth);
1689
	buffer = write(buffer, stack_lines, stack_depth);
1690
1690
Lines 1698-1704 Link Here
1698
			getSize(timestamp) +
1698
			getSize(timestamp) +
1699
			getSize(static_obj_id_ref) +
1699
			getSize(static_obj_id_ref) +
1700
			getSize(notify_all) +
1700
			getSize(notify_all) +
1701
			getSize(stack_depth)) +
1701
			getSize(static_cast<bf_int_t>(stack_depth))) +
1702
			getSize(stack_methods, stack_depth) +
1702
			getSize(stack_methods, stack_depth) +
1703
			getSize(stack_lines, stack_depth);
1703
			getSize(stack_lines, stack_depth);
1704
}
1704
}
(-)src-native/src/JPIAgent/PrintBinary.cpp (+5 lines)
Lines 727-737 Link Here
727
    }
727
    }
728
728
729
    if (m_pOptions->isStackInfoNormal()) {
729
    if (m_pOptions->isStackInfoNormal()) {
730
		msg->stack_methods = static_cast<bf_string_t*>(malloc(sizeof(void *) * stackTrace->uiSize));
731
		msg->stack_lines = static_cast<bf_long_t*>(malloc(sizeof(bf_long_t) * stackTrace->uiSize));
730
		AppendAnnotations(msg->stack_methods, msg->stack_lines, &msg->stack_depth, stackTrace);
732
		AppendAnnotations(msg->stack_methods, msg->stack_lines, &msg->stack_depth, stackTrace);
731
    }
733
    }
732
734
733
	printMessage(msg, &elb);
735
	printMessage(msg, &elb);
734
736
737
	if (msg->stack_methods != NULL) free(msg->stack_methods);
738
	if (msg->stack_lines != NULL) free(msg->stack_lines);
739
735
	delete msg;
740
	delete msg;
736
}
741
}
737
742
(-)src-native/build/BuildJPIAgent32.mak (-4 / +35 lines)
Lines 41-46 Link Here
41
41
42
42
43
CLEAN :
43
CLEAN :
44
	-@erase "$(INTDIR)\binformat.obj"
44
	-@erase "$(INTDIR)\ECCallbacks.obj"
45
	-@erase "$(INTDIR)\ECCallbacks.obj"
45
	-@erase "$(INTDIR)\ECJvmtiAgent.obj"
46
	-@erase "$(INTDIR)\ECJvmtiAgent.obj"
46
	-@erase "$(INTDIR)\ECWrapper.obj"
47
	-@erase "$(INTDIR)\ECWrapper.obj"
Lines 48-58 Link Here
48
	-@erase "$(INTDIR)\Options.obj"
49
	-@erase "$(INTDIR)\Options.obj"
49
	-@erase "$(INTDIR)\Performance.obj"
50
	-@erase "$(INTDIR)\Performance.obj"
50
	-@erase "$(INTDIR)\Print.obj"
51
	-@erase "$(INTDIR)\Print.obj"
51
	-@erase "$(INTDIR)\Profiler.obj"
52
	-@erase "$(INTDIR)\PrintBinary.obj"
53
	-@erase "$(INTDIR)\PrintWrapper.obj"
52
	-@erase "$(INTDIR)\PrintXML.obj"
54
	-@erase "$(INTDIR)\PrintXML.obj"
55
	-@erase "$(INTDIR)\Profiler.obj"
53
	-@erase "$(INTDIR)\utility.obj"
56
	-@erase "$(INTDIR)\utility.obj"
54
	-@erase "$(INTDIR)\vc*.idb"
57
	-@erase "$(INTDIR)\vc*.idb"
55
	-@erase "$(INTDIR)\BuildJPIAgent32.pch"
58
	-@erase "$(INTDIR)\vc*.pdb"
56
	-@erase "$(OUTDIR)\JPIAgent.dll"
59
	-@erase "$(OUTDIR)\JPIAgent.dll"
57
	-@erase "$(OUTDIR)\JPIAgent.exp"
60
	-@erase "$(OUTDIR)\JPIAgent.exp"
58
	-@erase "$(OUTDIR)\JPIAgent.lib"
61
	-@erase "$(OUTDIR)\JPIAgent.lib"
Lines 72-77 Link Here
72
LINK32=link.exe
75
LINK32=link.exe
73
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"
76
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"
74
LINK32_OBJS= \
77
LINK32_OBJS= \
78
	"$(INTDIR)\binformat.obj" \
75
	"$(INTDIR)\ECCallbacks.obj" \
79
	"$(INTDIR)\ECCallbacks.obj" \
76
	"$(INTDIR)\ECJvmtiAgent.obj" \
80
	"$(INTDIR)\ECJvmtiAgent.obj" \
77
	"$(INTDIR)\ECWrapper.obj" \
81
	"$(INTDIR)\ECWrapper.obj" \
Lines 79-84 Link Here
79
	"$(INTDIR)\Options.obj" \
83
	"$(INTDIR)\Options.obj" \
80
	"$(INTDIR)\Performance.obj" \
84
	"$(INTDIR)\Performance.obj" \
81
	"$(INTDIR)\Print.obj" \
85
	"$(INTDIR)\Print.obj" \
86
	"$(INTDIR)\PrintBinary.obj" \
87
	"$(INTDIR)\PrintWrapper.obj" \
82
	"$(INTDIR)\PrintXML.obj" \
88
	"$(INTDIR)\PrintXML.obj" \
83
	"$(INTDIR)\Profiler.obj" \
89
	"$(INTDIR)\Profiler.obj" \
84
	"$(INTDIR)\utility.obj"
90
	"$(INTDIR)\utility.obj"
Lines 100-105 Link Here
100
106
101
107
102
CLEAN :
108
CLEAN :
109
	-@erase "$(INTDIR)\binformat.obj"
103
	-@erase "$(INTDIR)\ECCallbacks.obj"
110
	-@erase "$(INTDIR)\ECCallbacks.obj"
104
	-@erase "$(INTDIR)\ECJvmtiAgent.obj"
111
	-@erase "$(INTDIR)\ECJvmtiAgent.obj"
105
	-@erase "$(INTDIR)\ECWrapper.obj"
112
	-@erase "$(INTDIR)\ECWrapper.obj"
Lines 107-122 Link Here
107
	-@erase "$(INTDIR)\Options.obj"
114
	-@erase "$(INTDIR)\Options.obj"
108
	-@erase "$(INTDIR)\Performance.obj"
115
	-@erase "$(INTDIR)\Performance.obj"
109
	-@erase "$(INTDIR)\Print.obj"
116
	-@erase "$(INTDIR)\Print.obj"
117
	-@erase "$(INTDIR)\PrintBinary.obj"
118
	-@erase "$(INTDIR)\PrintWrapper.obj"
110
	-@erase "$(INTDIR)\PrintXML.obj"
119
	-@erase "$(INTDIR)\PrintXML.obj"
111
	-@erase "$(INTDIR)\Profiler.obj"
120
	-@erase "$(INTDIR)\Profiler.obj"
112
	-@erase "$(INTDIR)\utility.obj"
121
	-@erase "$(INTDIR)\utility.obj"
113
	-@erase "$(INTDIR)\vc*.idb"
122
	-@erase "$(INTDIR)\vc*.idb"
114
	-@erase "$(INTDIR)\vc*.pdb"
123
	-@erase "$(INTDIR)\vc*.pdb"
115
	-@erase "$(INTDIR)\BuildJPIAgent32.pch"
116
	-@erase "$(OUTDIR)\JPIAgent.dll"
124
	-@erase "$(OUTDIR)\JPIAgent.dll"
117
	-@erase "$(OUTDIR)\JPIAgent.exp"
125
	-@erase "$(OUTDIR)\JPIAgent.exp"
118
	-@erase "$(OUTDIR)\JPIAgent.lib"
126
	-@erase "$(OUTDIR)\JPIAgent.lib"
119
	-@erase "$(OUTDIR)\JPIAgent.ilk"
120
127
121
"$(OUTDIR)" :
128
"$(OUTDIR)" :
122
    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
129
    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
Lines 133-138 Link Here
133
LINK32=link.exe
140
LINK32=link.exe
134
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"
141
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"
135
LINK32_OBJS= \
142
LINK32_OBJS= \
143
	"$(INTDIR)\binformat.obj" \
136
	"$(INTDIR)\ECCallbacks.obj" \
144
	"$(INTDIR)\ECCallbacks.obj" \
137
	"$(INTDIR)\ECJvmtiAgent.obj" \
145
	"$(INTDIR)\ECJvmtiAgent.obj" \
138
	"$(INTDIR)\ECWrapper.obj" \
146
	"$(INTDIR)\ECWrapper.obj" \
Lines 140-145 Link Here
140
	"$(INTDIR)\Options.obj" \
148
	"$(INTDIR)\Options.obj" \
141
	"$(INTDIR)\Performance.obj" \
149
	"$(INTDIR)\Performance.obj" \
142
	"$(INTDIR)\Print.obj" \
150
	"$(INTDIR)\Print.obj" \
151
	"$(INTDIR)\PrintBinary.obj" \
152
	"$(INTDIR)\PrintWrapper.obj" \
143
	"$(INTDIR)\PrintXML.obj" \
153
	"$(INTDIR)\PrintXML.obj" \
144
	"$(INTDIR)\Profiler.obj" \
154
	"$(INTDIR)\Profiler.obj" \
145
	"$(INTDIR)\utility.obj"
155
	"$(INTDIR)\utility.obj"
Lines 192-197 Link Here
192
202
193
203
194
!IF "$(CFG)" == "BuildJPIAgent32 - Win32 Release" || "$(CFG)" == "BuildJPIAgent32 - Win32 Debug"
204
!IF "$(CFG)" == "BuildJPIAgent32 - Win32 Release" || "$(CFG)" == "BuildJPIAgent32 - Win32 Debug"
205
SOURCE=..\src\JPIAgent\binformat.cpp
206
207
"$(INTDIR)\binformat.obj" : $(SOURCE) "$(INTDIR)"
208
	$(CPP) $(CPP_PROJ) $(SOURCE)
209
210
195
SOURCE=..\src\JPIAgent\ECCallbacks.cpp
211
SOURCE=..\src\JPIAgent\ECCallbacks.cpp
196
212
197
"$(INTDIR)\ECCallbacks.obj" : $(SOURCE) "$(INTDIR)"
213
"$(INTDIR)\ECCallbacks.obj" : $(SOURCE) "$(INTDIR)"
Lines 233-248 Link Here
233
"$(INTDIR)\Print.obj" : $(SOURCE) "$(INTDIR)"
249
"$(INTDIR)\Print.obj" : $(SOURCE) "$(INTDIR)"
234
	$(CPP) $(CPP_PROJ) $(SOURCE)
250
	$(CPP) $(CPP_PROJ) $(SOURCE)
235
251
252
253
SOURCE=..\src\JPIAgent\PrintBinary.cpp
254
255
"$(INTDIR)\PrintBinary.obj" : $(SOURCE) "$(INTDIR)"
256
	$(CPP) $(CPP_PROJ) $(SOURCE)
257
258
259
SOURCE=..\src\JPIAgent\PrintWrapper.cpp
260
261
"$(INTDIR)\PrintWrapper.obj" : $(SOURCE) "$(INTDIR)"
262
	$(CPP) $(CPP_PROJ) $(SOURCE)
263
264
236
SOURCE=..\src\JPIAgent\PrintXML.cpp
265
SOURCE=..\src\JPIAgent\PrintXML.cpp
237
266
238
"$(INTDIR)\PrintXML.obj" : $(SOURCE) "$(INTDIR)"
267
"$(INTDIR)\PrintXML.obj" : $(SOURCE) "$(INTDIR)"
239
	$(CPP) $(CPP_PROJ) $(SOURCE)
268
	$(CPP) $(CPP_PROJ) $(SOURCE)
240
269
270
241
SOURCE=..\src\JPIAgent\Profiler.c
271
SOURCE=..\src\JPIAgent\Profiler.c
242
272
243
"$(INTDIR)\Profiler.obj" : $(SOURCE) "$(INTDIR)"
273
"$(INTDIR)\Profiler.obj" : $(SOURCE) "$(INTDIR)"
244
	$(CPP) $(CPP_PROJ) $(SOURCE)
274
	$(CPP) $(CPP_PROJ) $(SOURCE)
245
275
276
246
SOURCE=..\src\JPIAgent\utility.c
277
SOURCE=..\src\JPIAgent\utility.c
247
278
248
"$(INTDIR)\utility.obj" : $(SOURCE) "$(INTDIR)"
279
"$(INTDIR)\utility.obj" : $(SOURCE) "$(INTDIR)"
(-)src-native/build/BuildJPIAgentEM64T.mak (-4 / +35 lines)
Lines 38-43 Link Here
38
ALL : "$(OUTDIR)\JPIAgent.dll"
38
ALL : "$(OUTDIR)\JPIAgent.dll"
39
39
40
CLEAN :
40
CLEAN :
41
	-@erase "$(INTDIR)\binformat.obj"
41
	-@erase "$(INTDIR)\ECCallbacks.obj"
42
	-@erase "$(INTDIR)\ECCallbacks.obj"
42
	-@erase "$(INTDIR)\ECJvmtiAgent.obj"
43
	-@erase "$(INTDIR)\ECJvmtiAgent.obj"
43
	-@erase "$(INTDIR)\ECWrapper.obj"
44
	-@erase "$(INTDIR)\ECWrapper.obj"
Lines 45-55 Link Here
45
	-@erase "$(INTDIR)\Options.obj"
46
	-@erase "$(INTDIR)\Options.obj"
46
	-@erase "$(INTDIR)\Performance.obj"
47
	-@erase "$(INTDIR)\Performance.obj"
47
	-@erase "$(INTDIR)\Print.obj"
48
	-@erase "$(INTDIR)\Print.obj"
49
	-@erase "$(INTDIR)\PrintBinary.obj"
50
	-@erase "$(INTDIR)\PrintWrapper.obj"
48
	-@erase "$(INTDIR)\PrintXML.obj"
51
	-@erase "$(INTDIR)\PrintXML.obj"
49
	-@erase "$(INTDIR)\Profiler.obj"
52
	-@erase "$(INTDIR)\Profiler.obj"
50
	-@erase "$(INTDIR)\utility.obj"
53
	-@erase "$(INTDIR)\utility.obj"
51
	-@erase "$(INTDIR)\vc*.idb"
54
	-@erase "$(INTDIR)\vc*.idb"
52
	-@erase "$(INTDIR)\BuildJPIAgent32.pch"
55
	-@erase "$(INTDIR)\vc*.pdb"
53
	-@erase "$(OUTDIR)\JPIAgent.dll"
56
	-@erase "$(OUTDIR)\JPIAgent.dll"
54
	-@erase "$(OUTDIR)\JPIAgent.exp"
57
	-@erase "$(OUTDIR)\JPIAgent.exp"
55
	-@erase "$(OUTDIR)\JPIAgent.lib"
58
	-@erase "$(OUTDIR)\JPIAgent.lib"
Lines 65-70 Link Here
65
LINKEM64T=link.exe
68
LINKEM64T=link.exe
66
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" 
69
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" 
67
LINKEM64T_OBJS= \
70
LINKEM64T_OBJS= \
71
	"$(INTDIR)\binformat.obj" \
68
	"$(INTDIR)\ECCallbacks.obj" \
72
	"$(INTDIR)\ECCallbacks.obj" \
69
	"$(INTDIR)\ECJvmtiAgent.obj" \
73
	"$(INTDIR)\ECJvmtiAgent.obj" \
70
	"$(INTDIR)\ECWrapper.obj" \
74
	"$(INTDIR)\ECWrapper.obj" \
Lines 72-77 Link Here
72
	"$(INTDIR)\Options.obj" \
76
	"$(INTDIR)\Options.obj" \
73
	"$(INTDIR)\Performance.obj" \
77
	"$(INTDIR)\Performance.obj" \
74
	"$(INTDIR)\Print.obj" \
78
	"$(INTDIR)\Print.obj" \
79
	"$(INTDIR)\PrintBinary.obj" \
80
	"$(INTDIR)\PrintWrapper.obj" \
75
	"$(INTDIR)\PrintXML.obj" \
81
	"$(INTDIR)\PrintXML.obj" \
76
	"$(INTDIR)\Profiler.obj" \
82
	"$(INTDIR)\Profiler.obj" \
77
	"$(INTDIR)\utility.obj"
83
	"$(INTDIR)\utility.obj"
Lines 93-98 Link Here
93
99
94
100
95
CLEAN :
101
CLEAN :
102
	-@erase "$(INTDIR)\binformat.obj"
96
	-@erase "$(INTDIR)\ECCallbacks.obj"
103
	-@erase "$(INTDIR)\ECCallbacks.obj"
97
	-@erase "$(INTDIR)\ECJvmtiAgent.obj"
104
	-@erase "$(INTDIR)\ECJvmtiAgent.obj"
98
	-@erase "$(INTDIR)\ECWrapper.obj"
105
	-@erase "$(INTDIR)\ECWrapper.obj"
Lines 100-115 Link Here
100
	-@erase "$(INTDIR)\Options.obj"
107
	-@erase "$(INTDIR)\Options.obj"
101
	-@erase "$(INTDIR)\Performance.obj"
108
	-@erase "$(INTDIR)\Performance.obj"
102
	-@erase "$(INTDIR)\Print.obj"
109
	-@erase "$(INTDIR)\Print.obj"
110
	-@erase "$(INTDIR)\PrintBinary.obj"
111
	-@erase "$(INTDIR)\PrintWrapper.obj"
103
	-@erase "$(INTDIR)\PrintXML.obj"
112
	-@erase "$(INTDIR)\PrintXML.obj"
104
	-@erase "$(INTDIR)\Profiler.obj"
113
	-@erase "$(INTDIR)\Profiler.obj"
105
	-@erase "$(INTDIR)\utility.obj"
114
	-@erase "$(INTDIR)\utility.obj"
106
	-@erase "$(INTDIR)\vc*.idb"
115
	-@erase "$(INTDIR)\vc*.idb"
107
	-@erase "$(INTDIR)\vc*.pdb"
116
	-@erase "$(INTDIR)\vc*.pdb"
108
	-@erase "$(INTDIR)\BuildJPIAgent32.pch"
109
	-@erase "$(OUTDIR)\JPIAgent.dll"
117
	-@erase "$(OUTDIR)\JPIAgent.dll"
110
	-@erase "$(OUTDIR)\JPIAgent.exp"
118
	-@erase "$(OUTDIR)\JPIAgent.exp"
111
	-@erase "$(OUTDIR)\JPIAgent.lib"
119
	-@erase "$(OUTDIR)\JPIAgent.lib"
112
	-@erase "$(OUTDIR)\JPIAgent.ilk"
113
120
114
"$(OUTDIR)" :
121
"$(OUTDIR)" :
115
    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
122
    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
Lines 122-127 Link Here
122
LINKEM64T=link.exe
129
LINKEM64T=link.exe
123
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"
130
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"
124
LINKEM64T_OBJS= \
131
LINKEM64T_OBJS= \
132
	"$(INTDIR)\binformat.obj" \
125
	"$(INTDIR)\ECCallbacks.obj" \
133
	"$(INTDIR)\ECCallbacks.obj" \
126
	"$(INTDIR)\ECJvmtiAgent.obj" \
134
	"$(INTDIR)\ECJvmtiAgent.obj" \
127
	"$(INTDIR)\ECWrapper.obj" \
135
	"$(INTDIR)\ECWrapper.obj" \
Lines 129-136 Link Here
129
	"$(INTDIR)\Options.obj" \
137
	"$(INTDIR)\Options.obj" \
130
	"$(INTDIR)\Performance.obj" \
138
	"$(INTDIR)\Performance.obj" \
131
	"$(INTDIR)\Print.obj" \
139
	"$(INTDIR)\Print.obj" \
132
	"$(INTDIR)\Profiler.obj" \
140
	"$(INTDIR)\PrintBinary.obj" \
141
	"$(INTDIR)\PrintWrapper.obj" \
133
	"$(INTDIR)\PrintXML.obj" \
142
	"$(INTDIR)\PrintXML.obj" \
143
	"$(INTDIR)\Profiler.obj" \
134
	"$(INTDIR)\utility.obj"
144
	"$(INTDIR)\utility.obj"
135
145
136
"$(OUTDIR)\JPIAgent.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINKEM64T_OBJS)
146
"$(OUTDIR)\JPIAgent.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINKEM64T_OBJS)
Lines 181-186 Link Here
181
191
182
192
183
!IF "$(CFG)" == "BuildJPIAgentEM64T - Win32 Release" || "$(CFG)" == "BuildJPIAgentEM64T - Win32 Debug"
193
!IF "$(CFG)" == "BuildJPIAgentEM64T - Win32 Release" || "$(CFG)" == "BuildJPIAgentEM64T - Win32 Debug"
194
SOURCE=..\src\JPIAgent\binformat.cpp
195
196
"$(INTDIR)\binformat.obj" : $(SOURCE) "$(INTDIR)"
197
	$(CPP) $(CPP_PROJ) $(SOURCE)
198
199
184
SOURCE=..\src\JPIAgent\ECCallbacks.cpp
200
SOURCE=..\src\JPIAgent\ECCallbacks.cpp
185
201
186
"$(INTDIR)\ECCallbacks.obj" : $(SOURCE) "$(INTDIR)"
202
"$(INTDIR)\ECCallbacks.obj" : $(SOURCE) "$(INTDIR)"
Lines 222-227 Link Here
222
"$(INTDIR)\Print.obj" : $(SOURCE) "$(INTDIR)"
238
"$(INTDIR)\Print.obj" : $(SOURCE) "$(INTDIR)"
223
	$(CPP) $(CPP_PROJ) $(SOURCE)
239
	$(CPP) $(CPP_PROJ) $(SOURCE)
224
240
241
242
SOURCE=..\src\JPIAgent\PrintBinary.cpp
243
244
"$(INTDIR)\PrintBinary.obj" : $(SOURCE) "$(INTDIR)"
245
	$(CPP) $(CPP_PROJ) $(SOURCE)
246
247
248
SOURCE=..\src\JPIAgent\PrintWrapper.cpp
249
250
"$(INTDIR)\PrintWrapper.obj" : $(SOURCE) "$(INTDIR)"
251
	$(CPP) $(CPP_PROJ) $(SOURCE)
252
253
225
SOURCE=..\src\JPIAgent\PrintXML.cpp
254
SOURCE=..\src\JPIAgent\PrintXML.cpp
226
255
227
"$(INTDIR)\PrintXML.obj" : $(SOURCE) "$(INTDIR)"
256
"$(INTDIR)\PrintXML.obj" : $(SOURCE) "$(INTDIR)"
Lines 233-242 Link Here
233
"$(INTDIR)\Profiler.obj" : $(SOURCE) "$(INTDIR)"
262
"$(INTDIR)\Profiler.obj" : $(SOURCE) "$(INTDIR)"
234
	$(CPP) $(CPP_PROJ) $(SOURCE)
263
	$(CPP) $(CPP_PROJ) $(SOURCE)
235
264
265
236
SOURCE=..\src\JPIAgent\utility.c
266
SOURCE=..\src\JPIAgent\utility.c
237
267
238
"$(INTDIR)\utility.obj" : $(SOURCE) "$(INTDIR)"
268
"$(INTDIR)\utility.obj" : $(SOURCE) "$(INTDIR)"
239
	$(CPP) $(CPP_PROJ) $(SOURCE)
269
	$(CPP) $(CPP_PROJ) $(SOURCE)
240
270
271
241
!ENDIF 
272
!ENDIF 
242
273
(-)src-native/build/BuildJPIAgentIPF.mak (-5 / +36 lines)
Lines 38-43 Link Here
38
ALL : "$(OUTDIR)\JPIAgent.dll"
38
ALL : "$(OUTDIR)\JPIAgent.dll"
39
39
40
CLEAN :
40
CLEAN :
41
	-@erase "$(INTDIR)\binformat.obj"
41
	-@erase "$(INTDIR)\ECCallbacks.obj"
42
	-@erase "$(INTDIR)\ECCallbacks.obj"
42
	-@erase "$(INTDIR)\ECJvmtiAgent.obj"
43
	-@erase "$(INTDIR)\ECJvmtiAgent.obj"
43
	-@erase "$(INTDIR)\ECWrapper.obj"
44
	-@erase "$(INTDIR)\ECWrapper.obj"
Lines 45-55 Link Here
45
	-@erase "$(INTDIR)\Options.obj"
46
	-@erase "$(INTDIR)\Options.obj"
46
	-@erase "$(INTDIR)\Performance.obj"
47
	-@erase "$(INTDIR)\Performance.obj"
47
	-@erase "$(INTDIR)\Print.obj"
48
	-@erase "$(INTDIR)\Print.obj"
49
	-@erase "$(INTDIR)\PrintBinary.obj"
50
	-@erase "$(INTDIR)\PrintWrapper.obj"
48
	-@erase "$(INTDIR)\PrintXML.obj"
51
	-@erase "$(INTDIR)\PrintXML.obj"
49
	-@erase "$(INTDIR)\Profiler.obj"
52
	-@erase "$(INTDIR)\Profiler.obj"
50
	-@erase "$(INTDIR)\utility.obj"
53
	-@erase "$(INTDIR)\utility.obj"
51
	-@erase "$(INTDIR)\vc*.idb"
54
	-@erase "$(INTDIR)\vc*.idb"
52
	-@erase "$(INTDIR)\BuildJPIAgent32.pch"
55
	-@erase "$(INTDIR)\vc*.pdb"
53
	-@erase "$(OUTDIR)\JPIAgent.dll"
56
	-@erase "$(OUTDIR)\JPIAgent.dll"
54
	-@erase "$(OUTDIR)\JPIAgent.exp"
57
	-@erase "$(OUTDIR)\JPIAgent.exp"
55
	-@erase "$(OUTDIR)\JPIAgent.lib"
58
	-@erase "$(OUTDIR)\JPIAgent.lib"
Lines 65-70 Link Here
65
LINKIPF=link.exe  
68
LINKIPF=link.exe  
66
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" 
69
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" 
67
LINKIPF_OBJS= \
70
LINKIPF_OBJS= \
71
	"$(INTDIR)\binformat.obj" \
68
	"$(INTDIR)\ECCallbacks.obj" \
72
	"$(INTDIR)\ECCallbacks.obj" \
69
	"$(INTDIR)\ECJvmtiAgent.obj" \
73
	"$(INTDIR)\ECJvmtiAgent.obj" \
70
	"$(INTDIR)\ECWrapper.obj" \
74
	"$(INTDIR)\ECWrapper.obj" \
Lines 72-79 Link Here
72
	"$(INTDIR)\Options.obj" \
76
	"$(INTDIR)\Options.obj" \
73
	"$(INTDIR)\Performance.obj" \
77
	"$(INTDIR)\Performance.obj" \
74
	"$(INTDIR)\Print.obj" \
78
	"$(INTDIR)\Print.obj" \
75
	"$(INTDIR)\Profiler.obj" \
79
	"$(INTDIR)\PrintBinary.obj" \
80
	"$(INTDIR)\PrintWrapper.obj" \
76
	"$(INTDIR)\PrintXML.obj" \
81
	"$(INTDIR)\PrintXML.obj" \
82
	"$(INTDIR)\Profiler.obj" \
77
	"$(INTDIR)\utility.obj"
83
	"$(INTDIR)\utility.obj"
78
84
79
"$(OUTDIR)\JPIAgent.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINKIPF_OBJS)
85
"$(OUTDIR)\JPIAgent.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINKIPF_OBJS)
Lines 93-98 Link Here
93
99
94
100
95
CLEAN :
101
CLEAN :
102
	-@erase "$(INTDIR)\binformat.obj"
96
	-@erase "$(INTDIR)\ECCallbacks.obj"
103
	-@erase "$(INTDIR)\ECCallbacks.obj"
97
	-@erase "$(INTDIR)\ECJvmtiAgent.obj"
104
	-@erase "$(INTDIR)\ECJvmtiAgent.obj"
98
	-@erase "$(INTDIR)\ECWrapper.obj"
105
	-@erase "$(INTDIR)\ECWrapper.obj"
Lines 100-115 Link Here
100
	-@erase "$(INTDIR)\Options.obj"
107
	-@erase "$(INTDIR)\Options.obj"
101
	-@erase "$(INTDIR)\Performance.obj"
108
	-@erase "$(INTDIR)\Performance.obj"
102
	-@erase "$(INTDIR)\Print.obj"
109
	-@erase "$(INTDIR)\Print.obj"
110
	-@erase "$(INTDIR)\PrintBinary.obj"
111
	-@erase "$(INTDIR)\PrintWrapper.obj"
103
	-@erase "$(INTDIR)\PrintXML.obj"
112
	-@erase "$(INTDIR)\PrintXML.obj"
104
	-@erase "$(INTDIR)\Profiler.obj"
113
	-@erase "$(INTDIR)\Profiler.obj"
105
	-@erase "$(INTDIR)\utility.obj"
114
	-@erase "$(INTDIR)\utility.obj"
106
	-@erase "$(INTDIR)\vc*.idb"
115
	-@erase "$(INTDIR)\vc*.idb"
107
	-@erase "$(INTDIR)\vc*.pdb"
116
	-@erase "$(INTDIR)\vc*.pdb"
108
	-@erase "$(INTDIR)\BuildJPIAgent32.pch"
109
	-@erase "$(OUTDIR)\JPIAgent.dll"
117
	-@erase "$(OUTDIR)\JPIAgent.dll"
110
	-@erase "$(OUTDIR)\JPIAgent.exp"
118
	-@erase "$(OUTDIR)\JPIAgent.exp"
111
	-@erase "$(OUTDIR)\JPIAgent.lib"
119
	-@erase "$(OUTDIR)\JPIAgent.lib"
112
	-@erase "$(OUTDIR)\JPIAgent.ilk"
113
120
114
"$(OUTDIR)" :
121
"$(OUTDIR)" :
115
    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
122
    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
Lines 122-127 Link Here
122
LINKIPF=link.exe
129
LINKIPF=link.exe
123
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" 
130
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" 
124
LINKIPF_OBJS= \
131
LINKIPF_OBJS= \
132
	"$(INTDIR)\binformat.obj" \
125
	"$(INTDIR)\ECCallbacks.obj" \
133
	"$(INTDIR)\ECCallbacks.obj" \
126
	"$(INTDIR)\ECJvmtiAgent.obj" \
134
	"$(INTDIR)\ECJvmtiAgent.obj" \
127
	"$(INTDIR)\ECWrapper.obj" \
135
	"$(INTDIR)\ECWrapper.obj" \
Lines 129-136 Link Here
129
	"$(INTDIR)\Options.obj" \
137
	"$(INTDIR)\Options.obj" \
130
	"$(INTDIR)\Performance.obj" \
138
	"$(INTDIR)\Performance.obj" \
131
	"$(INTDIR)\Print.obj" \
139
	"$(INTDIR)\Print.obj" \
132
	"$(INTDIR)\Profiler.obj" \
140
	"$(INTDIR)\PrintBinary.obj" \
141
	"$(INTDIR)\PrintWrapper.obj" \
133
	"$(INTDIR)\PrintXML.obj" \
142
	"$(INTDIR)\PrintXML.obj" \
143
	"$(INTDIR)\Profiler.obj" \
134
	"$(INTDIR)\utility.obj"
144
	"$(INTDIR)\utility.obj"
135
145
136
"$(OUTDIR)\JPIAgent.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINKIPF_OBJS)
146
"$(OUTDIR)\JPIAgent.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINKIPF_OBJS)
Lines 181-186 Link Here
181
191
182
192
183
!IF "$(CFG)" == "BuildJPIAgentIPF - Win32 Release" || "$(CFG)" == "BuildJPIAgentIPF - Win32 Debug"
193
!IF "$(CFG)" == "BuildJPIAgentIPF - Win32 Release" || "$(CFG)" == "BuildJPIAgentIPF - Win32 Debug"
194
SOURCE=..\src\JPIAgent\binformat.cpp
195
196
"$(INTDIR)\binformat.obj" : $(SOURCE) "$(INTDIR)"
197
	$(CPP) $(CPP_PROJ) $(SOURCE)
198
199
184
SOURCE=..\src\JPIAgent\ECCallbacks.cpp
200
SOURCE=..\src\JPIAgent\ECCallbacks.cpp
185
201
186
"$(INTDIR)\ECCallbacks.obj" : $(SOURCE) "$(INTDIR)"
202
"$(INTDIR)\ECCallbacks.obj" : $(SOURCE) "$(INTDIR)"
Lines 223-242 Link Here
223
	$(CPP) $(CPP_PROJ) $(SOURCE)
239
	$(CPP) $(CPP_PROJ) $(SOURCE)
224
240
225
241
242
SOURCE=..\src\JPIAgent\PrintBinary.cpp
243
244
"$(INTDIR)\PrintBinary.obj" : $(SOURCE) "$(INTDIR)"
245
	$(CPP) $(CPP_PROJ) $(SOURCE)
246
247
248
SOURCE=..\src\JPIAgent\PrintWrapper.cpp
249
250
"$(INTDIR)\PrintWrapper.obj" : $(SOURCE) "$(INTDIR)"
251
	$(CPP) $(CPP_PROJ) $(SOURCE)
252
253
226
SOURCE=..\src\JPIAgent\PrintXML.cpp
254
SOURCE=..\src\JPIAgent\PrintXML.cpp
227
255
228
"$(INTDIR)\PrintXML.obj" : $(SOURCE) "$(INTDIR)"
256
"$(INTDIR)\PrintXML.obj" : $(SOURCE) "$(INTDIR)"
229
	$(CPP) $(CPP_PROJ) $(SOURCE)
257
	$(CPP) $(CPP_PROJ) $(SOURCE)
230
258
259
231
SOURCE=..\src\JPIAgent\Profiler.c
260
SOURCE=..\src\JPIAgent\Profiler.c
232
261
233
"$(INTDIR)\Profiler.obj" : $(SOURCE) "$(INTDIR)"
262
"$(INTDIR)\Profiler.obj" : $(SOURCE) "$(INTDIR)"
234
	$(CPP) $(CPP_PROJ) $(SOURCE)
263
	$(CPP) $(CPP_PROJ) $(SOURCE)
235
264
265
236
SOURCE=..\src\JPIAgent\utility.c
266
SOURCE=..\src\JPIAgent\utility.c
237
267
238
"$(INTDIR)\utility.obj" : $(SOURCE) "$(INTDIR)"
268
"$(INTDIR)\utility.obj" : $(SOURCE) "$(INTDIR)"
239
	$(CPP) $(CPP_PROJ) $(SOURCE)
269
	$(CPP) $(CPP_PROJ) $(SOURCE)
240
270
271
241
!ENDIF 
272
!ENDIF 
242
273

Return to bug 223830