Attachment 144245 Details for Bug 182085 – Adds PAE to the JVMTI native build

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

[patch] Adds PAE to the JVMTI native build

182085_jvmti_add_pae.txt (text/plain), 7.31 KB, created by Joshua Bowles

on 2009-08-12 11:11:11 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Joshua Bowles

Created: 2009-08-12 11:11:11 EDT

Size: 7.31 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.jvmti.runtime
>Index: makefile.win_ia32
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.jvmti.runtime/makefile.win_ia32,v
>retrieving revision 1.12
>diff -u -r1.12 makefile.win_ia32
>--- makefile.win_ia32	29 Feb 2008 15:36:06 -0000	1.12
>+++ makefile.win_ia32	12 Aug 2009 15:02:36 -0000
>@@ -1,6 +1,11 @@
> all: javaprofiler
> 
> javaprofiler:
>+	REM Create ProbeAgentExtension.dll
>+	cd org.eclipse.hyades.probekit\\src-native\\ProbeAgentExtension
>+    msdev WinBuild\\ProbeAgentExtension.dsw /MAKE "ProbeAgentExtension - Win32 Release" /USEENV
>+    cd ..\\..\\..
>+    
> 	cd org.eclipse.tptp.platform.jvmti.runtime
> 	cd src-native
> 	cd build
>@@ -9,6 +14,23 @@
> 	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 org.eclipse.hyades.probekit\src-native\ProbeAgentExtension\WinBuild\Release\ProbeAgentExtension.dll pae-package\lib
>+	copy /y $(PROBEKIT_LIB)\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_ia32.zip *
>+	cd lib
>+	zip -r9 ..\..\pae-only.win_ia32.zip ProbeAgentExtension.dll
>+	cd ..
>+	cd ..
>+
>+	REM Package JVMTI
> 	if exist packaging rm -rf packaging
> 	md packaging\plugins\org.eclipse.tptp.javaprofiler
> 	md packaging\plugins\org.eclipse.tptp.javaprofiler\config
>@@ -26,9 +48,17 @@
> 	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)\BCIEngProbe.dll packaging\plugins\org.eclipse.tptp.javaprofiler\BCIEngProbe.dll
>+	
> 	if exist javaprofiler.win_ia32.zip  rm -f javaprofiler.win_ia32.zip 
> 	cd packaging
> 	zip -r9 ..\javaprofiler.win_ia32.zip *
>+	cd plugins
>+	cd org.eclipse.tptp.javaprofiler
>+	zip -r9 ..\..\..\jvmti-only.win_ia32.zip *
>+	cd ..
>+	cd ..
> 
> 	md plugins\org.eclipse.tptp.javaprofiler.sdk
> 	md plugins\org.eclipse.tptp.javaprofiler.sdk\Lib
>Index: makefile.win_em64t
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.jvmti.runtime/makefile.win_em64t,v
>retrieving revision 1.11
>diff -u -r1.11 makefile.win_em64t
>--- makefile.win_em64t	29 Feb 2008 15:36:06 -0000	1.11
>+++ makefile.win_em64t	12 Aug 2009 15:02:36 -0000
>@@ -9,6 +9,22 @@
> 	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
>@@ -26,9 +42,17 @@
> 	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
>Index: makefile
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.jvmti.runtime/makefile,v
>retrieving revision 1.16
>diff -u -r1.16 makefile
>--- makefile	16 Jul 2009 20:26:36 -0000	1.16
>+++ makefile	12 Aug 2009 15:02:36 -0000
>@@ -69,6 +69,8 @@
> BUILD_OPT="RELEASE=1"
> 
> javaprofiler:
>+	# Make ProbeAgentExtension then the JVMTI
>+	make --directory=org.eclipse.hyades.probekit/src-native/ProbeAgentExtension -f Makefile.unix; \
> 	cd org.eclipse.tptp.platform.jvmti.runtime/src-native; \
> 	mkdir -p plugins/org.eclipse.tptp.javaprofiler; \
> 	cd build; \
>@@ -85,6 +87,21 @@
> 	cd ..
> 	
> package:
>+	# Package ProbeAgentExtension
>+	rm -rf pae-package
>+	mkdir -p pae-package/config
>+	mkdir -p pae-package/lib
>+	cp org.eclipse.hyades.probekit/about.html pae-package
>+	cp org.eclipse.hyades.probekit/src-native/ProbeAgentExtension/ProbeAgentExtension.so pae-package/lib
>+	cp $(PROBEKIT_LIB)/BCIEngProbe.so pae-package/lib
>+	cp org.eclipse.hyades.probekit/src-native/ProbeAgentExtension/pluginconfig_linux.xml pae-package/config/pluginconfig.xml
>+	cd pae-package; \
>+	zip -r9y ../pae.$(BUILD_PLATFORM).zip *; \
>+	cd lib; \
>+	zip -r9y ../../pae-only.$(BUILD_PLATFORM).zip ProbeAgentExtension.so; \
>+	cd ../..
>+
>+	# Package JVMTI
> 	rm -rf packaging
> 	mkdir -p packaging/plugins/org.eclipse.tptp.javaprofiler
> 	mkdir -p packaging/plugins/org.eclipse.tptp.javaprofiler/config
>@@ -116,9 +133,15 @@
> 	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
> 	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
> 	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
>+	
>+	# Add probe's BCIEngProbe.so to javaprofiler's libs as libBCIEngProbe.so (bug 187527)
>+	cp $(PROBEKIT_LIB)/BCIEngProbe.so packaging/plugins/org.eclipse.tptp.javaprofiler/libBCIEngProbe.so
>+	
> 	cd packaging; \
> 	zip -r9y ../javaprofiler.$(BUILD_PLATFORM).zip *; \
>-	cd ..
>+	cd plugins/org.eclipse.tptp.javaprofiler; \
>+	zip -r9y ../../../jvmti-only.$(BUILD_PLATFORM).zip *; \
>+	cd ../../..
> 
> 	# Package the SDK
> 	mkdir -p packaging/plugins/org.eclipse.tptp.javaprofiler.sdk

Actions: View | Diff

Attachments on bug 182085: 144239 | 144245 | 144303 | 144427 | 144463 | 144478