Skip to content
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

Fix Travis CI, add SAMD test support, support GNU grep on macOS #640

Merged
merged 17 commits into from Sep 3, 2020

Conversation

tuna-f1sh
Copy link
Contributor

@tuna-f1sh tuna-f1sh commented Aug 6, 2020

Content as subject, includes fix #625. Includes @sej7278's Python 3 branch. BSD grep was creating some warnings parsing boards.txt that were annoying!

@tuna-f1sh
Copy link
Contributor Author

Now includes #630 (manual as @osamuaoki's branch has gone awol).

@sej7278
Copy link
Collaborator

sej7278 commented Aug 6, 2020

👍

@sej7278 sej7278 mentioned this pull request Aug 6, 2020
@sej7278
Copy link
Collaborator

sej7278 commented Aug 9, 2020

Now includes #630 (manual as @osamuaoki's branch has gone awol).

i'm still not 100% sure about that one after building a package from your branch today.

in the debian package it doesn't work as ARDMK_DIR isn't defined anywhere and even if you define it, you can't build the examples as you can't write to /usr/share/doc/arduino-mk/examples

at least with ../../Arduino.mk it works for a git checkout.

seems like the debian package would require the user to copy the examples to their sketchbook directory and define ARDMK_DIR in their local Makefile, like:

ARDMK_DIR = /usr/share/arduino
#ARDMK_DIR = ../../
BOARD_TAG = uno
include $(ARDMK_DIR)/Arduino.mk

at which point setting ARDMK_DIR seems a bit pointless and you may as well stick with:

BOARD_TAG = uno
include /usr/share/arduino/Arduino.mk

The examples like Blink already show you the options:

BOARD_TAG    = uno
include ../../Arduino.mk

# --- leonardo (or pro micro w/leo bootloader)
#BOARD_TAG    = leonardo
#MONITOR_PORT = /dev/ttyACM0
#include /usr/share/arduino/Arduino.mk

We could even use some sed to replace the include line when building the Debian/Fedora packages.

so maybe we should drop that commit from this PR?

@tuna-f1sh
Copy link
Contributor Author

I thought the thinking was that since the README mandates that ARDMK_DIR should be defined by the user, the examples failing helps to ensure this?

Could add in a catch to check for ARDMK_DIR and error if undefined with helpful hint or define it to as it was prior:

ifdef ARDMK_DIR
    include $(ARDMK_DIR)/Arduino.mk
else
    $(info ! Using project relative ARDMK_DIR, please define environment variable ARDMK_DIR as Arduino-Makefile installation directory for external use)
    include ../../Arduino.mk
endif

@sej7278
Copy link
Collaborator

sej7278 commented Aug 10, 2020

where would you put that though - in every example?

@tuna-f1sh
Copy link
Contributor Author

Yes would be quite messy. It does make the example Makefiles better for copying into a project however.

Don't mind, can just remove it and revert back to relative path for all the Makefiles.

@sej7278
Copy link
Collaborator

sej7278 commented Aug 10, 2020

yeah if you can revert it back to ../../ we can look at it again afterwards maybe

@tuna-f1sh
Copy link
Contributor Author

It's gone.

@tuna-f1sh
Copy link
Contributor Author

Have you had chance to review @sudar ? Would be good to get a 2.0 release after this push to fix the Python 3 shebang problem.

@sudar
Copy link
Owner

sudar commented Aug 16, 2020

@tuna-f1sh

I finally got some time this weekend to test it.

I will merge it mostly by tomorrow.

@sudar sudar merged commit e6881e2 into sudar:master Sep 3, 2020
@sudar
Copy link
Owner

sudar commented Sep 3, 2020

Sorry guys, what I thought will take just 2 days ended up being 2 weeks. Finally I was able to test the fix and have just merged it.

Thanks @sej7278 @tuna-f1sh and others who helped to get this done.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Multiple toolchains cause makefile failure
3 participants