Fossil SCM

Change COMPILE_VARIANT to COMPILER_NAME. Populate the macro with complete version information when using GCC.

drh 2010-10-01 15:50 wolfgangFormat2CSS_2
Commit 33b4f335e0c2fd072b3e9002d5a7bdc50d7c92b2
Parent 9d896dcadb7e6ad…
3 files changed +10 -8 +1 -4 +1 -1
~ src/config.h ~ src/stat.c ~ src/style.c
M src/config.h
+10 -8
--- src/config.h
+++ src/config.h
@@ -56,27 +56,29 @@
5656
 #endif
5757
5858
 /*
5959
 ** Define the compiler variant, used to compile the project
6060
 */
61
-#if !defined(COMPILE_VARIANT)
61
+#if !defined(COMPILER_NAME)
6262
 # if defined(__DMC__)
63
-# define COMPILE_VARIANT "dmc"
63
+# define COMPILER_NAME "dmc"
6464
 # elif defined(__POCC__)
6565
 # if defined(_M_X64)
66
-# define COMPILE_VARIANT "pellesc64"
66
+# define COMPILER_NAME "pellesc64"
6767
 # else
68
-# define COMPILE_VARIANT "pellesc32"
68
+# define COMPILER_NAME "pellesc32"
6969
 # endif
7070
 # elif defined(_MSC_VER)
71
-# define COMPILE_VARIANT "msc"
71
+# define COMPILER_NAME "msc"
7272
 # elif defined(__MINGW32__)
73
-# define COMPILE_VARIANT "mingw32"
73
+# define COMPILER_NAME "mingw32"
7474
 # elif defined(_WIN32)
75
-# define COMPILE_VARIANT "win32"
75
+# define COMPILER_NAME "win32"
76
+# elif defined(__GNUC__)
77
+# define COMPILER_NAME "gcc-" __VERSION__
7678
 # else
77
-# define COMPILE_VARIANT "unx-std"
79
+# define COMPILER_NAME "unknown"
7880
 # endif
7981
 #endif
8082
8183
 #ifndef _RC_COMPILE_
8284
8385
--- src/config.h
+++ src/config.h
@@ -56,27 +56,29 @@
56 #endif
57
58 /*
59 ** Define the compiler variant, used to compile the project
60 */
61 #if !defined(COMPILE_VARIANT)
62 # if defined(__DMC__)
63 # define COMPILE_VARIANT "dmc"
64 # elif defined(__POCC__)
65 # if defined(_M_X64)
66 # define COMPILE_VARIANT "pellesc64"
67 # else
68 # define COMPILE_VARIANT "pellesc32"
69 # endif
70 # elif defined(_MSC_VER)
71 # define COMPILE_VARIANT "msc"
72 # elif defined(__MINGW32__)
73 # define COMPILE_VARIANT "mingw32"
74 # elif defined(_WIN32)
75 # define COMPILE_VARIANT "win32"
 
 
76 # else
77 # define COMPILE_VARIANT "unx-std"
78 # endif
79 #endif
80
81 #ifndef _RC_COMPILE_
82
83
--- src/config.h
+++ src/config.h
@@ -56,27 +56,29 @@
56 #endif
57
58 /*
59 ** Define the compiler variant, used to compile the project
60 */
61 #if !defined(COMPILER_NAME)
62 # if defined(__DMC__)
63 # define COMPILER_NAME "dmc"
64 # elif defined(__POCC__)
65 # if defined(_M_X64)
66 # define COMPILER_NAME "pellesc64"
67 # else
68 # define COMPILER_NAME "pellesc32"
69 # endif
70 # elif defined(_MSC_VER)
71 # define COMPILER_NAME "msc"
72 # elif defined(__MINGW32__)
73 # define COMPILER_NAME "mingw32"
74 # elif defined(_WIN32)
75 # define COMPILER_NAME "win32"
76 # elif defined(__GNUC__)
77 # define COMPILER_NAME "gcc-" __VERSION__
78 # else
79 # define COMPILER_NAME "unknown"
80 # endif
81 #endif
82
83 #ifndef _RC_COMPILE_
84
85
M src/stat.c
+1 -4
--- src/stat.c
+++ src/stat.c
@@ -103,20 +103,17 @@
103103
 @ <tr><th>Server&nbsp;ID:</th><td>
104104
 @ %h(db_get("server-code",""))
105105
 @ </td></tr>
106106
107107
 @ <tr><th>Fossil&nbsp;Version:</th><td>
108
- @ %h(MANIFEST_DATE) %h(MANIFEST_VERSION)
108
+ @ %h(MANIFEST_DATE) %h(MANIFEST_VERSION) (%h(COMPILER_NAME))
109109
 @ </td></tr>
110110
 @ <tr><th>SQLite&nbsp;Version:</th><td>
111111
 sqlite3_snprintf(sizeof(zBuf), zBuf, "%.19s [%.10s] (%s)",
112112
 SQLITE_SOURCE_ID, &SQLITE_SOURCE_ID[20], SQLITE_VERSION);
113113
 @ %s(zBuf)
114114
 @ </td></tr>
115
- @ <tr><th>Compiler:</th><td>
116
- @ %h(COMPILE_VARIANT)
117
- @ </td></tr>
118115
 @ <tr><th>Database&nbsp;Stats:</th><td>
119116
 @ %d(db_int(0, "PRAGMA %s.page_count", g.zRepoDb)) pages,
120117
 @ %d(db_int(0, "PRAGMA %s.page_size", g.zRepoDb)) bytes/page,
121118
 @ %d(db_int(0, "PRAGMA %s.freelist_count", g.zRepoDb)) free pages,
122119
 @ %s(db_text(0, "PRAGMA %s.encoding", g.zRepoDb)),
123120
--- src/stat.c
+++ src/stat.c
@@ -103,20 +103,17 @@
103 @ <tr><th>Server&nbsp;ID:</th><td>
104 @ %h(db_get("server-code",""))
105 @ </td></tr>
106
107 @ <tr><th>Fossil&nbsp;Version:</th><td>
108 @ %h(MANIFEST_DATE) %h(MANIFEST_VERSION)
109 @ </td></tr>
110 @ <tr><th>SQLite&nbsp;Version:</th><td>
111 sqlite3_snprintf(sizeof(zBuf), zBuf, "%.19s [%.10s] (%s)",
112 SQLITE_SOURCE_ID, &SQLITE_SOURCE_ID[20], SQLITE_VERSION);
113 @ %s(zBuf)
114 @ </td></tr>
115 @ <tr><th>Compiler:</th><td>
116 @ %h(COMPILE_VARIANT)
117 @ </td></tr>
118 @ <tr><th>Database&nbsp;Stats:</th><td>
119 @ %d(db_int(0, "PRAGMA %s.page_count", g.zRepoDb)) pages,
120 @ %d(db_int(0, "PRAGMA %s.page_size", g.zRepoDb)) bytes/page,
121 @ %d(db_int(0, "PRAGMA %s.freelist_count", g.zRepoDb)) free pages,
122 @ %s(db_text(0, "PRAGMA %s.encoding", g.zRepoDb)),
123
--- src/stat.c
+++ src/stat.c
@@ -103,20 +103,17 @@
103 @ <tr><th>Server&nbsp;ID:</th><td>
104 @ %h(db_get("server-code",""))
105 @ </td></tr>
106
107 @ <tr><th>Fossil&nbsp;Version:</th><td>
108 @ %h(MANIFEST_DATE) %h(MANIFEST_VERSION) (%h(COMPILER_NAME))
109 @ </td></tr>
110 @ <tr><th>SQLite&nbsp;Version:</th><td>
111 sqlite3_snprintf(sizeof(zBuf), zBuf, "%.19s [%.10s] (%s)",
112 SQLITE_SOURCE_ID, &SQLITE_SOURCE_ID[20], SQLITE_VERSION);
113 @ %s(zBuf)
114 @ </td></tr>
 
 
 
115 @ <tr><th>Database&nbsp;Stats:</th><td>
116 @ %d(db_int(0, "PRAGMA %s.page_count", g.zRepoDb)) pages,
117 @ %d(db_int(0, "PRAGMA %s.page_size", g.zRepoDb)) bytes/page,
118 @ %d(db_int(0, "PRAGMA %s.freelist_count", g.zRepoDb)) free pages,
119 @ %s(db_text(0, "PRAGMA %s.encoding", g.zRepoDb)),
120
M src/style.c
+1 -1
--- src/style.c
+++ src/style.c
@@ -101,11 +101,11 @@
101101
 Th_Store("baseurl", g.zBaseURL);
102102
 Th_Store("index_page", db_get("index-page","/home"));
103103
 Th_Store("current_page", g.zPath);
104104
 Th_Store("manifest_version", MANIFEST_VERSION);
105105
 Th_Store("manifest_date", MANIFEST_DATE);
106
- Th_Store("compile_variant", COMPILE_VARIANT);
106
+ Th_Store("compiler_name", COMPILER_NAME);
107107
 if( g.zLogin ){
108108
 Th_Store("login", g.zLogin);
109109
 }
110110
 if( g.thTrace ) Th_Trace("BEGIN_HEADER_SCRIPT<br />\n", -1);
111111
 Th_Render(zHeader);
112112
--- src/style.c
+++ src/style.c
@@ -101,11 +101,11 @@
101 Th_Store("baseurl", g.zBaseURL);
102 Th_Store("index_page", db_get("index-page","/home"));
103 Th_Store("current_page", g.zPath);
104 Th_Store("manifest_version", MANIFEST_VERSION);
105 Th_Store("manifest_date", MANIFEST_DATE);
106 Th_Store("compile_variant", COMPILE_VARIANT);
107 if( g.zLogin ){
108 Th_Store("login", g.zLogin);
109 }
110 if( g.thTrace ) Th_Trace("BEGIN_HEADER_SCRIPT<br />\n", -1);
111 Th_Render(zHeader);
112
--- src/style.c
+++ src/style.c
@@ -101,11 +101,11 @@
101 Th_Store("baseurl", g.zBaseURL);
102 Th_Store("index_page", db_get("index-page","/home"));
103 Th_Store("current_page", g.zPath);
104 Th_Store("manifest_version", MANIFEST_VERSION);
105 Th_Store("manifest_date", MANIFEST_DATE);
106 Th_Store("compiler_name", COMPILER_NAME);
107 if( g.zLogin ){
108 Th_Store("login", g.zLogin);
109 }
110 if( g.thTrace ) Th_Trace("BEGIN_HEADER_SCRIPT<br />\n", -1);
111 Th_Render(zHeader);
112

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button