From 14652bb141143384343f3132cf38b7b2531e12d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= Date: Fri, 20 May 2016 02:25:13 +0100 Subject: [PATCH 1/4] Moves shared helper scripts to the buildroot --- {Marlin/scripts => buildroot/share/git}/firstpush | 0 {Marlin/scripts => buildroot/share/git}/mfinfo | 0 {Marlin/scripts => buildroot/share/git}/mfnew | 0 {Marlin/scripts => buildroot/share/git}/mfpr | 0 {Marlin/scripts => buildroot/share/git}/mfprune | 0 {Marlin/scripts => buildroot/share/git}/mfrb | 0 {Marlin/scripts => buildroot/share/git}/mfup | 0 {Marlin => buildroot/share}/scripts/createSpeedLookupTable.py | 0 .../share}/scripts/createTemperatureLookupMarlin.py | 0 {Marlin => buildroot/share}/scripts/findMissingTranslations.sh | 0 {Marlin => buildroot/share}/scripts/g29_auto.py | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename {Marlin/scripts => buildroot/share/git}/firstpush (100%) rename {Marlin/scripts => buildroot/share/git}/mfinfo (100%) rename {Marlin/scripts => buildroot/share/git}/mfnew (100%) rename {Marlin/scripts => buildroot/share/git}/mfpr (100%) rename {Marlin/scripts => buildroot/share/git}/mfprune (100%) rename {Marlin/scripts => buildroot/share/git}/mfrb (100%) rename {Marlin/scripts => buildroot/share/git}/mfup (100%) rename {Marlin => buildroot/share}/scripts/createSpeedLookupTable.py (100%) rename {Marlin => buildroot/share}/scripts/createTemperatureLookupMarlin.py (100%) rename {Marlin => buildroot/share}/scripts/findMissingTranslations.sh (100%) mode change 100644 => 100755 rename {Marlin => buildroot/share}/scripts/g29_auto.py (100%) mode change 100644 => 100755 diff --git a/Marlin/scripts/firstpush b/buildroot/share/git/firstpush similarity index 100% rename from Marlin/scripts/firstpush rename to buildroot/share/git/firstpush diff --git a/Marlin/scripts/mfinfo b/buildroot/share/git/mfinfo similarity index 100% rename from Marlin/scripts/mfinfo rename to buildroot/share/git/mfinfo diff --git a/Marlin/scripts/mfnew b/buildroot/share/git/mfnew similarity index 100% rename from Marlin/scripts/mfnew rename to buildroot/share/git/mfnew diff --git a/Marlin/scripts/mfpr b/buildroot/share/git/mfpr similarity index 100% rename from Marlin/scripts/mfpr rename to buildroot/share/git/mfpr diff --git a/Marlin/scripts/mfprune b/buildroot/share/git/mfprune similarity index 100% rename from Marlin/scripts/mfprune rename to buildroot/share/git/mfprune diff --git a/Marlin/scripts/mfrb b/buildroot/share/git/mfrb similarity index 100% rename from Marlin/scripts/mfrb rename to buildroot/share/git/mfrb diff --git a/Marlin/scripts/mfup b/buildroot/share/git/mfup similarity index 100% rename from Marlin/scripts/mfup rename to buildroot/share/git/mfup diff --git a/Marlin/scripts/createSpeedLookupTable.py b/buildroot/share/scripts/createSpeedLookupTable.py similarity index 100% rename from Marlin/scripts/createSpeedLookupTable.py rename to buildroot/share/scripts/createSpeedLookupTable.py diff --git a/Marlin/scripts/createTemperatureLookupMarlin.py b/buildroot/share/scripts/createTemperatureLookupMarlin.py similarity index 100% rename from Marlin/scripts/createTemperatureLookupMarlin.py rename to buildroot/share/scripts/createTemperatureLookupMarlin.py diff --git a/Marlin/scripts/findMissingTranslations.sh b/buildroot/share/scripts/findMissingTranslations.sh old mode 100644 new mode 100755 similarity index 100% rename from Marlin/scripts/findMissingTranslations.sh rename to buildroot/share/scripts/findMissingTranslations.sh diff --git a/Marlin/scripts/g29_auto.py b/buildroot/share/scripts/g29_auto.py old mode 100644 new mode 100755 similarity index 100% rename from Marlin/scripts/g29_auto.py rename to buildroot/share/scripts/g29_auto.py From 66fb23edb55addb1f88a32646725b2b6a6a0f8f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= Date: Fri, 20 May 2016 02:26:13 +0100 Subject: [PATCH 2/4] Makes buildroot bin scripts executable --- buildroot/bin/build_marlin | 0 buildroot/bin/generate_version_header_for_marlin | 0 buildroot/bin/opt_disable | 0 buildroot/bin/opt_enable | 0 buildroot/bin/opt_enable_adv | 0 buildroot/bin/opt_set | 0 buildroot/bin/opt_set_adv | 0 buildroot/bin/pins_set | 0 buildroot/bin/restore_configs | 0 buildroot/bin/use_example_configs | 0 10 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 buildroot/bin/build_marlin mode change 100644 => 100755 buildroot/bin/generate_version_header_for_marlin mode change 100644 => 100755 buildroot/bin/opt_disable mode change 100644 => 100755 buildroot/bin/opt_enable mode change 100644 => 100755 buildroot/bin/opt_enable_adv mode change 100644 => 100755 buildroot/bin/opt_set mode change 100644 => 100755 buildroot/bin/opt_set_adv mode change 100644 => 100755 buildroot/bin/pins_set mode change 100644 => 100755 buildroot/bin/restore_configs mode change 100644 => 100755 buildroot/bin/use_example_configs diff --git a/buildroot/bin/build_marlin b/buildroot/bin/build_marlin old mode 100644 new mode 100755 diff --git a/buildroot/bin/generate_version_header_for_marlin b/buildroot/bin/generate_version_header_for_marlin old mode 100644 new mode 100755 diff --git a/buildroot/bin/opt_disable b/buildroot/bin/opt_disable old mode 100644 new mode 100755 diff --git a/buildroot/bin/opt_enable b/buildroot/bin/opt_enable old mode 100644 new mode 100755 diff --git a/buildroot/bin/opt_enable_adv b/buildroot/bin/opt_enable_adv old mode 100644 new mode 100755 diff --git a/buildroot/bin/opt_set b/buildroot/bin/opt_set old mode 100644 new mode 100755 diff --git a/buildroot/bin/opt_set_adv b/buildroot/bin/opt_set_adv old mode 100644 new mode 100755 diff --git a/buildroot/bin/pins_set b/buildroot/bin/pins_set old mode 100644 new mode 100755 diff --git a/buildroot/bin/restore_configs b/buildroot/bin/restore_configs old mode 100644 new mode 100755 diff --git a/buildroot/bin/use_example_configs b/buildroot/bin/use_example_configs old mode 100644 new mode 100755 From 08b485a31063cd767660f2bed66cce78aee34dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= Date: Fri, 20 May 2016 02:30:03 +0100 Subject: [PATCH 3/4] Travis will now generate and use the custom version header file --- .travis.yml | 9 ++++---- .../bin/generate_version_header_for_marlin | 21 +++++++++++-------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d22bd06a..53e3dcbf1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,7 @@ language: c # before_install: # - # Travis runs a detached head. We need to find the current branch - - git checkout `git branch --contains HEAD | grep -v '*'` - # - # Also tags for the root(s) of the minor version(s) + # Fetch the tag information for the current branch - git fetch origin --tags # # Publish the buildroot script folder @@ -50,6 +47,10 @@ before_script: # Change current working directory to the build dir - cd ${TRAVIS_BUILD_DIR} # + # Generate custom version include + - generate_version_header_for_marlin ${TRAVIS_BUILD_DIR}/Marlin + - cat ${TRAVIS_BUILD_DIR}/Marlin/_Version.h + # script: # # Backup Configuration.h, Configuration_adv.h, and pins_RAMPS_14.h diff --git a/buildroot/bin/generate_version_header_for_marlin b/buildroot/bin/generate_version_header_for_marlin index 5fa9fb633..431008461 100755 --- a/buildroot/bin/generate_version_header_for_marlin +++ b/buildroot/bin/generate_version_header_for_marlin @@ -1,8 +1,7 @@ #!/usr/bin/env bash # generate_version_header_for_marlin -DIR="$1" -OUTFILE="$2" +DIR="${1}" BUILDATE=$(date '+%s') DISTDATE=$(date '+%Y-%m-%d %H:%M') @@ -10,16 +9,17 @@ DISTDATE=$(date '+%Y-%m-%d %H:%M') BRANCH=$(git -C "${DIR}" symbolic-ref -q --short HEAD) VERSION=$(git -C "${DIR}" describe --tags --first-parent 2>/dev/null) -# Voodoo version tag generator +if [ -z "${BRANCH}" ]; then + BRANCH=$(echo "${TRAVIS_BRANCH}") +fi + if [ -z "${VERSION}" ]; then VERSION=$(git -C "${DIR}" describe --tags --first-parent --always 2>/dev/null) - SHORT_BUILD_VERSION=$(echo "${VERSION}" | sed "s/-.*/${BRANCH}/") - DETAILED_BUILD_VERSION=$(echo "${VERSION}" | sed "s/-/${BRANCH}-/") -else - SHORT_BUILD_VERSION=$(echo "${BRANCH}") - DETAILED_BUILD_VERSION=$(echo "${BRANCH}-${VERSION}") fi +SHORT_BUILD_VERSION=$(echo "${BRANCH}") +DETAILED_BUILD_VERSION=$(echo "${BRANCH}-${VERSION}") + # Gets some misc options from their defaults DEFAULT_MACHINE_UUID=$(awk -F'"' \ '/#define DEFAULT_MACHINE_UUID/{ print $2 }' < "${DIR}/Version.h") @@ -32,10 +32,13 @@ SOURCE_CODE_URL=$(awk -F'"' \ WEBSITE_URL=$(awk -F'"' \ '/#define WEBSITE_URL/{ print $2 }' < "${DIR}/Version.h") -cat > "$OUTFILE" < "${DIR}/_Version.h" < Date: Fri, 20 May 2016 03:30:14 +0100 Subject: [PATCH 4/4] Moves the Marlin logo into the buildroot --- README.md | 21 ++++++++---------- .../pixmaps/logo}/Marlin Logo GitHub.png | Bin .../pixmaps/logo}/Marlin Logo LCD High.png | Bin .../pixmaps/logo}/Marlin Logo LCD Low_old.png | Bin .../share/pixmaps/logo}/Marlin Logo.pdf | Bin .../share/pixmaps/logo}/Marlin Logo.png | Bin .../share/pixmaps/logo}/Marlin Logo.svg | 0 .../share/pixmaps/logo}/Marlin Logo_old.ai | 0 .../share/pixmaps/logo}/Marlin Logo_old.cdr | Bin .../share/pixmaps/logo}/Marlin Logo_old.dxf | 0 .../share/pixmaps/logo}/marlinwiki.png | Bin 11 files changed, 9 insertions(+), 12 deletions(-) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/Marlin Logo GitHub.png (100%) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/Marlin Logo LCD High.png (100%) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/Marlin Logo LCD Low_old.png (100%) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/Marlin Logo.pdf (100%) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/Marlin Logo.png (100%) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/Marlin Logo.svg (100%) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/Marlin Logo_old.ai (100%) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/Marlin Logo_old.cdr (100%) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/Marlin Logo_old.dxf (100%) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/marlinwiki.png (100%) diff --git a/README.md b/README.md index 0ced9403e..5f3a157f0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,12 @@ # Marlin 3D Printer Firmware - - Additional documentation can be found in [The Marlin Wiki](https://github.com/MarlinFirmware/Marlin/wiki). + +[![Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg?branch=RCBugFix)](https://travis-ci.org/MarlinFirmware/Marlin) +[![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224) + + + +Additional documentation can be found in [The Marlin Wiki](https://github.com/MarlinFirmware/Marlin/wiki). +Please test this firmware and inform us if it misbehaves in any way, volunteers are standing by! ## Release Candidate -- Marlin 1.1.0-RCBugFix - 27 April 2016 @@ -58,14 +64,7 @@ Proposed patches should be submitted as a Pull Request against the [RCBugFix](ht - Do submit questions and concerns. The "naive" question is often the one we forget to ask. - Follow the proper coding style. Pull requests with styling errors will be delayed. See our [Coding Standards](https://github.com/MarlinFirmware/Marlin/wiki/DNE-Coding-Standards) page for more information. -## Current Status: Testing - -Please test this firmware and inform us if it misbehaves in any way. Volunteers are standing by! - -[![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224) -[![Travis Build Status](https://travis-ci.org/MarlinFirmware/MarlinDev.svg)](https://travis-ci.org/MarlinFirmware/MarlinDev) - -##### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin) +### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin) ## Credits @@ -95,5 +94,3 @@ More features have been added by: Marlin is published under the [GPL license](/LICENSE) because we believe in open development. The GPL comes with both rights and obligations. Whether you use Marlin firmware as the driver for your open or closed-source product, you must keep Marlin open, and you must provide your compatible Marlin source code to end users upon request. The most straightforward way to comply with the Marlin license is to make a fork of Marlin on Github, perform your modifications, and direct users to your modified fork. While we can't prevent the use of this code in products (3D printers, CNC, etc.) that are closed source or crippled by a patent, we would prefer that you choose another firmware or, better yet, make your own. - -[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) \ No newline at end of file diff --git a/Documentation/Logo/Marlin Logo GitHub.png b/buildroot/share/pixmaps/logo/Marlin Logo GitHub.png similarity index 100% rename from Documentation/Logo/Marlin Logo GitHub.png rename to buildroot/share/pixmaps/logo/Marlin Logo GitHub.png diff --git a/Documentation/Logo/Marlin Logo LCD High.png b/buildroot/share/pixmaps/logo/Marlin Logo LCD High.png similarity index 100% rename from Documentation/Logo/Marlin Logo LCD High.png rename to buildroot/share/pixmaps/logo/Marlin Logo LCD High.png diff --git a/Documentation/Logo/Marlin Logo LCD Low_old.png b/buildroot/share/pixmaps/logo/Marlin Logo LCD Low_old.png similarity index 100% rename from Documentation/Logo/Marlin Logo LCD Low_old.png rename to buildroot/share/pixmaps/logo/Marlin Logo LCD Low_old.png diff --git a/Documentation/Logo/Marlin Logo.pdf b/buildroot/share/pixmaps/logo/Marlin Logo.pdf similarity index 100% rename from Documentation/Logo/Marlin Logo.pdf rename to buildroot/share/pixmaps/logo/Marlin Logo.pdf diff --git a/Documentation/Logo/Marlin Logo.png b/buildroot/share/pixmaps/logo/Marlin Logo.png similarity index 100% rename from Documentation/Logo/Marlin Logo.png rename to buildroot/share/pixmaps/logo/Marlin Logo.png diff --git a/Documentation/Logo/Marlin Logo.svg b/buildroot/share/pixmaps/logo/Marlin Logo.svg similarity index 100% rename from Documentation/Logo/Marlin Logo.svg rename to buildroot/share/pixmaps/logo/Marlin Logo.svg diff --git a/Documentation/Logo/Marlin Logo_old.ai b/buildroot/share/pixmaps/logo/Marlin Logo_old.ai similarity index 100% rename from Documentation/Logo/Marlin Logo_old.ai rename to buildroot/share/pixmaps/logo/Marlin Logo_old.ai diff --git a/Documentation/Logo/Marlin Logo_old.cdr b/buildroot/share/pixmaps/logo/Marlin Logo_old.cdr similarity index 100% rename from Documentation/Logo/Marlin Logo_old.cdr rename to buildroot/share/pixmaps/logo/Marlin Logo_old.cdr diff --git a/Documentation/Logo/Marlin Logo_old.dxf b/buildroot/share/pixmaps/logo/Marlin Logo_old.dxf similarity index 100% rename from Documentation/Logo/Marlin Logo_old.dxf rename to buildroot/share/pixmaps/logo/Marlin Logo_old.dxf diff --git a/Documentation/Logo/marlinwiki.png b/buildroot/share/pixmaps/logo/marlinwiki.png similarity index 100% rename from Documentation/Logo/marlinwiki.png rename to buildroot/share/pixmaps/logo/marlinwiki.png