Merge pull request #3803 from jbrazio/feature/buildroot-cleanup

Buildroot cleanup
This commit is contained in:
Scott Lahteine 2016-05-19 21:34:11 -07:00
commit 319d184999
33 changed files with 26 additions and 25 deletions

View File

@ -3,10 +3,7 @@ language: c
# #
before_install: before_install:
# #
# Travis runs a detached head. We need to find the current branch # Fetch the tag information for the current branch
- git checkout `git branch --contains HEAD | grep -v '*'`
#
# Also tags for the root(s) of the minor version(s)
- git fetch origin --tags - git fetch origin --tags
# #
# Publish the buildroot script folder # Publish the buildroot script folder
@ -50,6 +47,10 @@ before_script:
# Change current working directory to the build dir # Change current working directory to the build dir
- cd ${TRAVIS_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: script:
# #
# Backup Configuration.h, Configuration_adv.h, and pins_RAMPS_14.h # Backup Configuration.h, Configuration_adv.h, and pins_RAMPS_14.h

View File

@ -1,6 +1,12 @@
# Marlin 3D Printer Firmware # Marlin 3D Printer Firmware
<img align="top" width=175 src="Documentation/Logo/Marlin%20Logo%20GitHub.png" />
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)
<img align="top" width=175 src="buildroot/share/pixmaps/logo/Marlin%20Logo%20GitHub.png" />
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 ## 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. - 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. - 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 ### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
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)
## Credits ## 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. 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. 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)

0
buildroot/bin/build_marlin Normal file → Executable file
View File

21
buildroot/bin/generate_version_header_for_marlin Normal file → Executable file
View File

@ -1,8 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# generate_version_header_for_marlin # generate_version_header_for_marlin
DIR="$1" DIR="${1}"
OUTFILE="$2"
BUILDATE=$(date '+%s') BUILDATE=$(date '+%s')
DISTDATE=$(date '+%Y-%m-%d %H:%M') 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) BRANCH=$(git -C "${DIR}" symbolic-ref -q --short HEAD)
VERSION=$(git -C "${DIR}" describe --tags --first-parent 2>/dev/null) 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 if [ -z "${VERSION}" ]; then
VERSION=$(git -C "${DIR}" describe --tags --first-parent --always 2>/dev/null) 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 fi
SHORT_BUILD_VERSION=$(echo "${BRANCH}")
DETAILED_BUILD_VERSION=$(echo "${BRANCH}-${VERSION}")
# Gets some misc options from their defaults # Gets some misc options from their defaults
DEFAULT_MACHINE_UUID=$(awk -F'"' \ DEFAULT_MACHINE_UUID=$(awk -F'"' \
'/#define DEFAULT_MACHINE_UUID/{ print $2 }' < "${DIR}/Version.h") '/#define DEFAULT_MACHINE_UUID/{ print $2 }' < "${DIR}/Version.h")
@ -32,10 +32,13 @@ SOURCE_CODE_URL=$(awk -F'"' \
WEBSITE_URL=$(awk -F'"' \ WEBSITE_URL=$(awk -F'"' \
'/#define WEBSITE_URL/{ print $2 }' < "${DIR}/Version.h") '/#define WEBSITE_URL/{ print $2 }' < "${DIR}/Version.h")
cat > "$OUTFILE" <<EOF cat > "${DIR}/_Version.h" <<EOF
/** /**
* THIS FILE IS AUTOMATICALLY GENERATED DO NOT MANUALLY EDIT IT. * THIS FILE IS AUTOMATICALLY GENERATED DO NOT MANUALLY EDIT IT.
* IT DOES NOT GET COMMITTED TO THE REPOSITORY. * IT DOES NOT GET COMMITTED TO THE REPOSITORY.
*
* Branch: ${BRANCH}
* Version: ${VERSION}
*/ */
#define BUILD_UNIX_DATETIME "${BUILDATE}" #define BUILD_UNIX_DATETIME "${BUILDATE}"

0
buildroot/bin/opt_disable Normal file → Executable file
View File

0
buildroot/bin/opt_enable Normal file → Executable file
View File

0
buildroot/bin/opt_enable_adv Normal file → Executable file
View File

0
buildroot/bin/opt_set Normal file → Executable file
View File

0
buildroot/bin/opt_set_adv Normal file → Executable file
View File

0
buildroot/bin/pins_set Normal file → Executable file
View File

0
buildroot/bin/restore_configs Normal file → Executable file
View File

0
buildroot/bin/use_example_configs Normal file → Executable file
View File

View File

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

View File

Before

Width:  |  Height:  |  Size: 249 B

After

Width:  |  Height:  |  Size: 249 B

View File

Before

Width:  |  Height:  |  Size: 93 KiB

After

Width:  |  Height:  |  Size: 93 KiB

View File

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

View File

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View File