Skip to content

Commit 24bb482

Browse files
jantjejantje
committed
Merge remote branch 'upstream/master'
2 parents 8e09ee2 + a1bfa16 commit 24bb482

File tree

3 files changed

+157
-35
lines changed

3 files changed

+157
-35
lines changed

‎it.baeyens.arduino.parent/pom.xml

Lines changed: 151 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@
7171

7272

7373
<profiles>
74-
74+
7575
<profile>
76-
<id>build-all</id>
76+
<id>all</id>
7777
<build>
7878
<plugins>
7979
<plugin>
@@ -85,8 +85,16 @@
8585
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
8686
spec -->
8787
<environments>
88-
89-
<!-- Linux -->
88+
<environment>
89+
<os>win32</os>
90+
<ws>win32</ws>
91+
<arch>x86</arch>
92+
</environment>
93+
<environment>
94+
<os>win32</os>
95+
<ws>win32</ws>
96+
<arch>x86_64</arch>
97+
</environment>
9098
<environment>
9199
<os>linux</os>
92100
<ws>gtk</ws>
@@ -97,31 +105,86 @@
97105
<ws>gtk</ws>
98106
<arch>x86_64</arch>
99107
</environment>
108+
<environment>
109+
<os>macosx</os>
110+
<ws>cocoa</ws>
111+
<arch>x86_64</arch>
112+
</environment>
113+
</environments>
114+
</configuration>
115+
</plugin>
116+
</plugins>
117+
</build>
118+
</profile>
100119

101-
<!-- Windows -->
120+
<profile>
121+
<id>win32</id>
122+
<build>
123+
<plugins>
124+
<plugin>
125+
<groupId>org.eclipse.tycho</groupId>
126+
<artifactId>target-platform-configuration</artifactId>
127+
<version>${tycho.version}</version>
128+
<configuration>
129+
<!-- configure the p2 target environments for multi-platform build -->
130+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
131+
spec -->
132+
<environments>
102133
<environment>
103134
<os>win32</os>
104135
<ws>win32</ws>
105136
<arch>x86</arch>
106137
</environment>
138+
</environments>
139+
</configuration>
140+
</plugin>
141+
</plugins>
142+
</build>
143+
</profile>
144+
<profile>
145+
<id>win64</id>
146+
<build>
147+
<plugins>
148+
<plugin>
149+
<groupId>org.eclipse.tycho</groupId>
150+
<artifactId>target-platform-configuration</artifactId>
151+
<version>${tycho.version}</version>
152+
<configuration>
153+
<!-- configure the p2 target environments for multi-platform build -->
154+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
155+
spec -->
156+
<environments>
107157
<environment>
108158
<os>win32</os>
109159
<ws>win32</ws>
110160
<arch>x86_64</arch>
111161
</environment>
162+
</environments>
163+
</configuration>
164+
</plugin>
165+
</plugins>
166+
</build>
167+
</profile>
112168

113-
<!-- Mac -->
169+
170+
<profile>
171+
<id>linux32</id>
172+
<build>
173+
<plugins>
174+
<plugin>
175+
<groupId>org.eclipse.tycho</groupId>
176+
<artifactId>target-platform-configuration</artifactId>
177+
<version>${tycho.version}</version>
178+
<configuration>
179+
<!-- configure the p2 target environments for multi-platform build -->
180+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
181+
spec -->
182+
<environments>
114183
<environment>
115-
<os>macosx</os>
116-
<ws>cocoa</ws>
184+
<os>linux</os>
185+
<ws>gtk</ws>
117186
<arch>x86</arch>
118187
</environment>
119-
<environment>
120-
<os>macosx</os>
121-
<ws>cocoa</ws>
122-
<arch>x86_64</arch>
123-
</environment>
124-
125188
</environments>
126189
</configuration>
127190
</plugin>
@@ -130,7 +193,7 @@
130193
</profile>
131194

132195
<profile>
133-
<id>build-some</id>
196+
<id>linux64</id>
134197
<build>
135198
<plugins>
136199
<plugin>
@@ -142,28 +205,62 @@
142205
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
143206
spec -->
144207
<environments>
145-
146-
<!-- Linux -->
147208
<environment>
148209
<os>linux</os>
149210
<ws>gtk</ws>
150-
<arch>x86</arch>
211+
<arch>x86_64</arch>
151212
</environment>
213+
</environments>
214+
</configuration>
215+
</plugin>
216+
</plugins>
217+
</build>
218+
</profile>
152219

153-
<!-- Windows -->
220+
<profile>
221+
<id>mac32</id>
222+
<build>
223+
<plugins>
224+
<plugin>
225+
<groupId>org.eclipse.tycho</groupId>
226+
<artifactId>target-platform-configuration</artifactId>
227+
<version>${tycho.version}</version>
228+
<configuration>
229+
<!-- configure the p2 target environments for multi-platform build -->
230+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
231+
spec -->
232+
<environments>
233+
<!-- Mac -->
154234
<environment>
155-
<os>win32</os>
156-
<ws>win32</ws>
235+
<os>macosx</os>
236+
<ws>cocoa</ws>
157237
<arch>x86</arch>
158238
</environment>
159-
239+
</environments>
240+
</configuration>
241+
</plugin>
242+
</plugins>
243+
</build>
244+
</profile>
245+
<profile>
246+
<id>mac64</id>
247+
<build>
248+
<plugins>
249+
<plugin>
250+
<groupId>org.eclipse.tycho</groupId>
251+
<artifactId>target-platform-configuration</artifactId>
252+
<version>${tycho.version}</version>
253+
<configuration>
254+
<!-- configure the p2 target environments for multi-platform build -->
255+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
256+
spec -->
257+
<environments>
160258
<!-- Mac -->
161259
<environment>
162260
<os>macosx</os>
163261
<ws>cocoa</ws>
164262
<arch>x86_64</arch>
165263
</environment>
166-
167264
</environments>
168265
</configuration>
169266
</plugin>
@@ -178,12 +275,6 @@
178275
</activation>
179276

180277
<repositories>
181-
<repository>
182-
<id>Nebula</id>
183-
<layout>p2</layout>
184-
<url> http://download.eclipse.org/technology/nebula/snapshot</url>
185-
</repository>
186-
187278
<repository>
188279
<id>platform_juno</id>
189280
<layout>p2</layout>
@@ -201,12 +292,6 @@
201292
<profile>
202293
<id>kepler</id>
203294
<repositories>
204-
<repository>
205-
<id>Nebula</id>
206-
<layout>p2</layout>
207-
<url> http://download.eclipse.org/technology/nebula/snapshot</url>
208-
</repository>
209-
210295
<repository>
211296
<id>platform_kepler</id>
212297
<layout>p2</layout>
@@ -220,8 +305,39 @@
220305
</repository>
221306
</repositories>
222307
</profile>
308+
309+
<profile>
310+
<id>luna</id>
311+
<repositories>
312+
<repository>
313+
<id>platform_luna</id>
314+
<layout>p2</layout>
315+
<url> http://download.eclipse.org/eclipse/updates/4.4</url>
316+
</repository>
317+
318+
<repository>
319+
<id>release-train_luna</id>
320+
<layout>p2</layout>
321+
<url> http://download.eclipse.org/releases/luna</url>
322+
</repository>
323+
</repositories>
324+
</profile>
223325
</profiles>
224326

327+
<repositories>
328+
<repository>
329+
<id>Nebula</id>
330+
<layout>p2</layout>
331+
<url> http://download.eclipse.org/technology/nebula/snapshot</url>
332+
</repository>
333+
</repositories>
334+
335+
<pluginRepositories>
336+
<pluginRepository>
337+
<id>tycho-staged</id>
338+
<url>https://oss.sonatype.org/content/repositories/orgeclipsetycho-1004/</url>
339+
</pluginRepository>
340+
</pluginRepositories>
225341

226342
</project>
227343

‎it.baeyens.arduino.product/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/target
2+
/bin

‎it.baeyens.arduino.product/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@
3535
</execution>
3636
</executions>
3737
<configuration>
38+
<formats>
39+
<win32>zip</win32>
40+
<linux>tar.gz</linux>
41+
<macosx>tar.gz</macosx>
42+
</formats>
3843
<products>
3944
<product>
4045
<!-- id is verbatim to todo.product "uid" -->

0 commit comments

Comments
 (0)