-
-
Notifications
You must be signed in to change notification settings - Fork 7k
Replace "unzip/tar" in build.xml by Ant's provided unzip/untar method #8682
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
Conversation
This PR looks awesome! I'm giving it a spin in jenkins to make sure it doesn't hurt our normal CI environment and then I'd be super happy to merge it |
7ec1e72
to
7da7eaf
Compare
Works for me (Windows 10, tested with git bash and cygwin) |
@facchinm Thanks for adding Unix/Linux support. Is there anything else in Arduino still using the zip/unzip from Cygwin? Otherwise they could be removed from the Arduino building guide once this is merged. |
Before these changes, I were not able to build using Windows command prompt and I had to use Cygwin due to "unzip" from the Cygwin install not being on my classpath. With these changes, I am able to build using Windows command prompt. However, interestingly enough there is a difference between building with the 2: A build from command prompt leaves the
Difference in build feedback:
This move is triggered by line 278 in I am unsure why this move task executes differently depending on the command prompt, but I can imagine that it has to do something with the fact that both directories are pulled from a different repos than the others and that those repos contain I will explore options and see if I can come up with something that makes both terminals have the same build result. |
The issue mentioned above was caused by Ant's default excludes for directory tasks. Removing all default excludes is the proper way to resolve this problem since running "ant build/dist" using Cygwin on Windows apparentally already ignores these default excludes. |
There's a problem on Linux (probably OSX too) about |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to revert unix commits and continue using untar and unzip utilities (not sure about unzip, untar for sure)
@facchinm Can you make these changes? I do not have a Unix environment on which I can test. |
Sure, as soon as I get some "spare" time I'm on it 😉 |
fc2d181
to
487d3be
Compare
@ArduinoBot build this please |
✅ Build completed. Please test this code using one of the following: ⬇️ http://downloads.arduino.cc/javaide/pull_requests/arduino-PR-8682-BUILD-847-linux32.tar.xz ℹ️ The |
Replace the "unzip" and "tar" command used while building Arduino by the unzip and untar method that Ant provides. This fixes arduino#8617, meaning that "ant run" will work again and no files/directories are created with weird permissions and share names anymore.
Besides that these default excludes get ignored when using the Cygwin terminal on Windows, they cause Ant move tasks to not remove the 'moved' directory if it contains a `.gitignore` or other default exclude file.
To overcome ant untar behaviour (executable bits being lost)
487d3be
to
96e7bc2
Compare
Rebased this PR onto master. |
Replace the "unzip" and "tar" command used while building Arduino by the unzip and untar method that Ant provides.
This fixes #8617, meaning that "ant run" will work again and no files/directories are created with weird permissions and share names anymore.