Canonize Option flag USE_AUTOMATIC_VERSION

9 years ago · 329acc852e
parent a8db0aac32
commit 329acc852e
21 changed files with 24 additions and 20 deletions
--- a/ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr/platform.local.txt
+++ b/ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr/platform.local.txt
@ -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.linux=
 recipe.hooks.prebuild0.pattern={build.custom_bin.path}generate_version_header_for_marlin "{build.source.path}" "{build.path}/_Version.h"
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:

 // @section info

-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
  #include "_Version.h"
 #else
  #include "Default_Version.h"
--- a/Marlin/SanityCheck.h
+++ b/Marlin/SanityCheck.h
@ -382,4 +382,8 @@
    #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME instead
  #endif

+  #ifdef HAS_AUTOMATIC_VERSIONING
+    #error HAS_AUTOMATIC_VERSIONING deprecated - use USE_AUTOMATIC_VERSIONING instead
+  #endif
+
 #endif //SANITYCHECK_H
--- a/Marlin/configurator/config/Configuration.h
+++ b/Marlin/configurator/config/Configuration.h
@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:

 // @section info

-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
  #include "_Version.h"
 #else
  #include "Default_Version.h"
--- a/Marlin/configurator/config/language.h
+++ b/Marlin/configurator/config/language.h
@ -38,7 +38,7 @@
  #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
 #endif

-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
  #include "_Version.h"
 #endif

--- a/Marlin/example_configurations/Felix/Configuration.h
+++ b/Marlin/example_configurations/Felix/Configuration.h
@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:

 // @section info

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

 // @section info

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

 // @section info

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

 // @section info

-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
  #include "_Version.h"
 #else
  #include "Default_Version.h"
--- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
+++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:

 // @section info

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

 // @section info

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

 // @section info

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

 // @section info

-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
  #include "_Version.h"
 #else
  #include "Default_Version.h"
--- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h
+++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:

 // @section info

-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
  #include "_Version.h"
 #else
  #include "Default_Version.h"
--- a/Marlin/example_configurations/delta/biv2.5/Configuration.h
+++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h
@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:

 // @section info

-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
  #include "_Version.h"
 #else
  #include "Default_Version.h"
--- a/Marlin/example_configurations/delta/generic/Configuration.h
+++ b/Marlin/example_configurations/delta/generic/Configuration.h
@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:

 // @section info

-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
  #include "_Version.h"
 #else
  #include "Default_Version.h"
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:

 // @section info

-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
  #include "_Version.h"
 #else
  #include "Default_Version.h"
--- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
@ -42,7 +42,7 @@ Here are some standard links for getting your machine calibrated:

 // @section info

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

 // @section info

-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
  #include "_Version.h"
 #else
  #include "Default_Version.h"
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:

 // @section info

-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
  #include "_Version.h"
 #else
  #include "Default_Version.h"
--- a/Marlin/language.h
+++ b/Marlin/language.h
@ -38,7 +38,7 @@
  #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
 #endif

-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
  #include "_Version.h"
 #endif