Commit 8b0e385f authored by Erwan Bousse's avatar Erwan Bousse
Browse files

Merging changes made after windows testing/building

parent 95159bad
......@@ -112,7 +112,8 @@ public class Application implements IApplication {
// Problem with spaces?
description.setLocationURI(java.net.URI.create(tmpDir.getAbsolutePath()));
//description.setLocationURI(java.net.URI.create(tmpDir.getAbsolutePath()));
description.setLocationURI(tmpDir.toURI());
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName());
project.delete(true, true, null); // to make sure that there is nothing there already
project.create(description, null);
......
......@@ -31,13 +31,24 @@
<plugins>
<plugin id="fr.inria.diverse.cloning.benchmark.tool" version="0.1.0.qualifier"/>
<plugin id="org.eclipse.core.runtime"/>
<!--<plugin id="org.eclipse.swt"/>
<plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>-->
<plugin id="org.eclipse.swt"/>
<plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
<plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
<plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
<plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
</plugins>
<configurations>
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<property name="osgi.instance.area.default" value="benchmarktool-workingdir" />
<plugin id="org.eclipse.swt" autoStart="true" startLevel="0" />
</configurations>
</product>
......@@ -41,6 +41,41 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
<environments>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
</environments>
</configuration>
</plugin>
</plugins>
</build>
......
......@@ -12,6 +12,8 @@ public class Application implements IApplication {
private static final String MATGEN = "matgen";
private static final String RUN = "run";
private static String OS = System.getProperty("os.name").toLowerCase();
/*
* (non-Javadoc)
*
......@@ -39,6 +41,11 @@ public class Application implements IApplication {
+ ", " + RUN + ".");break;
}
if (isWindows()) {
System.out.println("Press enter to quit.");
new java.util.Scanner(System.in).nextLine();
}
return IApplication.EXIT_OK;
}
......@@ -50,4 +57,8 @@ public class Application implements IApplication {
public void stop() {
// nothing to do
}
private static boolean isWindows() {
return (OS.indexOf("win") >= 0);
}
}
......@@ -50,50 +50,6 @@
</plugins>
</build>
<profiles>
<profile>
<id>all-platforms</id>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
<environments>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
</environments>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment