Change the makefile template language somewhat. Previously variables

had been denoted with @{var:NAME}, this has changed to %{NAME}. This is
pretty much a wash for configure.pl but it makes it much easier to process
the templates using Python's string.Template. The logic being the 'var:'
prefix had been to support conditional statements in the templates (using
an 'if:' prefix), but this functionality was not being used and support
for it is removed from configure.pl in this revision.

For a similiar reason, rename a number of template variables with hyphens
in their name to use underscores instead. This is slightly more consistent
anyway (since many variable names had already used _ instead of -) but more
importantly makes them much easier to deal with using aforementioned Python
template code.

This should not result in any user-visible change (unless I messed up).

1 files changed, 13 insertions, 13 deletions

diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in
index d49f976fb..496826d91 100644
--- a/src/build-data/buildh.in
+++ b/src/build-data/buildh.in
@@ -2,14 +2,14 @@
 #ifndef BOTAN_BUILD_CONFIG_H__
 #define BOTAN_BUILD_CONFIG_H__
 
-/* This file was automatically generated @{var:timestamp} UTC */
+/* This file was automatically generated %{timestamp} UTC */
 
-#define BOTAN_VERSION_MAJOR @{var:version_major}
-#define BOTAN_VERSION_MINOR @{var:version_minor}
-#define BOTAN_VERSION_PATCH @{var:version_patch}
+#define BOTAN_VERSION_MAJOR %{version_major}
+#define BOTAN_VERSION_MINOR %{version_minor}
+#define BOTAN_VERSION_PATCH %{version_patch}
 
 #ifndef BOTAN_DLL
-  #define BOTAN_DLL @{var:dll_export_flags}
+  #define BOTAN_DLL %{dll_export_flags}
 #endif
 
 /* Chunk sizes */
@@ -17,7 +17,7 @@
 #define BOTAN_MEM_POOL_CHUNK_SIZE 64*1024
 
 /* BigInt toggles */
-#define BOTAN_MP_WORD_BITS @{var:mp_bits}
+#define BOTAN_MP_WORD_BITS %{mp_bits}
 #define BOTAN_KARAT_MUL_THRESHOLD 32
 #define BOTAN_KARAT_SQR_THRESHOLD 32
 #define BOTAN_PRIVATE_KEY_OP_BLINDING_BITS 64
@@ -38,21 +38,21 @@
 
 /* Target identification and feature test macros */
 
-@{var:defines}
-@{var:local_config}
+%{defines}
+%{local_config}
 
 /*
-@{var:user}@@{var:hostname} ran '@{var:command-line}'
+%{user}@%{hostname} ran '%{command_line}'
 
 Target
 -------
-Compiler: @{var:cc} @{var:lib_opt} @{var:mach_opt}
-Arch: @{var:submodel}/@{var:arch}
-OS: @{var:os}
+Compiler: %{cc} %{lib_opt} %{mach_opt}
+Arch: %{submodel}/%{arch}
+OS: %{os}
 
 Modules
 -------
-@{var:mod-list}
+%{mod_list}
 */
 
 #endif