Skip to content

Commit b65b576

Browse files
author
Federico Fissore
committed
Getting rid of native stuff. Avoid native stuff: it will break. Fixes #2828, #2829, #2830
1 parent 3788128 commit b65b576

File tree

11 files changed

+44
-300
lines changed

11 files changed

+44
-300
lines changed

app/src/cc/arduino/contributions/libraries/ui/LibraryInstaller.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import java.io.IOException;
3535
import java.net.URL;
3636

37+
import processing.app.BaseNoGui;
3738
import processing.app.helpers.FileUtils;
3839
import cc.arduino.contributions.libraries.ContributedLibrary;
3940
import cc.arduino.contributions.libraries.LibrariesIndexer;
@@ -122,7 +123,7 @@ public void install(ContributedLibrary lib, ContributedLibrary replacedLib) thro
122123
File libsFolder = indexer.getSketchbookLibrariesFolder();
123124
File tmpFolder = FileUtils.createTempFolderIn(libsFolder);
124125
try {
125-
ArchiveExtractor.extract(lib.getDownloadedFile(), tmpFolder, 1);
126+
new ArchiveExtractor(BaseNoGui.getPlatform()).extract(lib.getDownloadedFile(), tmpFolder, 1);
126127
} catch (Exception e) {
127128
if (tmpFolder.exists())
128129
FileUtils.recursiveDelete(tmpFolder);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public void install(ContributedPlatform platform) throws Exception {
139139

140140
destFolder.mkdirs();
141141
assert toolContrib.getDownloadedFile() != null;
142-
ArchiveExtractor.extract(toolContrib.getDownloadedFile(), destFolder, 1);
142+
new ArchiveExtractor(BaseNoGui.getPlatform()).extract(toolContrib.getDownloadedFile(), destFolder, 1);
143143
executePostInstallScriptIfAny(destFolder);
144144
toolContrib.setInstalled(true);
145145
toolContrib.setInstalledFolder(destFolder);
@@ -152,7 +152,7 @@ public void install(ContributedPlatform platform) throws Exception {
152152
File platformFolder = new File(packageFolder, "hardware" + File.separator + platform.getArchitecture());
153153
File destFolder = new File(platformFolder, platform.getVersion());
154154
destFolder.mkdirs();
155-
ArchiveExtractor.extract(platform.getDownloadedFile(), destFolder, 1);
155+
new ArchiveExtractor(BaseNoGui.getPlatform()).extract(platform.getDownloadedFile(), destFolder, 1);
156156
platform.setInstalled(true);
157157
platform.setInstalledFolder(destFolder);
158158
progress.stepDone();

arduino-core/src/cc/arduino/os/FileNativeUtils.java

Lines changed: 0 additions & 91 deletions
This file was deleted.

arduino-core/src/cc/arduino/os/linux/LibCNative.java

Lines changed: 0 additions & 50 deletions
This file was deleted.

arduino-core/src/cc/arduino/os/linux/LinuxFileNativeUtils.java

Lines changed: 0 additions & 63 deletions
This file was deleted.

arduino-core/src/cc/arduino/os/macos/MacOSFileNativeUtils.java

Lines changed: 0 additions & 37 deletions
This file was deleted.

arduino-core/src/cc/arduino/os/windows/WindowsFileNativeUtils.java

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)