Fossil SCM
extended resource info for windows compile
Commit
dd830ff82a4d7440f269baa8e8bed21a48607674
Parent
a5f057945412f8b…
3 files changed
+8
+1
-1
+5
-1
+8
| --- src/config.h | ||
| +++ src/config.h | ||
| @@ -16,10 +16,12 @@ | ||
| 16 | 16 | ******************************************************************************* |
| 17 | 17 | ** |
| 18 | 18 | ** A common header file used by all modules. |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | +#ifndef _RC_COMPILE_ | |
| 22 | + | |
| 21 | 23 | /* The following macros are necessary for large-file support under |
| 22 | 24 | ** some linux distributions, and possibly other unixes as well. |
| 23 | 25 | */ |
| 24 | 26 | #define _LARGE_FILE 1 |
| 25 | 27 | #ifndef _FILE_OFFSET_BITS |
| @@ -48,10 +50,12 @@ | ||
| 48 | 50 | #else |
| 49 | 51 | # include <sys/types.h> |
| 50 | 52 | # include <signal.h> |
| 51 | 53 | # include <pwd.h> |
| 52 | 54 | #endif |
| 55 | + | |
| 56 | +#endif | |
| 53 | 57 | |
| 54 | 58 | #if !defined(COMPILE_VARIANT) |
| 55 | 59 | # if defined(__MINGW32__) |
| 56 | 60 | # define COMPILE_VARIANT "mingw32" |
| 57 | 61 | # elif defined(__DMC__) |
| @@ -68,10 +72,12 @@ | ||
| 68 | 72 | # define COMPILE_VARIANT "win32" |
| 69 | 73 | # else |
| 70 | 74 | # define COMPILE_VARIANT "unx-std" |
| 71 | 75 | # endif |
| 72 | 76 | #endif |
| 77 | + | |
| 78 | +#ifndef _RC_COMPILE_ | |
| 73 | 79 | |
| 74 | 80 | #include "sqlite3.h" |
| 75 | 81 | |
| 76 | 82 | /* |
| 77 | 83 | ** Typedef for a 64-bit integer |
| @@ -143,6 +149,8 @@ | ||
| 143 | 149 | # include <langinfo.h> |
| 144 | 150 | #endif |
| 145 | 151 | #ifndef CODESET |
| 146 | 152 | # undef FOSSIL_I18N |
| 147 | 153 | # define FOSSIL_I18N 0 |
| 154 | +#endif | |
| 155 | + | |
| 148 | 156 | #endif |
| 149 | 157 |
| --- src/config.h | |
| +++ src/config.h | |
| @@ -16,10 +16,12 @@ | |
| 16 | ******************************************************************************* |
| 17 | ** |
| 18 | ** A common header file used by all modules. |
| 19 | */ |
| 20 | |
| 21 | /* The following macros are necessary for large-file support under |
| 22 | ** some linux distributions, and possibly other unixes as well. |
| 23 | */ |
| 24 | #define _LARGE_FILE 1 |
| 25 | #ifndef _FILE_OFFSET_BITS |
| @@ -48,10 +50,12 @@ | |
| 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__) |
| @@ -68,10 +72,12 @@ | |
| 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 |
| @@ -143,6 +149,8 @@ | |
| 143 | # include <langinfo.h> |
| 144 | #endif |
| 145 | #ifndef CODESET |
| 146 | # undef FOSSIL_I18N |
| 147 | # define FOSSIL_I18N 0 |
| 148 | #endif |
| 149 |
| --- src/config.h | |
| +++ src/config.h | |
| @@ -16,10 +16,12 @@ | |
| 16 | ******************************************************************************* |
| 17 | ** |
| 18 | ** A common header file used by all modules. |
| 19 | */ |
| 20 | |
| 21 | #ifndef _RC_COMPILE_ |
| 22 | |
| 23 | /* The following macros are necessary for large-file support under |
| 24 | ** some linux distributions, and possibly other unixes as well. |
| 25 | */ |
| 26 | #define _LARGE_FILE 1 |
| 27 | #ifndef _FILE_OFFSET_BITS |
| @@ -48,10 +50,12 @@ | |
| 50 | #else |
| 51 | # include <sys/types.h> |
| 52 | # include <signal.h> |
| 53 | # include <pwd.h> |
| 54 | #endif |
| 55 | |
| 56 | #endif |
| 57 | |
| 58 | #if !defined(COMPILE_VARIANT) |
| 59 | # if defined(__MINGW32__) |
| 60 | # define COMPILE_VARIANT "mingw32" |
| 61 | # elif defined(__DMC__) |
| @@ -68,10 +72,12 @@ | |
| 72 | # define COMPILE_VARIANT "win32" |
| 73 | # else |
| 74 | # define COMPILE_VARIANT "unx-std" |
| 75 | # endif |
| 76 | #endif |
| 77 | |
| 78 | #ifndef _RC_COMPILE_ |
| 79 | |
| 80 | #include "sqlite3.h" |
| 81 | |
| 82 | /* |
| 83 | ** Typedef for a 64-bit integer |
| @@ -143,6 +149,8 @@ | |
| 149 | # include <langinfo.h> |
| 150 | #endif |
| 151 | #ifndef CODESET |
| 152 | # undef FOSSIL_I18N |
| 153 | # define FOSSIL_I18N 0 |
| 154 | #endif |
| 155 | |
| 156 | #endif |
| 157 |
+1
-1
| --- win/Makefile.dmc | ||
| +++ win/Makefile.dmc | ||
| @@ -29,11 +29,11 @@ | ||
| 29 | 29 | SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c |
| 30 | 30 | |
| 31 | 31 | OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O |
| 32 | 32 | |
| 33 | 33 | RC=$(DMDIR)\bin\rcc |
| 34 | -RCFLAGS=-32 -w1 | |
| 34 | +RCFLAGS=-32 -w1 -I$(SRCDIR) | |
| 35 | 35 | |
| 36 | 36 | APPNAME = $(OBJDIR)\fossil$(E) |
| 37 | 37 | |
| 38 | 38 | all: $(APPNAME) |
| 39 | 39 | |
| 40 | 40 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -29,11 +29,11 @@ | |
| 29 | SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c |
| 30 | |
| 31 | OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O |
| 32 | |
| 33 | RC=$(DMDIR)\bin\rcc |
| 34 | RCFLAGS=-32 -w1 |
| 35 | |
| 36 | APPNAME = $(OBJDIR)\fossil$(E) |
| 37 | |
| 38 | all: $(APPNAME) |
| 39 | |
| 40 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -29,11 +29,11 @@ | |
| 29 | SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c |
| 30 | |
| 31 | OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O |
| 32 | |
| 33 | RC=$(DMDIR)\bin\rcc |
| 34 | RCFLAGS=-32 -w1 -I$(SRCDIR) |
| 35 | |
| 36 | APPNAME = $(OBJDIR)\fossil$(E) |
| 37 | |
| 38 | all: $(APPNAME) |
| 39 | |
| 40 |
+5
-1
| --- win/fossil.rc | ||
| +++ win/fossil.rc | ||
| @@ -1,7 +1,9 @@ | ||
| 1 | 1 | #include <windows.h> |
| 2 | 2 | #include "VERSION.h" |
| 3 | +#define _RC_COMPILE_ | |
| 4 | +#include "config.h" | |
| 3 | 5 | |
| 4 | 6 | LANGUAGE LANG_ENGLISH,SUBLANG_ENGLISH_US |
| 5 | 7 | |
| 6 | 8 | VS_VERSION_INFO VERSIONINFO |
| 7 | 9 | FILEVERSION 1,0,0,0 |
| @@ -14,11 +16,13 @@ | ||
| 14 | 16 | BEGIN |
| 15 | 17 | BLOCK "StringFileInfo" |
| 16 | 18 | BEGIN |
| 17 | 19 | BLOCK "040904B0" |
| 18 | 20 | BEGIN |
| 19 | - VALUE "FileVersion", MANIFEST_UUID"\0" | |
| 21 | + VALUE "FileDescription", "distributed source code control system with integrated wiki and ticket-system\0" | |
| 22 | + VALUE "Comments", "compiler variant: "COMPILE_VARIANT"\0" | |
| 23 | + VALUE "FileVersion", MANIFEST_UUID"("COMPILE_VARIANT"\0" | |
| 20 | 24 | VALUE "InternalName", "fossil\0" |
| 21 | 25 | VALUE "LegalCopyright", "Copyright (c) "MANIFEST_DATE" D. Richard Hipp\0" |
| 22 | 26 | VALUE "OriginalFilename", "fossil.exe\0" |
| 23 | 27 | VALUE "ProductName", "fossil\0" |
| 24 | 28 | VALUE "ProductVersion", MANIFEST_VERSION" "MANIFEST_DATE" UTC\0" |
| 25 | 29 |
| --- win/fossil.rc | |
| +++ win/fossil.rc | |
| @@ -1,7 +1,9 @@ | |
| 1 | #include <windows.h> |
| 2 | #include "VERSION.h" |
| 3 | |
| 4 | LANGUAGE LANG_ENGLISH,SUBLANG_ENGLISH_US |
| 5 | |
| 6 | VS_VERSION_INFO VERSIONINFO |
| 7 | FILEVERSION 1,0,0,0 |
| @@ -14,11 +16,13 @@ | |
| 14 | BEGIN |
| 15 | BLOCK "StringFileInfo" |
| 16 | BEGIN |
| 17 | BLOCK "040904B0" |
| 18 | BEGIN |
| 19 | VALUE "FileVersion", MANIFEST_UUID"\0" |
| 20 | VALUE "InternalName", "fossil\0" |
| 21 | VALUE "LegalCopyright", "Copyright (c) "MANIFEST_DATE" D. Richard Hipp\0" |
| 22 | VALUE "OriginalFilename", "fossil.exe\0" |
| 23 | VALUE "ProductName", "fossil\0" |
| 24 | VALUE "ProductVersion", MANIFEST_VERSION" "MANIFEST_DATE" UTC\0" |
| 25 |
| --- win/fossil.rc | |
| +++ win/fossil.rc | |
| @@ -1,7 +1,9 @@ | |
| 1 | #include <windows.h> |
| 2 | #include "VERSION.h" |
| 3 | #define _RC_COMPILE_ |
| 4 | #include "config.h" |
| 5 | |
| 6 | LANGUAGE LANG_ENGLISH,SUBLANG_ENGLISH_US |
| 7 | |
| 8 | VS_VERSION_INFO VERSIONINFO |
| 9 | FILEVERSION 1,0,0,0 |
| @@ -14,11 +16,13 @@ | |
| 16 | BEGIN |
| 17 | BLOCK "StringFileInfo" |
| 18 | BEGIN |
| 19 | BLOCK "040904B0" |
| 20 | BEGIN |
| 21 | VALUE "FileDescription", "distributed source code control system with integrated wiki and ticket-system\0" |
| 22 | VALUE "Comments", "compiler variant: "COMPILE_VARIANT"\0" |
| 23 | VALUE "FileVersion", MANIFEST_UUID"("COMPILE_VARIANT"\0" |
| 24 | VALUE "InternalName", "fossil\0" |
| 25 | VALUE "LegalCopyright", "Copyright (c) "MANIFEST_DATE" D. Richard Hipp\0" |
| 26 | VALUE "OriginalFilename", "fossil.exe\0" |
| 27 | VALUE "ProductName", "fossil\0" |
| 28 | VALUE "ProductVersion", MANIFEST_VERSION" "MANIFEST_DATE" UTC\0" |
| 29 |