Skip to content

[1.1.x] Platformio - automate build & environment selection #10563

Closed
Bob-the-Kuhn wants to merge 1 commit intoMarlinFirmware:1.1.xfrom
Bob-the-Kuhn:auto-build-1.1-released
Closed

[1.1.x] Platformio - automate build & environment selection #10563
Bob-the-Kuhn wants to merge 1 commit intoMarlinFirmware:1.1.xfrom
Bob-the-Kuhn:auto-build-1.1-released

Conversation

@Bob-the-Kuhn
Copy link
Contributor

This is the 1.1.x version of PR #10561 which is the bugfix-1.1.x version of PR #10503. See PR #10503 for details.

The changes to implement this feature are:

  • copy auto_build.py from bugfix-1.1.x into 1.1.x
  • copy process-palette.json from bugfix-1.1.x into 1.1.x
  • copy the comments in pins.h from bugfix-1.1.x into 1.1.x - I had to re-arrange the INCLUDES and DEFINES in the RAMPS section at the beginning to be compatible with the auto-build script. I ended up making the RAMPs section look like bugfix-1.1.x. The before and after may look different but they are functionally the same.
  • replace platformio.ini with the one from from bugfix-1.1.x into 1.1.x. After a bunch of re-arranging I was convinced that the only real difference between the two was formatting. After it was all over 1.1.x gained the Melzi optiboot section. That makes it 100% compatible with the current 1.1.x and with the auto-build script.

This has been tested on a 2560 board and a 1284 board.


This PR is against a released branch. That normally isn't done. In this case it may make sense because it results in the current release and the two bugfixes all supported by the new script.

It also makes the new doc page I'm working on easier to write.

@thinkyhead
Copy link
Member

thinkyhead commented Apr 28, 2018

This PR is against a released branch. That normally isn't done. In this case it may make sense because it results in the current release and the two bugfixes all supported by the new script.

There's no point. It's not going to be part of a tagged release, and will only complicate matters when we merge bugfix into 1.1.x. …… Which will only happen when #10446 is fixed …… and I'm totally stumped on that one so far.

@Bob-the-Kuhn
Copy link
Contributor Author

OK - this PR is dead.

I'll try to have the doc changes ready for comments later today.

@Bob-the-Kuhn Bob-the-Kuhn deleted the auto-build-1.1-released branch April 28, 2018 21:56
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.

2 participants