Permalink
Browse files

Merge pull request #45 from seanws/master

Diver 0.5.0 release
  • Loading branch information...
seanws committed Sep 24, 2012
2 parents 12a68ea + 150ba2e commit 0c64976ccb6f40a6b4977d5923868eab6665ca24
Showing with 679 additions and 72 deletions.
  1. +3 −0 .gitignore
  2. BIN Development/artifacts.jar
  3. BIN Development/content.jar
  4. BIN Development/features/ca.uvic.chisel.diver.feature.container_0.4.0.201209240108.jar
  5. BIN Development/features/ca.uvic.chisel.diver.feature_0.5.0.201209240108.jar
  6. BIN Development/features/ca.uvic.chisel.diver.junit.feature_0.4.0.201209240108.jar
  7. BIN Development/features/ca.uvic.chisel.diver.static.feature_0.4.1.201209240108.jar
  8. BIN Development/features/ca.uvic.chisel.hsqldb.feature_0.4.0.201209240108.jar
  9. BIN Development/features/ca.uvic.chisel.widgets.feature_0.4.0.201209240108.jar
  10. BIN ...ocs_0.4.0.201208221324.jar → Development/plugins/ca.uvic.chisel.diver.docs_0.4.0.201209240108.jar
  11. BIN ..._0.4.1.201208221324.jar → Development/plugins/ca.uvic.chisel.diver.feature_0.5.0.201209240108.jar
  12. BIN ...08221324.jar → Development/plugins/ca.uvic.chisel.diver.sequencediagram.sc_0.4.0.201209240108.jar
  13. BIN Development/plugins/ca.uvic.chisel.hsqldb.server_0.2.3.jar
  14. BIN ....4.0.201208221324.jar → Development/plugins/ca.uvic.chisel.javasketch.data_0.4.0.201209240108.jar
  15. BIN ...4.0.201208221324.jar → Development/plugins/ca.uvic.chisel.javasketch.junit_0.4.0.201209240108.jar
  16. BIN ...tch_0.4.0.201208221324.jar → Development/plugins/ca.uvic.chisel.javasketch_0.5.0.201209240108.jar
  17. BIN Development/plugins/ca.uvic.chisel.tracing.jvmti.linux_0.4.0.201209240108.jar
  18. BIN Development/plugins/ca.uvic.chisel.tracing.jvmti.win32_0.5.0.201209240108.jar
  19. BIN Development/plugins/ca.uvic.chisel.tracing.jvmti_0.5.0.201209240108.jar
  20. BIN Development/plugins/ca.uvic.chisel.widgets_0.4.0.jar
  21. BIN Development/plugins/org.eclipse.zest.custom.sequence_0.9.3.jar
  22. BIN Release/artifacts.jar
  23. +1 −1 Release/category.xml
  24. BIN Release/content.jar
  25. BIN Release/features/ca.uvic.chisel.diver.feature.container_0.4.0.201209240108.jar
  26. BIN Release/features/ca.uvic.chisel.diver.feature_0.5.0.201209240108.jar
  27. BIN Release/features/ca.uvic.chisel.diver.junit.feature_0.4.0.201209240108.jar
  28. BIN Release/features/ca.uvic.chisel.diver.static.feature_0.4.1.201209240108.jar
  29. BIN Release/features/ca.uvic.chisel.hsqldb.feature_0.4.0.201209240108.jar
  30. BIN Release/features/ca.uvic.chisel.widgets.feature_0.4.0.201209240108.jar
  31. BIN Release/plugins/ca.uvic.chisel.diver.docs_0.4.0.201209240108.jar
  32. BIN Release/plugins/ca.uvic.chisel.diver.feature_0.5.0.201209240108.jar
  33. BIN Release/plugins/ca.uvic.chisel.diver.sequencediagram.sc_0.4.0.201209240108.jar
  34. BIN Release/plugins/ca.uvic.chisel.hsqldb.server_0.2.3.jar
  35. BIN Release/plugins/ca.uvic.chisel.javasketch.data_0.4.0.201209240108.jar
  36. BIN Release/plugins/ca.uvic.chisel.javasketch.junit_0.4.0.201209240108.jar
  37. BIN Release/plugins/ca.uvic.chisel.javasketch_0.5.0.201209240108.jar
  38. BIN Release/plugins/ca.uvic.chisel.tracing.jvmti.linux_0.4.0.201209240108.jar
  39. BIN Release/plugins/ca.uvic.chisel.tracing.jvmti.win32_0.4.1.201208221324.jar
  40. BIN Release/plugins/ca.uvic.chisel.tracing.jvmti.win32_0.5.0.201209240108.jar
  41. BIN Release/plugins/ca.uvic.chisel.tracing.jvmti_0.4.1.201208221324.jar
  42. BIN Release/plugins/ca.uvic.chisel.tracing.jvmti_0.5.0.201209240108.jar
  43. BIN Release/plugins/ca.uvic.chisel.widgets_0.4.0.jar
  44. BIN Release/plugins/org.eclipse.zest.custom.sequence_0.9.3.jar
  45. +3 −0 Release/site.xml
  46. +1 −1 ca.uvic.chisel.diver.docs/META-INF/MANIFEST.MF
  47. +2 −0 ca.uvic.chisel.diver.feature-plugin/.gitignore
  48. +2 −2 ca.uvic.chisel.diver.feature-plugin/META-INF/MANIFEST.MF
  49. +5 −5 ca.uvic.chisel.diver.feature/feature.xml
  50. +2 −0 ca.uvic.chisel.diver.logging/.gitignore
  51. +1 −1 ca.uvic.chisel.javasketch.junit/META-INF/MANIFEST.MF
  52. +1 −1 ca.uvic.chisel.javasketch/META-INF/MANIFEST.MF
  53. +1 −0 ca.uvic.chisel.javasketch/plugin.xml
  54. +10 −4 ca.uvic.chisel.javasketch/src/ca/uvic/chisel/javasketch/launching/internal/JavaAgentUtil.java
  55. +1 −1 ca.uvic.chisel.tracing.jvmti.linux/META-INF/MANIFEST.MF
  56. +6 −5 ca.uvic.chisel.tracing.jvmti.win32/META-INF/MANIFEST.MF
  57. +3 −1 ca.uvic.chisel.tracing.jvmti.win32/build.properties
  58. BIN ca.uvic.chisel.tracing.jvmti.win32/sketch_win32.dll
  59. BIN ca.uvic.chisel.tracing.jvmti.win32/sketch_win64.dll
  60. +556 −33 ca.uvic.chisel.tracing.jvmti/.cproject
  61. +0 −2 ca.uvic.chisel.tracing.jvmti/.cvsignore
  62. +22 −0 ca.uvic.chisel.tracing.jvmti/.gitignore
  63. +10 −0 ca.uvic.chisel.tracing.jvmti/.settings/org.eclipse.cdt.core.prefs
  64. +24 −1 ca.uvic.chisel.tracing.jvmti/.settings/org.eclipse.cdt.managedbuilder.core.prefs
  65. +2 −2 ca.uvic.chisel.tracing.jvmti/META-INF/MANIFEST.MF
  66. +9 −1 ca.uvic.chisel.tracing.jvmti/include/communication/Server.hpp
  67. +8 −5 ca.uvic.chisel.tracing.jvmti/include/utils/JVMTIUtilities.hpp
  68. +3 −3 ca.uvic.chisel.tracing.jvmti/src/TracerAgent.cpp
  69. +1 −1 ca.uvic.chisel.tracing.jvmti/src/communication/Server.cpp
  70. +2 −2 ca.uvic.chisel.tracing.jvmti/src/utils/JVMTIAgent.cpp
View
@@ -0,0 +1,3 @@
+bin/
+
+
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
@@ -6,7 +6,7 @@
<feature url="features/ca.uvic.chisel.diver.feature.container_0.4.0.qualifier.jar" id="ca.uvic.chisel.diver.feature.container" version="0.4.0.qualifier">
<category name="ca.uvic.chisel.diver.all"/>
</feature>
- <feature url="features/ca.uvic.chisel.diver.feature_0.4.1.qualifier.jar" id="ca.uvic.chisel.diver.feature" version="0.4.1.qualifier" os="linux,win32" arch="x86,x86_64">
+ <feature url="features/ca.uvic.chisel.diver.feature_0.5.0.qualifier.jar" id="ca.uvic.chisel.diver.feature" version="0.5.0.qualifier" os="linux,win32" arch="x86,x86_64">
<category name="ca.uvic.chisel.diver.core.category"/>
</feature>
<feature url="features/ca.uvic.chisel.diver.static.feature_0.4.0.qualifier.jar" id="ca.uvic.chisel.diver.static.feature" version="0.4.0.qualifier">
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -69,6 +69,9 @@
<feature url="features/ca.uvic.chisel.diver.feature_0.4.1.qualifier.jar" id="ca.uvic.chisel.diver.feature" version="0.4.1.qualifier" os="linux,win32" arch="x86,x86_64">
<category name="ca.uvic.chisel.diver.core.category"/>
</feature>
+ <feature url="features/ca.uvic.chisel.diver.feature_0.5.0.qualifier.jar" id="ca.uvic.chisel.diver.feature" version="0.5.0.qualifier" os="linux,win32" arch="x86,x86_64">
+ <category name="ca.uvic.chisel.diver.core.category"/>
+ </feature>
<category-def name="ca.uvic.chisel.diver.core.category" label="Diver Core">
<description>
The core diver feature, including the UI and the tracing functionality.
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Div/er Docs
+Bundle-Name: Diver Docs
Bundle-SymbolicName: ca.uvic.chisel.diver.docs; singleton:=true
Bundle-Version: 0.4.0.qualifier
@@ -0,0 +1,2 @@
+bin/
+
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Diver
Bundle-SymbolicName: ca.uvic.chisel.diver.feature;singleton:=true
-Bundle-Version: 0.4.1.qualifier
+Bundle-Version: 0.5.0.qualifier
Bundle-Activator: ca.uvic.chisel.feature.DiverPlugin
Bundle-Vendor: The Chisel Group
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.ui.browser;bundle-version="3.2.0",
- ca.uvic.chisel.javasketch;bundle-version="0.0.2",
+ ca.uvic.chisel.javasketch;bundle-version="0.5.0",
org.eclipse.ui.forms;bundle-version="3.3.0",
org.eclipse.ui.intro.universal;bundle-version="3.2.0",
org.eclipse.ui.intro;bundle-version="3.2.0"
@@ -2,7 +2,7 @@
<feature
id="ca.uvic.chisel.diver.feature"
label="Diver"
- version="0.4.1.qualifier"
+ version="0.5.0.qualifier"
provider-name="The CHISEL Group"
plugin="ca.uvic.chisel.diver.feature"
os="linux,win32"
@@ -140,7 +140,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
id="ca.uvic.chisel.javasketch"
download-size="0"
install-size="0"
- version="0.4.0.qualifier"
+ version="0.5.0.qualifier"
unpack="false"/>
<plugin
@@ -154,7 +154,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
id="ca.uvic.chisel.tracing.jvmti"
download-size="0"
install-size="0"
- version="0.4.1.qualifier"
+ version="0.5.0.qualifier"
fragment="true"/>
<plugin
@@ -167,7 +167,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
id="ca.uvic.chisel.diver.feature"
download-size="0"
install-size="0"
- version="0.4.1.qualifier"
+ version="0.5.0.qualifier"
unpack="false"/>
<plugin
@@ -185,7 +185,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
arch="x86,x86_64"
download-size="0"
install-size="0"
- version="0.4.1.qualifier"
+ version="0.5.0.qualifier"
fragment="true"/>
</feature>
@@ -0,0 +1,2 @@
+bin/
+
@@ -6,7 +6,7 @@ Bundle-Version: 0.4.0.qualifier
Bundle-Activator: ca.uvic.chisel.javasketch.junit.JUnitSketchPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- ca.uvic.chisel.javasketch;bundle-version="0.4.0",
+ ca.uvic.chisel.javasketch;bundle-version="0.5.0",
ca.uvic.chisel.javasketch.data;bundle-version="0.3.1",
org.eclipse.debug.ui,
org.eclipse.jdt.junit,
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Javasketch Plug-in
Bundle-SymbolicName: ca.uvic.chisel.javasketch;singleton:=true
-Bundle-Version: 0.4.0.qualifier
+Bundle-Version: 0.5.0.qualifier
Bundle-Activator: ca.uvic.chisel.javasketch.SketchPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
@@ -7,6 +7,7 @@
http://www.eclipse.org/legal/epl-v10.html
Contributors:
+ Sean Stevenson - Modifications
Del Myers - initial API and implementation
-->
@@ -13,6 +13,7 @@
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.util.Enumeration;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.FileLocator;
@@ -33,17 +34,22 @@
public static IPath getJavaAgent(ILaunchConfiguration configuration) throws CoreException {
String os = Platform.getOS();
+ String arch = Platform.getOSArch();
URL fileUrl = null;
- if ("win32".equals(os)) {
+ if ("win32".equals(os) && "x86".equals(arch)) {
fileUrl = SketchPlugin.getDefault().getBundle().getResource("sketch_win32.dll");
+ } else if ("win32".equals(os) && ("amd64".equals(arch) || "x86_64".equals(arch))) { //Was expecting amd64 but in testing x86_64 was returned. Value supposed to be Java arch not CPU arch
+ fileUrl = SketchPlugin.getDefault().getBundle().getResource("sketch_win64.dll");
} else if ("linux".equals(os)) {
fileUrl = SketchPlugin.getDefault().getBundle().getResource("libsketch_linux32.so");
} else {
- throw new CoreException(new Status(Status.ERROR, SketchPlugin.PLUGIN_ID, "Unrecognized operating system: " + os));
+ throw new CoreException(new Status(Status.ERROR, SketchPlugin.PLUGIN_ID, "Unrecognized operating system: " + os + " with architecture " + arch));
}
- if (fileUrl == null) {
- throw new CoreException(new Status(Status.ERROR, SketchPlugin.PLUGIN_ID, "Unable to locate tracing library"));
+
+
+ if (fileUrl == null) {
+ throw new CoreException(new Status(Status.ERROR, SketchPlugin.PLUGIN_ID, "Unable to locate tracing library: OS = " + os + " with architecture " + arch));
}
String fileName = null;
try {
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Linux Tracing
Bundle-SymbolicName: ca.uvic.chisel.tracing.jvmti.linux;singleton:=true
Bundle-Version: 0.4.0.qualifier
-Fragment-Host: ca.uvic.chisel.javasketch;bundle-version="0.4.0"
+Fragment-Host: ca.uvic.chisel.javasketch;bundle-version="0.5.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-NativeCode: libsketch_linux32.so;selection-filter=
"(&(osgi.os=linux)(|(osgi.arch=x86)(osgi.arch=x86_64)))"
@@ -2,13 +2,14 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Win32 Tracing
Bundle-SymbolicName: ca.uvic.chisel.tracing.jvmti.win32
-Bundle-Version: 0.4.1.qualifier
-Fragment-Host: ca.uvic.chisel.javasketch;bundle-version="0.4.0"
+Bundle-Version: 0.5.0.qualifier
+Fragment-Host: ca.uvic.chisel.javasketch;bundle-version="0.5.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-NativeCode: sketch_win32.dll; osname=winxp; processor=x86,
sketch_win32.dll; osname=Windows Vista; processor=x86,
sketch_win32.dll; osname=Windows 7; processor=x86,
- sketch_win32.dll; osname=winxp; processor=x86_64,
- sketch_win32.dll; osname=Windows Vista; processor=x86_64,
- sketch_win32.dll; osname=Windows 7; processor=x86_64
+ sketch_win32.dll; sketch_win64.dll; osname=winxp; processor=x86_64,
+ sketch_win32.dll; sketch_win64.dll; osname=Windows Vista; processor=x86_64,
+ sketch_win32.dll; sketch_win64.dll; osname=Windows 7; processor=x86_64,
+ sketch_win32.dll; sketch_win64.dll; osname=Windows 8; processor=x86_64
Eclipse-PlatformFilter: (osgi.os=win32)
@@ -1,4 +1,6 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- sketch_win32.dll
+ sketch_win32.dll,\
+ sketch_win64.dll
+
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 0c64976

Please sign in to comment.