Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed problms with Linux deployment

  • Loading branch information...
commit e9f22180590cac3b7b5092e1c758edcacb7f3dac 1 parent 9fd6c9b
@seanws seanws authored
View
4 .gitignore
@@ -0,0 +1,4 @@
+bin/
+Release/
+Development/
+
View
2  ca.uvic.chisel.diver.docs/META-INF/MANIFEST.MF
@@ -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
View
2  ca.uvic.chisel.diver.junit.feature/feature.xml
@@ -229,7 +229,7 @@ litigation.
id="ca.uvic.chisel.javasketch.junit"
download-size="0"
install-size="0"
- version="0.4.0"
+ version="0.0.0"
unpack="false"/>
</feature>
View
2  ca.uvic.chisel.diver.logging/.gitignore
@@ -0,0 +1,2 @@
+bin/
+
View
11 ...vic.chisel.javasketch/src/ca/uvic/chisel/javasketch/launching/internal/JavaAgentUtil.java
@@ -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;
@@ -38,15 +39,17 @@ public static IPath getJavaAgent(ILaunchConfiguration configuration) throws Core
if ("win32".equals(os) && "x86".equals(arch)) {
fileUrl = SketchPlugin.getDefault().getBundle().getResource("sketch_win32.dll");
- } else if ("win32".equals(os) && "x86_64".equals(arch) ) {
+ } 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 {
View
2  ca.uvic.chisel.tracing.jvmti.linux/META-INF/MANIFEST.MF
@@ -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)))"
View
7 ca.uvic.chisel.tracing.jvmti.win32/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@ 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_win64.dll; osname=winxp; processor=x86_64,
- sketch_win64.dll; osname=Windows Vista; processor=x86_64,
- sketch_win64.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)
View
2  ca.uvic.chisel.tracing.jvmti.win32/build.properties
@@ -1,6 +1,6 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- sketch_win32.dll\
+ sketch_win32.dll,\
sketch_win64.dll
Please sign in to comment.
Something went wrong with that request. Please try again.