Skip to content

Bugfixes on tests and github actions runner for Windows #10196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Put require .dll together with work/java/bin/java
This allows the library loader to find them even if arduino_debug.exe or
arduino.exe is started from a different directory for example from the
command prompt.
  • Loading branch information
cmaglie committed Jun 19, 2020
commit ac3d1fef2c2a62aafad68c2e9f2c690fd27f4e0e
15 changes: 9 additions & 6 deletions build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1039,10 +1039,6 @@
<fixcrlf file="windows/work/revisions.txt" eol="dos"/>
<fixcrlf file="windows/work/lib/formatter.conf" eol="dos"/>

<copy todir="windows/work">
<fileset dir="windows/dist" includes="*.dll" />
</copy>

<copy todir="windows/work">
<fileset dir="windows/dist" includes="drivers/**" />
</copy>
Expand All @@ -1056,8 +1052,6 @@
<param name="dest_folder" value="${staging_folder}" />
</antcall>
<copy file="windows/libastylej-2.05.1/AStylej.dll" todir="windows/work/lib" />
<copy file="windows/msvcp100.dll" todir="windows/work" />
<copy file="windows/msvcr100.dll" todir="windows/work" />

<antcall target="unzip">
<param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
Expand Down Expand Up @@ -1161,6 +1155,15 @@
</condition>
</fail>

<copy todir="windows/work">
<fileset dir="windows/dist" includes="*.dll" />
</copy>
<!-- Copy also inside java/bin so they can be found even if arduino.exe or
arduino_debug.exe is launched from another working directory -->
<copy todir="windows/work/java/bin">
<fileset dir="windows/dist" includes="*.dll" />
</copy>

<copy todir="${staging_folder}/work/java" includeemptydirs="true" preservelastmodified="true" overwrite="true" failonerror="true">
<fileset dir="${WINDOWS_BUNDLED_JVM}" includes="*/**"/>
</copy>
Expand Down
File renamed without changes.
File renamed without changes.
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy