Skip to content

Commit e646ca2

Browse files
author
Federico Fissore
committed
ContributionInstaller OS check: MacOSX now uses real arch rather than JVM one
1 parent 8bdd2c9 commit e646ca2

File tree

9 files changed

+281
-49
lines changed

9 files changed

+281
-49
lines changed

‎app/test/cc/arduino/packages/contributions/HostDependentDownloadableContributionTest.java

+40-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package cc.arduino.packages.contributions;
22

33
import org.junit.Test;
4+
import processing.app.Platform;
45

56
import static org.junit.Assert.assertFalse;
67
import static org.junit.Assert.assertTrue;
@@ -15,10 +16,20 @@ public String getHost() {
1516
return "x86_64-apple-darwin";
1617
}
1718
};
18-
System.setProperty("os.name", "Mac OS X");
19-
System.setProperty("os.arch", "x86_64");
2019

21-
assertTrue(contribution.isCompatible());
20+
Platform platform = new Platform() {
21+
@Override
22+
public String getOsName() {
23+
return "Mac OS X";
24+
}
25+
26+
@Override
27+
public String getOsArch() {
28+
return "x86_64";
29+
}
30+
};
31+
32+
assertTrue(contribution.isCompatible(platform));
2233
}
2334

2435
@Test
@@ -29,10 +40,20 @@ public String getHost() {
2940
return "x86_64-apple-darwin";
3041
}
3142
};
32-
System.setProperty("os.name", "Linux");
33-
System.setProperty("os.arch", "amd64");
3443

35-
assertFalse(contribution.isCompatible());
44+
Platform platform = new Platform() {
45+
@Override
46+
public String getOsName() {
47+
return "Linux";
48+
}
49+
50+
@Override
51+
public String getOsArch() {
52+
return "amd64";
53+
}
54+
};
55+
56+
assertFalse(contribution.isCompatible(platform));
3657
}
3758

3859
@Test
@@ -43,10 +64,20 @@ public String getHost() {
4364
return "x86_64-apple-darwin";
4465
}
4566
};
46-
System.setProperty("os.name", "Mac OS X");
47-
System.setProperty("os.arch", "i686");
4867

49-
assertFalse(contribution.isCompatible());
68+
Platform platform = new Platform() {
69+
@Override
70+
public String getOsName() {
71+
return "Mac OS X";
72+
}
73+
74+
@Override
75+
public String getOsArch() {
76+
return "i686";
77+
}
78+
};
79+
80+
assertFalse(contribution.isCompatible(platform));
5081
}
5182

5283
}

‎arduino-core/lib/commons-lang3-3.3.2.jar

403 KB
Binary file not shown.

‎arduino-core/lib/commons-lang3.LICENSE.ASL-2.0.txt

+202
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

‎arduino-core/src/cc/arduino/contributions/packages/ContributedTool.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
*/
2929
package cc.arduino.contributions.packages;
3030

31+
import processing.app.BaseNoGui;
32+
3133
import java.util.List;
3234

3335
public abstract class ContributedTool {
@@ -40,7 +42,7 @@ public abstract class ContributedTool {
4042

4143
public DownloadableContribution getDownloadableContribution() {
4244
for (HostDependentDownloadableContribution c : getSystems()) {
43-
if (c.isCompatible())
45+
if (c.isCompatible(BaseNoGui.getPlatform()))
4446
return c;
4547
}
4648
return null;
@@ -52,7 +54,7 @@ public String toString() {
5254
res = "Tool name : " + getName() + " " + getVersion() + "\n";
5355
for (HostDependentDownloadableContribution sys : getSystems()) {
5456
res += " sys";
55-
res += sys.isCompatible() ? "*" : " ";
57+
res += sys.isCompatible(BaseNoGui.getPlatform()) ? "*" : " ";
5658
res += " : " + sys + "\n";
5759
}
5860
return res;

‎arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public boolean apply(File file) {
172172

173173
if (postInstallScripts.isEmpty()) {
174174
String[] subfolders = folder.list(new OnlyDirs());
175-
if (subfolders.length > 1) {
175+
if (subfolders.length != 1) {
176176
return;
177177
}
178178

‎arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java

+5-7
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
*/
2929
package cc.arduino.contributions.packages;
3030

31-
import java.util.Properties;
31+
import processing.app.BaseNoGui;
32+
import processing.app.Platform;
3233

3334
public abstract class HostDependentDownloadableContribution extends DownloadableContribution {
3435

@@ -39,12 +40,9 @@ public String toString() {
3940
return getHost() + " " + super.toString();
4041
}
4142

42-
public boolean isCompatible() {
43-
// TODO: add missing host detections
44-
45-
Properties prop = System.getProperties();
46-
String osName = prop.getProperty("os.name");
47-
String osArch = prop.getProperty("os.arch");
43+
public boolean isCompatible(Platform platform) {
44+
String osName = platform.getOsName();
45+
String osArch = platform.getOsArch();
4846

4947
String host = getHost();
5048

‎arduino-core/src/processing/app/Platform.java

+9-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void setLookAndFeel() throws Exception {
7272
}
7373

7474

75-
public void init() {
75+
public void init() throws IOException {
7676
}
7777

7878

@@ -236,4 +236,12 @@ public List<File> postInstallScripts(File folder) {
236236
scripts.add(new File(folder, "post_install.sh"));
237237
return scripts;
238238
}
239+
240+
public String getOsName() {
241+
return System.getProperty("os.name");
242+
}
243+
244+
public String getOsArch() {
245+
return System.getProperty("os.arch");
246+
}
239247
}

0 commit comments

Comments
 (0)