Fossil SCM

added a compiler variant TH1 variable, to be able to see the compiler version on the web page during testing/developing different compiler variants

wolfgang 2010-09-29 15:45 wolfgangFormat2CSS_2
Commit 4d7c443c10411efde8fb8551b791ce5b6ee6f556
Parent e410d40b1ba10bf…
4 files changed +20 +3 +1 +1 -1
~ src/config.h ~ src/stat.c ~ src/style.c ~ win/Makefile.PellesCGMake
M src/config.h
+20
--- src/config.h
+++ src/config.h
@@ -48,10 +48,30 @@
4848
 #else
4949
 # include <sys/types.h>
5050
 # include <signal.h>
5151
 # include <pwd.h>
5252
 #endif
53
+
54
+#if !defined(COMPILE_VARIANT)
55
+# if defined(__MINGW32__)
56
+# define COMPILE_VARIANT "mingw32"
57
+# elif defined(__DMC__)
58
+# define COMPILE_VARIANT "dmc"
59
+# elif defined(__POCC__)
60
+# if defined(_M_X64)
61
+# define COMPILE_VARIANT "pellesc64"
62
+# else
63
+# define COMPILE_VARIANT "pellesc32"
64
+# endif
65
+# elif defined(_MSC_VER)
66
+# define COMPILE_VARIANT "msc"
67
+# elif defined(_WIN32)
68
+# define COMPILE_VARIANT "win32"
69
+# else
70
+# define COMPILE_VARIANT "unx-std"
71
+# endif
72
+#endif
5373
5474
 #include "sqlite3.h"
5575
5676
 /*
5777
 ** Typedef for a 64-bit integer
5878
--- src/config.h
+++ src/config.h
@@ -48,10 +48,30 @@
48 #else
49 # include <sys/types.h>
50 # include <signal.h>
51 # include <pwd.h>
52 #endif
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
53
54 #include "sqlite3.h"
55
56 /*
57 ** Typedef for a 64-bit integer
58
--- src/config.h
+++ src/config.h
@@ -48,10 +48,30 @@
48 #else
49 # include <sys/types.h>
50 # include <signal.h>
51 # include <pwd.h>
52 #endif
53
54 #if !defined(COMPILE_VARIANT)
55 # if defined(__MINGW32__)
56 # define COMPILE_VARIANT "mingw32"
57 # elif defined(__DMC__)
58 # define COMPILE_VARIANT "dmc"
59 # elif defined(__POCC__)
60 # if defined(_M_X64)
61 # define COMPILE_VARIANT "pellesc64"
62 # else
63 # define COMPILE_VARIANT "pellesc32"
64 # endif
65 # elif defined(_MSC_VER)
66 # define COMPILE_VARIANT "msc"
67 # elif defined(_WIN32)
68 # define COMPILE_VARIANT "win32"
69 # else
70 # define COMPILE_VARIANT "unx-std"
71 # endif
72 #endif
73
74 #include "sqlite3.h"
75
76 /*
77 ** Typedef for a 64-bit integer
78
M src/stat.c
+3
--- src/stat.c
+++ src/stat.c
@@ -109,10 +109,13 @@
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)
114
+ @ </td></tr>
115
+ @ <tr><th>Compiler:</th><td>
116
+ @ %h(COMPILE_VARIANT)
114117
 @ </td></tr>
115118
 @ <tr><th>Database&nbsp;Stats:</th><td>
116119
 @ %d(db_int(0, "PRAGMA %s.page_count", g.zRepoDb)) pages,
117120
 @ %d(db_int(0, "PRAGMA %s.page_size", g.zRepoDb)) bytes/page,
118121
 @ %d(db_int(0, "PRAGMA %s.freelist_count", g.zRepoDb)) free pages,
119122
--- src/stat.c
+++ src/stat.c
@@ -109,10 +109,13 @@
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
--- src/stat.c
+++ src/stat.c
@@ -109,10 +109,13 @@
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
M src/style.c
+1
--- src/style.c
+++ src/style.c
@@ -101,10 +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);
106107
 if( g.zLogin ){
107108
 Th_Store("login", g.zLogin);
108109
 }
109110
 if( g.thTrace ) Th_Trace("BEGIN_HEADER_SCRIPT<br />\n", -1);
110111
 Th_Render(zHeader);
111112
--- src/style.c
+++ src/style.c
@@ -101,10 +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 if( g.zLogin ){
107 Th_Store("login", g.zLogin);
108 }
109 if( g.thTrace ) Th_Trace("BEGIN_HEADER_SCRIPT<br />\n", -1);
110 Th_Render(zHeader);
111
--- src/style.c
+++ src/style.c
@@ -101,10 +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
M win/Makefile.PellesCGMake
+1 -1
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -47,11 +47,11 @@
4747
 endif
4848
4949
 B=..
5050
 SRCDIR=$(B)/src/
5151
 WINDIR=$(B)/win/
52
-ZLIBSRCDIR=E:/fossil-w32/zlib/
52
+ZLIBSRCDIR=../../zlib/
5353
5454
 LINK=$(PellesCDir)/bin/polink.exe
5555
 LINKFLAGS=-subsystem:console -machine:$(TARGETMACHINE_LN) /LIBPATH:$(PellesCDir)\lib\win$(TARGETEXTEND) /LIBPATH:$(PellesCDir)\lib kernel32.lib advapi32.lib delayimp$(TARGETEXTEND).lib Wsock32.lib Crtmt$(TARGETEXTEND).lib
5656
5757
 CC=$(PellesCDir)\bin\pocc.exe
5858
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -47,11 +47,11 @@
47 endif
48
49 B=..
50 SRCDIR=$(B)/src/
51 WINDIR=$(B)/win/
52 ZLIBSRCDIR=E:/fossil-w32/zlib/
53
54 LINK=$(PellesCDir)/bin/polink.exe
55 LINKFLAGS=-subsystem:console -machine:$(TARGETMACHINE_LN) /LIBPATH:$(PellesCDir)\lib\win$(TARGETEXTEND) /LIBPATH:$(PellesCDir)\lib kernel32.lib advapi32.lib delayimp$(TARGETEXTEND).lib Wsock32.lib Crtmt$(TARGETEXTEND).lib
56
57 CC=$(PellesCDir)\bin\pocc.exe
58
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -47,11 +47,11 @@
47 endif
48
49 B=..
50 SRCDIR=$(B)/src/
51 WINDIR=$(B)/win/
52 ZLIBSRCDIR=../../zlib/
53
54 LINK=$(PellesCDir)/bin/polink.exe
55 LINKFLAGS=-subsystem:console -machine:$(TARGETMACHINE_LN) /LIBPATH:$(PellesCDir)\lib\win$(TARGETEXTEND) /LIBPATH:$(PellesCDir)\lib kernel32.lib advapi32.lib delayimp$(TARGETEXTEND).lib Wsock32.lib Crtmt$(TARGETEXTEND).lib
56
57 CC=$(PellesCDir)\bin\pocc.exe
58

Keyboard Shortcuts

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