Canonize Option flag USE_AUTOMATIC_VERSION

This commit is contained in:
Richard Wackerbarth 2015-08-01 09:57:59 -05:00
parent a8db0aac32
commit 329acc852e
21 changed files with 24 additions and 20 deletions

View file

@ -1,4 +1,4 @@
compiler.cpp.extra_flags=-DHAS_AUTOMATIC_VERSIONING compiler.cpp.extra_flags=-DUSE_AUTOMATIC_VERSIONING
build.custom_bin.path.macosx=/usr/local/bin/ build.custom_bin.path.macosx=/usr/local/bin/
build.custom_bin.path.linux= build.custom_bin.path.linux=
recipe.hooks.prebuild0.pattern={build.custom_bin.path}generate_version_header_for_marlin "{build.source.path}" "{build.path}/_Version.h" recipe.hooks.prebuild0.pattern={build.custom_bin.path}generate_version_header_for_marlin "{build.source.path}" "{build.path}/_Version.h"

View file

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

View file

@ -382,4 +382,8 @@
#error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME instead #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME instead
#endif #endif
#ifdef HAS_AUTOMATIC_VERSIONING
#error HAS_AUTOMATIC_VERSIONING deprecated - use USE_AUTOMATIC_VERSIONING instead
#endif
#endif //SANITYCHECK_H #endif //SANITYCHECK_H

View file

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

View file

@ -38,7 +38,7 @@
#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
#endif #endif
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#endif #endif

View file

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

View file

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

View file

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

View file

@ -43,7 +43,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

View file

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

View file

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

View file

@ -63,7 +63,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

View file

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

View file

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

View file

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

View file

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

View file

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

View file

@ -42,7 +42,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

View file

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

View file

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

View file

@ -38,7 +38,7 @@
#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
#endif #endif
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#endif #endif