Skip to content

Commit 91ecd74

Browse files
jantjejantje
committed
Merge pull request #82 from wimjongman/master
Multiplatform build
2 parents 5f92118 + f8e2dd0 commit 91ecd74

File tree

2 files changed

+111
-45
lines changed

2 files changed

+111
-45
lines changed

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

Lines changed: 110 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,11 @@
7272

7373
<profiles>
7474

75+
76+
7577
<profile>
76-
<id>build-all</id>
78+
79+
<id>win32</id>
7780
<build>
7881
<plugins>
7982
<plugin>
@@ -85,43 +88,60 @@
8588
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
8689
spec -->
8790
<environments>
88-
89-
<!-- Linux -->
90-
<environment>
91-
<os>linux</os>
92-
<ws>gtk</ws>
93-
<arch>x86</arch>
94-
</environment>
95-
<environment>
96-
<os>linux</os>
97-
<ws>gtk</ws>
98-
<arch>x86_64</arch>
99-
</environment>
100-
101-
<!-- Windows -->
10291
<environment>
10392
<os>win32</os>
10493
<ws>win32</ws>
10594
<arch>x86</arch>
10695
</environment>
96+
</environments>
97+
</configuration>
98+
</plugin>
99+
</plugins>
100+
</build>
101+
</profile><profile>
102+
<id>win64</id>
103+
<build>
104+
<plugins>
105+
<plugin>
106+
<groupId>org.eclipse.tycho</groupId>
107+
<artifactId>target-platform-configuration</artifactId>
108+
<version>${tycho.version}</version>
109+
<configuration>
110+
<!-- configure the p2 target environments for multi-platform build -->
111+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
112+
spec -->
113+
<environments>
107114
<environment>
108115
<os>win32</os>
109116
<ws>win32</ws>
110117
<arch>x86_64</arch>
111118
</environment>
119+
</environments>
120+
</configuration>
121+
</plugin>
122+
</plugins>
123+
</build>
124+
</profile>
125+
112126

113-
<!-- Mac -->
127+
<profile>
128+
<id>linux32</id>
129+
<build>
130+
<plugins>
131+
<plugin>
132+
<groupId>org.eclipse.tycho</groupId>
133+
<artifactId>target-platform-configuration</artifactId>
134+
<version>${tycho.version}</version>
135+
<configuration>
136+
<!-- configure the p2 target environments for multi-platform build -->
137+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
138+
spec -->
139+
<environments>
114140
<environment>
115-
<os>macosx</os>
116-
<ws>cocoa</ws>
141+
<os>linux</os>
142+
<ws>gtk</ws>
117143
<arch>x86</arch>
118144
</environment>
119-
<environment>
120-
<os>macosx</os>
121-
<ws>cocoa</ws>
122-
<arch>x86_64</arch>
123-
</environment>
124-
125145
</environments>
126146
</configuration>
127147
</plugin>
@@ -130,7 +150,7 @@
130150
</profile>
131151

132152
<profile>
133-
<id>build-some</id>
153+
<id>linux64</id>
134154
<build>
135155
<plugins>
136156
<plugin>
@@ -142,28 +162,61 @@
142162
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
143163
spec -->
144164
<environments>
145-
146-
<!-- Linux -->
147165
<environment>
148166
<os>linux</os>
149167
<ws>gtk</ws>
150-
<arch>x86</arch>
168+
<arch>x86_64</arch>
151169
</environment>
170+
</environments>
171+
</configuration>
172+
</plugin>
173+
</plugins>
174+
</build>
175+
</profile>
152176

153-
<!-- Windows -->
177+
<profile>
178+
<id>mac32</id>
179+
<build>
180+
<plugins>
181+
<plugin>
182+
<groupId>org.eclipse.tycho</groupId>
183+
<artifactId>target-platform-configuration</artifactId>
184+
<version>${tycho.version}</version>
185+
<configuration>
186+
<!-- configure the p2 target environments for multi-platform build -->
187+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
188+
spec -->
189+
<environments>
190+
<!-- Mac -->
154191
<environment>
155-
<os>win32</os>
156-
<ws>win32</ws>
192+
<os>macosx</os>
193+
<ws>cocoa</ws>
157194
<arch>x86</arch>
158195
</environment>
159-
196+
</environments>
197+
</configuration>
198+
</plugin>
199+
</plugins>
200+
</build>
201+
</profile><profile>
202+
<id>mac64</id>
203+
<build>
204+
<plugins>
205+
<plugin>
206+
<groupId>org.eclipse.tycho</groupId>
207+
<artifactId>target-platform-configuration</artifactId>
208+
<version>${tycho.version}</version>
209+
<configuration>
210+
<!-- configure the p2 target environments for multi-platform build -->
211+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
212+
spec -->
213+
<environments>
160214
<!-- Mac -->
161215
<environment>
162216
<os>macosx</os>
163217
<ws>cocoa</ws>
164218
<arch>x86_64</arch>
165219
</environment>
166-
167220
</environments>
168221
</configuration>
169222
</plugin>
@@ -178,12 +231,6 @@
178231
</activation>
179232

180233
<repositories>
181-
<repository>
182-
<id>Nebula</id>
183-
<layout>p2</layout>
184-
<url> http://download.eclipse.org/technology/nebula/snapshot</url>
185-
</repository>
186-
187234
<repository>
188235
<id>platform_juno</id>
189236
<layout>p2</layout>
@@ -201,12 +248,6 @@
201248
<profile>
202249
<id>kepler</id>
203250
<repositories>
204-
<repository>
205-
<id>Nebula</id>
206-
<layout>p2</layout>
207-
<url> http://download.eclipse.org/technology/nebula/snapshot</url>
208-
</repository>
209-
210251
<repository>
211252
<id>platform_kepler</id>
212253
<layout>p2</layout>
@@ -220,8 +261,32 @@
220261
</repository>
221262
</repositories>
222263
</profile>
264+
265+
<profile>
266+
<id>luna</id>
267+
<repositories>
268+
<repository>
269+
<id>platform_luna</id>
270+
<layout>p2</layout>
271+
<url> http://download.eclipse.org/eclipse/updates/4.4</url>
272+
</repository>
273+
274+
<repository>
275+
<id>release-train_luna</id>
276+
<layout>p2</layout>
277+
<url> http://download.eclipse.org/releases/luna</url>
278+
</repository>
279+
</repositories>
280+
</profile>
223281
</profiles>
224282

283+
<repositories>
284+
<repository>
285+
<id>Nebula</id>
286+
<layout>p2</layout>
287+
<url> http://download.eclipse.org/technology/nebula/snapshot</url>
288+
</repository>
289+
</repositories>
225290

226291
</project>
227292

‎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

0 commit comments

Comments
 (0)