Attachment #144245 for bug #182085

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

Lines 1-6 Link Here

(-)makefile.win_ia32 (+30 lines)
1	all: javaprofiler	1	all: javaprofiler
2		2
3	javaprofiler:	3	javaprofiler:
		4	REM Create ProbeAgentExtension.dll
		5	cd org.eclipse.hyades.probekit\\src-native\\ProbeAgentExtension
		6	msdev WinBuild\\ProbeAgentExtension.dsw /MAKE "ProbeAgentExtension - Win32 Release" /USEENV
		7	cd ..\\..\\..
		8
4	cd org.eclipse.tptp.platform.jvmti.runtime	9	cd org.eclipse.tptp.platform.jvmti.runtime
5	cd src-native	10	cd src-native
6	cd build	11	cd build
Lines 9-14 Link Here
9	cd ..	14	cd ..
10		15
11	package:	16	package:
		17	REM Package ProbeAgentExtension
		18	if exist pae-package rm -rf pae-package
		19	md pae-package
		20	md pae-package\config
		21	md pae-package\lib
		22	copy /y org.eclipse.hyades.probekit\about.html pae-package
		23	copy /y org.eclipse.hyades.probekit\src-native\ProbeAgentExtension\WinBuild\Release\ProbeAgentExtension.dll pae-package\lib
		24	copy /y $(PROBEKIT_LIB)\BCIEngProbe.dll pae-package\lib
		25	copy /y org.eclipse.hyades.probekit\src-native\ProbeAgentExtension\pluginconfig_win32.xml pae-package\config\pluginconfig.xml
		26	cd pae-package
		27	zip -r9 ..\pae.win_ia32.zip *
		28	cd lib
		29	zip -r9 ..\..\pae-only.win_ia32.zip ProbeAgentExtension.dll
		30	cd ..
		31	cd ..
		32
		33	REM Package JVMTI
12	if exist packaging rm -rf packaging	34	if exist packaging rm -rf packaging
13	md packaging\plugins\org.eclipse.tptp.javaprofiler	35	md packaging\plugins\org.eclipse.tptp.javaprofiler
14	md packaging\plugins\org.eclipse.tptp.javaprofiler\config	36	md packaging\plugins\org.eclipse.tptp.javaprofiler\config
Lines 26-34 Link Here
26	copy /y org.eclipse.tptp.platform.jvmti.runtime\src-native\src\Martini\Infrastructure\HeapAdaptor\org\eclipse\tptp\martini\HeapProxy.class packaging\plugins\org.eclipse.tptp.javaprofiler\org\eclipse\tptp\martini	48	copy /y org.eclipse.tptp.platform.jvmti.runtime\src-native\src\Martini\Infrastructure\HeapAdaptor\org\eclipse\tptp\martini\HeapProxy.class packaging\plugins\org.eclipse.tptp.javaprofiler\org\eclipse\tptp\martini
27	copy /y org.eclipse.tptp.platform.jvmti.runtime\src-native\src\Martini\Infrastructure\ThreadAdaptor\org\eclipse\tptp\martini\ThreadProxy.class packaging\plugins\org.eclipse.tptp.javaprofiler\org\eclipse\tptp\martini	49	copy /y org.eclipse.tptp.platform.jvmti.runtime\src-native\src\Martini\Infrastructure\ThreadAdaptor\org\eclipse\tptp\martini\ThreadProxy.class packaging\plugins\org.eclipse.tptp.javaprofiler\org\eclipse\tptp\martini
28		50
		51	REM Add probe's BCIEngProbe.dll to javaprofiler's libs (bug 268532)
		52	copy /y $(PROBEKIT_LIB)\BCIEngProbe.dll packaging\plugins\org.eclipse.tptp.javaprofiler\BCIEngProbe.dll
		53
29	if exist javaprofiler.win_ia32.zip rm -f javaprofiler.win_ia32.zip	54	if exist javaprofiler.win_ia32.zip rm -f javaprofiler.win_ia32.zip
30	cd packaging	55	cd packaging
31	zip -r9 ..\javaprofiler.win_ia32.zip *	56	zip -r9 ..\javaprofiler.win_ia32.zip *
		57	cd plugins
		58	cd org.eclipse.tptp.javaprofiler
		59	zip -r9 ..\..\..\jvmti-only.win_ia32.zip *
		60	cd ..
		61	cd ..
32		62
33	md plugins\org.eclipse.tptp.javaprofiler.sdk	63	md plugins\org.eclipse.tptp.javaprofiler.sdk
34	md plugins\org.eclipse.tptp.javaprofiler.sdk\Lib	64	md plugins\org.eclipse.tptp.javaprofiler.sdk\Lib




	cd ..
	
package:
	REM Package ProbeAgentExtension
	if exist pae-package rm -rf pae-package
	md pae-package
	md pae-package\config
	md pae-package\lib
	copy /y org.eclipse.hyades.probekit\about.html pae-package
	copy /y $(PROBEKIT_LIB)\ProbeAgentExtension\Release\ProbeAgentExtension.dll pae-package\lib
	copy /y $(PROBEKIT_LIB)\BCI\Release\BCIEngProbe.dll pae-package\lib
	copy /y org.eclipse.hyades.probekit\src-native\ProbeAgentExtension\pluginconfig_win32.xml pae-package\config\pluginconfig.xml
	cd pae-package
	zip -r9 ..\pae.win_em64t.zip *
	cd lib
	zip -r9 ..\..\pae-only.win_em64t.zip ProbeAgentExtension.dll
	cd ..
	cd ..

	if exist packaging rm -rf packaging
	md packaging\plugins\org.eclipse.tptp.javaprofiler
	md packaging\plugins\org.eclipse.tptp.javaprofiler\config

	copy /y org.eclipse.tptp.platform.jvmti.runtime\src-native\src\Martini\Infrastructure\HeapAdaptor\org\eclipse\tptp\martini\HeapProxy.class packaging\plugins\org.eclipse.tptp.javaprofiler\org\eclipse\tptp\martini
	copy /y org.eclipse.tptp.platform.jvmti.runtime\src-native\src\Martini\Infrastructure\ThreadAdaptor\org\eclipse\tptp\martini\ThreadProxy.class packaging\plugins\org.eclipse.tptp.javaprofiler\org\eclipse\tptp\martini

	REM Add probe's BCIEngProbe.dll to javaprofiler's libs (bug 268532)
	copy /y $(PROBEKIT_LIB)\BCI\Release\BCIEngProbe.dll packaging\plugins\org.eclipse.tptp.javaprofiler\BCIEngProbe.dll

	if exist javaprofiler.win_em64t.zip  rm -f javaprofiler.win_em64t.zip 
	cd packaging
	zip -r9 ..\javaprofiler.win_em64t.zip *
	cd plugins
	cd org.eclipse.tptp.javaprofiler
	zip -r9 ..\..\..\jvmti-only.win_em64t.zip *
	cd ..
	cd ..

	md plugins\org.eclipse.tptp.javaprofiler.sdk
	md plugins\org.eclipse.tptp.javaprofiler.sdk\Lib

Lines 69-74 Link Here

(-)makefile (-1 / +24 lines)
69	BUILD_OPT="RELEASE=1"	69	BUILD_OPT="RELEASE=1"
70		70
71	javaprofiler:	71	javaprofiler:
		72	# Make ProbeAgentExtension then the JVMTI
		73	make --directory=org.eclipse.hyades.probekit/src-native/ProbeAgentExtension -f Makefile.unix; \
72	cd org.eclipse.tptp.platform.jvmti.runtime/src-native; \	74	cd org.eclipse.tptp.platform.jvmti.runtime/src-native; \
73	mkdir -p plugins/org.eclipse.tptp.javaprofiler; \	75	mkdir -p plugins/org.eclipse.tptp.javaprofiler; \
74	cd build; \	76	cd build; \
Lines 85-90 Link Here
85	cd ..	87	cd ..
86		88
87	package:	89	package:
		90	# Package ProbeAgentExtension
		91	rm -rf pae-package
		92	mkdir -p pae-package/config
		93	mkdir -p pae-package/lib
		94	cp org.eclipse.hyades.probekit/about.html pae-package
		95	cp org.eclipse.hyades.probekit/src-native/ProbeAgentExtension/ProbeAgentExtension.so pae-package/lib
		96	cp $(PROBEKIT_LIB)/BCIEngProbe.so pae-package/lib
		97	cp org.eclipse.hyades.probekit/src-native/ProbeAgentExtension/pluginconfig_linux.xml pae-package/config/pluginconfig.xml
		98	cd pae-package; \
		99	zip -r9y ../pae.$(BUILD_PLATFORM).zip *; \
		100	cd lib; \
		101	zip -r9y ../../pae-only.$(BUILD_PLATFORM).zip ProbeAgentExtension.so; \
		102	cd ../..
		103
		104	# Package JVMTI
88	rm -rf packaging	105	rm -rf packaging
89	mkdir -p packaging/plugins/org.eclipse.tptp.javaprofiler	106	mkdir -p packaging/plugins/org.eclipse.tptp.javaprofiler
90	mkdir -p packaging/plugins/org.eclipse.tptp.javaprofiler/config	107	mkdir -p packaging/plugins/org.eclipse.tptp.javaprofiler/config
Lines 116-124 Link Here
116	cp org.eclipse.tptp.platform.jvmti.runtime/src-native/src/Martini/Infrastructure/CGAdaptor/org/eclipse/tptp/martini/CGProxy.class packaging/plugins/org.eclipse.tptp.javaprofiler/org/eclipse/tptp/martini	133	cp org.eclipse.tptp.platform.jvmti.runtime/src-native/src/Martini/Infrastructure/CGAdaptor/org/eclipse/tptp/martini/CGProxy.class packaging/plugins/org.eclipse.tptp.javaprofiler/org/eclipse/tptp/martini
117	cp org.eclipse.tptp.platform.jvmti.runtime/src-native/src/Martini/Infrastructure/HeapAdaptor/org/eclipse/tptp/martini/HeapProxy.class packaging/plugins/org.eclipse.tptp.javaprofiler/org/eclipse/tptp/martini	134	cp org.eclipse.tptp.platform.jvmti.runtime/src-native/src/Martini/Infrastructure/HeapAdaptor/org/eclipse/tptp/martini/HeapProxy.class packaging/plugins/org.eclipse.tptp.javaprofiler/org/eclipse/tptp/martini
118	cp org.eclipse.tptp.platform.jvmti.runtime/src-native/src/Martini/Infrastructure/ThreadAdaptor/org/eclipse/tptp/martini/ThreadProxy.class packaging/plugins/org.eclipse.tptp.javaprofiler/org/eclipse/tptp/martini	135	cp org.eclipse.tptp.platform.jvmti.runtime/src-native/src/Martini/Infrastructure/ThreadAdaptor/org/eclipse/tptp/martini/ThreadProxy.class packaging/plugins/org.eclipse.tptp.javaprofiler/org/eclipse/tptp/martini
		136
		137	# Add probe's BCIEngProbe.so to javaprofiler's libs as libBCIEngProbe.so (bug 187527)
		138	cp $(PROBEKIT_LIB)/BCIEngProbe.so packaging/plugins/org.eclipse.tptp.javaprofiler/libBCIEngProbe.so
		139
119	cd packaging; \	140	cd packaging; \
120	zip -r9y ../javaprofiler.$(BUILD_PLATFORM).zip *; \	141	zip -r9y ../javaprofiler.$(BUILD_PLATFORM).zip *; \
121	cd ..	142	cd plugins/org.eclipse.tptp.javaprofiler; \
		143	zip -r9y ../../../jvmti-only.$(BUILD_PLATFORM).zip *; \
		144	cd ../../..
122		145
123	# Package the SDK	146	# Package the SDK
124	mkdir -p packaging/plugins/org.eclipse.tptp.javaprofiler.sdk	147	mkdir -p packaging/plugins/org.eclipse.tptp.javaprofiler.sdk

Return to bug 182085

Lines 9-14 Link Here

(-)makefile.win_em64t (+24 lines)
9	cd ..	9	cd ..
10		10
11	package:	11	package:
		12	REM Package ProbeAgentExtension
		13	if exist pae-package rm -rf pae-package
		14	md pae-package
		15	md pae-package\config
		16	md pae-package\lib
		17	copy /y org.eclipse.hyades.probekit\about.html pae-package
		18	copy /y $(PROBEKIT_LIB)\ProbeAgentExtension\Release\ProbeAgentExtension.dll pae-package\lib
		19	copy /y $(PROBEKIT_LIB)\BCI\Release\BCIEngProbe.dll pae-package\lib
		20	copy /y org.eclipse.hyades.probekit\src-native\ProbeAgentExtension\pluginconfig_win32.xml pae-package\config\pluginconfig.xml
		21	cd pae-package
		22	zip -r9 ..\pae.win_em64t.zip *
		23	cd lib
		24	zip -r9 ..\..\pae-only.win_em64t.zip ProbeAgentExtension.dll
		25	cd ..
		26	cd ..
		27
12	if exist packaging rm -rf packaging	28	if exist packaging rm -rf packaging
13	md packaging\plugins\org.eclipse.tptp.javaprofiler	29	md packaging\plugins\org.eclipse.tptp.javaprofiler
14	md packaging\plugins\org.eclipse.tptp.javaprofiler\config	30	md packaging\plugins\org.eclipse.tptp.javaprofiler\config
Lines 26-34 Link Here
26	copy /y org.eclipse.tptp.platform.jvmti.runtime\src-native\src\Martini\Infrastructure\HeapAdaptor\org\eclipse\tptp\martini\HeapProxy.class packaging\plugins\org.eclipse.tptp.javaprofiler\org\eclipse\tptp\martini	42	copy /y org.eclipse.tptp.platform.jvmti.runtime\src-native\src\Martini\Infrastructure\HeapAdaptor\org\eclipse\tptp\martini\HeapProxy.class packaging\plugins\org.eclipse.tptp.javaprofiler\org\eclipse\tptp\martini
27	copy /y org.eclipse.tptp.platform.jvmti.runtime\src-native\src\Martini\Infrastructure\ThreadAdaptor\org\eclipse\tptp\martini\ThreadProxy.class packaging\plugins\org.eclipse.tptp.javaprofiler\org\eclipse\tptp\martini	43	copy /y org.eclipse.tptp.platform.jvmti.runtime\src-native\src\Martini\Infrastructure\ThreadAdaptor\org\eclipse\tptp\martini\ThreadProxy.class packaging\plugins\org.eclipse.tptp.javaprofiler\org\eclipse\tptp\martini
28		44
		45	REM Add probe's BCIEngProbe.dll to javaprofiler's libs (bug 268532)
		46	copy /y $(PROBEKIT_LIB)\BCI\Release\BCIEngProbe.dll packaging\plugins\org.eclipse.tptp.javaprofiler\BCIEngProbe.dll
		47
29	if exist javaprofiler.win_em64t.zip rm -f javaprofiler.win_em64t.zip	48	if exist javaprofiler.win_em64t.zip rm -f javaprofiler.win_em64t.zip
30	cd packaging	49	cd packaging
31	zip -r9 ..\javaprofiler.win_em64t.zip *	50	zip -r9 ..\javaprofiler.win_em64t.zip *
		51	cd plugins
		52	cd org.eclipse.tptp.javaprofiler
		53	zip -r9 ..\..\..\jvmti-only.win_em64t.zip *
		54	cd ..
		55	cd ..
32		56
33	md plugins\org.eclipse.tptp.javaprofiler.sdk	57	md plugins\org.eclipse.tptp.javaprofiler.sdk
34	md plugins\org.eclipse.tptp.javaprofiler.sdk\Lib	58	md plugins\org.eclipse.tptp.javaprofiler.sdk\Lib