Skip to content

Commit 5bf7367

Browse files
author
jantje
committed
merged master
2 parents d49130c + de657c1 commit 5bf7367

File tree

79 files changed

+851
-627
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+851
-627
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
.log
33
**/.settings/
44
**/bin/*
5+
**/target/*
56
/log.txt

‎.project

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>root</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.m2e.core.maven2Builder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
16+
</natures>
17+
</projectDescription>

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ script:
1111
- sh -c "if $TRAVIS_SECURE_ENV_VARS; then echo Travis SECURE available -- Deploy; else echo Travis SECURE NOT available -- Verify; fi"
1212

1313
#Execute the maven commands depending on SECURE availabilty and print the elapsed time out periodically.
14-
- sh -c "if $TRAVIS_SECURE_ENV_VARS; then ./travis_exec_and_print_time.sh 'mvn deploy -Pall,neon --quiet --settings settings.xml'; else ./travis_exec_and_print_time.sh 'mvn verify -Pall,neon --quiet --settings settings.xml'; fi"
14+
- sh -c "if $TRAVIS_SECURE_ENV_VARS; then ./travis_exec_and_print_time.sh 'mvn deploy -Pall,oxygen -Dtest=RegressionTest --quiet --settings settings.xml'; else ./travis_exec_and_print_time.sh 'mvn verify -Pall,oxygen -Dtest=RegressionTest --quiet --settings settings.xml'; fi"
1515

1616
#Several usernames and passwords/tokens are required for deployment.
1717
#When testing on your local/remote setup then you need to set/export env. variables:

‎io.sloeber.application/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
<version>4.1.0-SNAPSHOT</version>
88
<relativePath>../io.sloeber.parent</relativePath>
99
</parent>
10-
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
10+
1111
<artifactId>io.sloeber.application</artifactId>
12-
<version>4.1.0-SNAPSHOT</version>
1312
<packaging>eclipse-plugin</packaging>
1413
</project>

‎io.sloeber.core/.classpath

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<classpath>
3-
<classpathentry exported="true" kind="lib" path="lib/jssc-2.8.0.jar"/>
4-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
5-
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
6-
<classpathentry excluding="it/baeyens/arduino/tools/uploaders/arduinoIDEstyle/" kind="src" path="src"/>
7-
<classpathentry exported="true" kind="lib" path="lib/jsch-0.1.50.jar"/>
8-
<classpathentry exported="true" kind="lib" path="lib/jmdns-3.4.1.jar"/>
9-
<classpathentry kind="output" path="bin"/>
10-
</classpath>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
4+
<attributes>
5+
<attribute name="maven.pomderived" value="true"/>
6+
</attributes>
7+
</classpathentry>
8+
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
9+
<classpathentry kind="src" path="src"/>
10+
<classpathentry exported="true" kind="lib" path="lib/jsch-0.1.50.jar"/>
11+
<classpathentry exported="true" kind="lib" path="lib/jmdns-3.4.1.jar"/>
12+
<classpathentry exported="true" kind="lib" path="lib/jssc-2.8.0.jar"/>
13+
<classpathentry kind="output" path="bin"/>
14+
</classpath>

‎io.sloeber.core/.project

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,14 @@
2424
<arguments>
2525
</arguments>
2626
</buildCommand>
27+
<buildCommand>
28+
<name>org.eclipse.m2e.core.maven2Builder</name>
29+
<arguments>
30+
</arguments>
31+
</buildCommand>
2732
</buildSpec>
2833
<natures>
34+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2935
<nature>org.eclipse.pde.PluginNature</nature>
3036
<nature>org.eclipse.jdt.core.javanature</nature>
3137
</natures>

‎io.sloeber.core/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ Require-Bundle: org.eclipse.cdt.managedbuilder.core,
3333
org.eclipse.ui.ide,
3434
org.eclipse.ui,
3535
org.eclipse.debug.ui,
36-
org.junit,
3736
org.eclipse.ui.console,
38-
org.eclipse.ui.workbench
37+
org.eclipse.ui.workbench,
38+
org.junit;bundle-version="4.12.0"
3939
Export-Package: io.sloeber.core.api,
4040
io.sloeber.core.common

‎io.sloeber.core/pom.xml

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,7 @@
77
<version>4.1.0-SNAPSHOT</version>
88
<relativePath>../io.sloeber.parent</relativePath>
99
</parent>
10-
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
10+
1111
<artifactId>io.sloeber.core</artifactId>
1212
<packaging>eclipse-plugin</packaging>
13-
<version>4.1.0-SNAPSHOT</version>
14-
<dependencies>
15-
<dependency>
16-
<groupId>junit</groupId>
17-
<artifactId>junit</artifactId>
18-
<version>4.11</version>
19-
<scope>test</scope>
20-
</dependency>
21-
</dependencies>
22-
<build>
23-
<pluginManagement>
24-
<plugins>
25-
<plugin>
26-
<groupId>org.apache.maven.plugins</groupId>
27-
<artifactId>maven-surefire-plugin</artifactId>
28-
<version>2.20</version>
29-
</plugin>
30-
</plugins>
31-
</pluginManagement>
32-
<plugins>
33-
<plugin>
34-
<groupId>org.apache.maven.plugins</groupId>
35-
<artifactId>maven-surefire-plugin</artifactId>
36-
<configuration>
37-
<testSourceDirectory>${basedir}/src/jUnit/</testSourceDirectory>
38-
<testClassesDirectory>${project.build.directory}/classes/jUnit</testClassesDirectory>
39-
</configuration>
40-
</plugin>
41-
</plugins>
42-
</build>
4313
</project>

‎io.sloeber.core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public static void start() {
107107
}
108108

109109
public static void stop() {
110-
timer.purge();
110+
timer.cancel();
111111
// we don't close each JmDNS instance as it's too slow
112112
}
113113

‎io.sloeber.core/src/io/sloeber/core/Activator.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,11 @@ public class Activator extends AbstractUIPlugin {
8282

8383
@Override
8484
public void start(BundleContext context) throws Exception {
85+
IPath installPath = ConfigurationPreferences.getInstallationPath();
86+
installPath.toFile().mkdirs();
87+
IPath downloadPath = ConfigurationPreferences.getInstallationPathDownload();
88+
System.out.println("arduinoPlugin folders created");
89+
downloadPath.toFile().mkdirs();
8590
testKnownIssues();
8691
initializeImportantVariables();
8792
runPluginCoreStartInstantiatorJob();
@@ -207,8 +212,7 @@ private static void runInstallJob() {
207212
@SuppressWarnings("synthetic-access")
208213
@Override
209214
protected IStatus run(IProgressMonitor monitor) {
210-
IPath installPath = ConfigurationPreferences.getInstallationPath();
211-
installPath.toFile().mkdirs();
215+
212216
monitor.beginTask("Sit back, relax and watch us work for a little while ..", IProgressMonitor.UNKNOWN);
213217
addFileAssociations();
214218
makeOurOwnCustomBoards_txt();

0 commit comments

Comments
 (0)