Index: BUILD.txt ================================================================== --- BUILD.txt +++ BUILD.txt @@ -10,12 +10,13 @@ instead use: make -f Makefile.classic On a windows box, use one of the Makefiles in the win/ subdirectory, -according to your compiler and environment. If you have GCC and MSYS -installed on your system, then consider: +according to your compiler and environment. If you have MinGW or +MinGW-w64 installed on your system (Msys or Cygwin, or as +cross-compile environment on Linux or Darwin), then consider: make -f win/Makefile.mingw If you have VC++ installed on your system, then consider: @@ -41,11 +42,11 @@ mkdir build cd build ../configure make -This will now keep all generates files seperate from the maintained +This will now keep all generates files separate from the maintained source code. -------------------------------------------------------------------------- Here are some notes on what is happening behind the scenes: Index: auto.def ================================================================== --- auto.def +++ auto.def @@ -65,10 +65,14 @@ if {[opt-bool fossil-debug]} { define-append EXTRA_CFLAGS -DFOSSIL_DEBUG } if {[opt-bool json]} { + # Reminder/FIXME (stephan): FOSSIL_ENABLE_JSON + # is required in the CFLAGS because json*.c + # have #ifdef guards around the whole file without + # reading config.h first. define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_JSON define FOSSIL_ENABLE_JSON } if {[opt-bool static]} { Index: src/content.c ================================================================== --- src/content.c +++ src/content.c @@ -269,10 +269,13 @@ n = 1; while( !bag_find(&contentCache.inCache, nextRid) && (nextRid = findSrcid(nextRid))>0 ){ n++; if( n>=nAlloc ){ + if( n>db_int(0, "SELECT max(rid) FROM blob") ){ + fossil_panic("infinite loop in DELTA table"); + } nAlloc = nAlloc*2 + 10; a = fossil_realloc(a, nAlloc*sizeof(a[0])); } a[n] = nextRid; } Index: src/makemake.tcl ================================================================== --- src/makemake.tcl +++ src/makemake.tcl @@ -327,12 +327,22 @@ # # This file is automatically generated. Instead of editing this # file, edit "makemake.tcl" then run "tclsh makemake.tcl" # to regenerate this file. # -# This is a makefile for us on windows using MinGW. +# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or +# MinGW-w64. +# + +#### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers. +# By default, this is an empty string (i.e. use the native compiler). # +PREFIX = +# PREFIX = i686-pc-mingw32- +# PREFIX = i686-w64-mingw32- +# PREFIX = x86_64-w64-mingw32- + #### The toplevel directory of the source tree. Fossil can be built # in a directory that is separate from the source tree. Just change # the following to point from the build directory to the src/ folder. # SRCDIR = src @@ -414,49 +424,56 @@ # will run on the target platform. This is usually the same # as BCC, unless you are cross-compiling. This C compiler builds # the finished binary for fossil. The BCC compiler above is used # for building intermediate code-generator tools. # -TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR) +TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR) + +#### Compile resources for use in building executables that will run +# on the target platform. +# +RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR) # With HTTPS support ifdef FOSSIL_ENABLE_SSL TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR) +RCC += -I$(OPENSSLINCDIR) endif # With Tcl support ifdef FOSSIL_ENABLE_TCL ifdef FOSSIL_TCL_SOURCE TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win +RCC += -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win else TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR) +RCC += -I$(TCLINCDIR) endif endif # With HTTPS support ifdef FOSSIL_ENABLE_SSL TCC += -DFOSSIL_ENABLE_SSL=1 +RCC += -DFOSSIL_ENABLE_SSL=1 endif # With Tcl support (statically linked) ifdef FOSSIL_ENABLE_TCL TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD +RCC += -DFOSSIL_ENABLE_TCL=1 endif # With JSON support ifdef FOSSIL_ENABLE_JSON TCC += -DFOSSIL_ENABLE_JSON=1 +RCC += -DFOSSIL_ENABLE_JSON=1 endif -#### Extra arguments for linking the finished binary. Fossil needs -# to link against the Z-Lib compression library. There are no -# other mandatory dependencies. We add the -static option here -# so that we can build a static executable that will run in a -# chroot jail. +#### We add the -static option here so that we can build a static +# executable that will run in a chroot jail. # LIB = -static -LIB += -lmingwex -lz # OpenSSL: Add the necessary libraries required, if enabled. ifdef FOSSIL_ENABLE_SSL LIB += -lssl -lcrypto -lgdi32 endif @@ -463,10 +480,16 @@ # Tcl: Add the necessary libraries required, if enabled. ifdef FOSSIL_ENABLE_TCL LIB += $(LIBTCL) endif + +#### Extra arguments for linking the finished binary. Fossil needs +# to link against the Z-Lib compression library. There are no +# other mandatory dependencies. +# +LIB += -lmingwex -lz #### These libraries MUST appear in the same order as they do for Tcl # or linking with it will not work (exact reason unknown). # ifdef FOSSIL_ENABLE_TCL @@ -516,13 +539,14 @@ } writeln { all: $(OBJDIR) $(APPNAME) -$(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc - cp $(SRCDIR)/../win/icon.rc $(OBJDIR) - windres $(OBJDIR)/icon.rc -o $(OBJDIR)/icon.o +$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc + cp $(SRCDIR)/../win/fossil.rc $(OBJDIR) + cp $(SRCDIR)/../win/fossil.ico $(OBJDIR) + $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o install: $(APPNAME) mkdir -p $(INSTALLDIR) mv $(APPNAME) $(INSTALLDIR) @@ -559,12 +583,12 @@ ifdef FOSSIL_ENABLE_TCL EXTRAOBJ += $(OBJDIR)/th_tcl.o endif -$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o - $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o +$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o + $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o # This rule prevents make from using its default rules to try build # an executable named "manifest" out of the file named "manifest.c" # $(SRCDIR)/../manifest: Index: src/xfer.c ================================================================== --- src/xfer.c +++ src/xfer.c @@ -1046,11 +1046,11 @@ }else{ send_file(&xfer, seqno, 0, 1); } seqno++; } - if( seqno>=max ) seqno = 0; + if( seqno>max ) seqno = 0; @ clone_seqno %d(seqno) }else{ isClone = 1; isPull = 1; deltaFlag = 1; Index: win/Makefile.mingw ================================================================== --- win/Makefile.mingw +++ win/Makefile.mingw @@ -6,12 +6,22 @@ # # This file is automatically generated. Instead of editing this # file, edit "makemake.tcl" then run "tclsh makemake.tcl" # to regenerate this file. # -# This is a makefile for us on windows using MinGW. +# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or +# MinGW-w64. +# + +#### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers. +# By default, this is an empty string (i.e. use the native compiler). # +PREFIX = +# PREFIX = i686-pc-mingw32- +# PREFIX = i686-w64-mingw32- +# PREFIX = x86_64-w64-mingw32- + #### The toplevel directory of the source tree. Fossil can be built # in a directory that is separate from the source tree. Just change # the following to point from the build directory to the src/ folder. # SRCDIR = src @@ -93,49 +103,56 @@ # will run on the target platform. This is usually the same # as BCC, unless you are cross-compiling. This C compiler builds # the finished binary for fossil. The BCC compiler above is used # for building intermediate code-generator tools. # -TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR) +TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR) + +#### Compile resources for use in building executables that will run +# on the target platform. +# +RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR) # With HTTPS support ifdef FOSSIL_ENABLE_SSL TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR) +RCC += -I$(OPENSSLINCDIR) endif # With Tcl support ifdef FOSSIL_ENABLE_TCL ifdef FOSSIL_TCL_SOURCE TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win +RCC += -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win else TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR) +RCC += -I$(TCLINCDIR) endif endif # With HTTPS support ifdef FOSSIL_ENABLE_SSL TCC += -DFOSSIL_ENABLE_SSL=1 +RCC += -DFOSSIL_ENABLE_SSL=1 endif # With Tcl support (statically linked) ifdef FOSSIL_ENABLE_TCL TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD +RCC += -DFOSSIL_ENABLE_TCL=1 endif # With JSON support ifdef FOSSIL_ENABLE_JSON TCC += -DFOSSIL_ENABLE_JSON=1 +RCC += -DFOSSIL_ENABLE_JSON=1 endif -#### Extra arguments for linking the finished binary. Fossil needs -# to link against the Z-Lib compression library. There are no -# other mandatory dependencies. We add the -static option here -# so that we can build a static executable that will run in a -# chroot jail. +#### We add the -static option here so that we can build a static +# executable that will run in a chroot jail. # LIB = -static -LIB += -lmingwex -lz # OpenSSL: Add the necessary libraries required, if enabled. ifdef FOSSIL_ENABLE_SSL LIB += -lssl -lcrypto -lgdi32 endif @@ -142,10 +159,16 @@ # Tcl: Add the necessary libraries required, if enabled. ifdef FOSSIL_ENABLE_TCL LIB += $(LIBTCL) endif + +#### Extra arguments for linking the finished binary. Fossil needs +# to link against the Z-Lib compression library. There are no +# other mandatory dependencies. +# +LIB += -lmingwex -lz #### These libraries MUST appear in the same order as they do for Tcl # or linking with it will not work (exact reason unknown). # ifdef FOSSIL_ENABLE_TCL @@ -479,13 +502,14 @@ VERSION = $(OBJDIR)/version.exe all: $(OBJDIR) $(APPNAME) -$(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc - cp $(SRCDIR)/../win/icon.rc $(OBJDIR) - windres $(OBJDIR)/icon.rc -o $(OBJDIR)/icon.o +$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc + cp $(SRCDIR)/../win/fossil.rc $(OBJDIR) + cp $(SRCDIR)/../win/fossil.ico $(OBJDIR) + $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o install: $(APPNAME) mkdir -p $(INSTALLDIR) mv $(APPNAME) $(INSTALLDIR) @@ -517,12 +541,12 @@ ifdef FOSSIL_ENABLE_TCL EXTRAOBJ += $(OBJDIR)/th_tcl.o endif -$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o - $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o +$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o + $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o # This rule prevents make from using its default rules to try build # an executable named "manifest" out of the file named "manifest.c" # $(SRCDIR)/../manifest: Index: win/Makefile.mingw.mistachkin ================================================================== --- win/Makefile.mingw.mistachkin +++ win/Makefile.mingw.mistachkin @@ -6,12 +6,22 @@ # # This file is automatically generated. Instead of editing this # file, edit "makemake.tcl" then run "tclsh makemake.tcl" # to regenerate this file. # -# This is a makefile for us on windows using MinGW. +# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or +# MinGW-w64. +# + +#### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers. +# By default, this is an empty string (i.e. use the native compiler). # +PREFIX = +# PREFIX = i686-pc-mingw32- +# PREFIX = i686-w64-mingw32- +# PREFIX = x86_64-w64-mingw32- + #### The toplevel directory of the source tree. Fossil can be built # in a directory that is separate from the source tree. Just change # the following to point from the build directory to the src/ folder. # SRCDIR = src @@ -93,59 +103,72 @@ # will run on the target platform. This is usually the same # as BCC, unless you are cross-compiling. This C compiler builds # the finished binary for fossil. The BCC compiler above is used # for building intermediate code-generator tools. # -TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR) +TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR) + +#### Compile resources for use in building executables that will run +# on the target platform. +# +RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR) # With HTTPS support ifdef FOSSIL_ENABLE_SSL TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR) +RCC += -I$(OPENSSLINCDIR) endif # With Tcl support ifdef FOSSIL_ENABLE_TCL ifdef FOSSIL_TCL_SOURCE TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win +RCC += -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win else TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR) +RCC += -I$(TCLINCDIR) endif endif # With HTTPS support ifdef FOSSIL_ENABLE_SSL TCC += -DFOSSIL_ENABLE_SSL=1 +RCC += -DFOSSIL_ENABLE_SSL=1 endif # With Tcl support (statically linked) ifdef FOSSIL_ENABLE_TCL TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD +RCC += -DFOSSIL_ENABLE_TCL=1 endif # With JSON support ifdef FOSSIL_ENABLE_JSON TCC += -DFOSSIL_ENABLE_JSON=1 +RCC += -DFOSSIL_ENABLE_JSON=1 endif -#### Extra arguments for linking the finished binary. Fossil needs -# to link against the Z-Lib compression library. There are no -# other mandatory dependencies. We add the -static option here -# so that we can build a static executable that will run in a -# chroot jail. +#### We add the -static option here so that we can build a static +# executable that will run in a chroot jail. # LIB = -static -LIB += -lmingwex -lz -# OpenSSL: Add the necessary libaries required, if enabled. +# OpenSSL: Add the necessary libraries required, if enabled. ifdef FOSSIL_ENABLE_SSL LIB += -lssl -lcrypto -lgdi32 endif -# Tcl: Add the necessary libaries required, if enabled. +# Tcl: Add the necessary libraries required, if enabled. ifdef FOSSIL_ENABLE_TCL LIB += $(LIBTCL) endif + +#### Extra arguments for linking the finished binary. Fossil needs +# to link against the Z-Lib compression library. There are no +# other mandatory dependencies. +# +LIB += -lmingwex -lz #### These libraries MUST appear in the same order as they do for Tcl # or linking with it will not work (exact reason unknown). # ifdef FOSSIL_ENABLE_TCL @@ -479,13 +502,14 @@ VERSION = $(OBJDIR)/version.exe all: $(OBJDIR) $(APPNAME) -$(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc - cp $(SRCDIR)/../win/icon.rc $(OBJDIR) - windres $(OBJDIR)/icon.rc -o $(OBJDIR)/icon.o +$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc + cp $(SRCDIR)/../win/fossil.rc $(OBJDIR) + cp $(SRCDIR)/../win/fossil.ico $(OBJDIR) + $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o install: $(APPNAME) mkdir -p $(INSTALLDIR) mv $(APPNAME) $(INSTALLDIR) @@ -517,12 +541,12 @@ ifdef FOSSIL_ENABLE_TCL EXTRAOBJ += $(OBJDIR)/th_tcl.o endif -$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o - $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o +$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o + $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o # This rule prevents make from using its default rules to try build # an executable named "manifest" out of the file named "manifest.c" # $(SRCDIR)/../manifest: DELETED win/Makefile.mingw32cross Index: win/Makefile.mingw32cross ================================================================== --- win/Makefile.mingw32cross +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/make -# This makefile is for use with the Mingw32 *cross compiler* on Linux -# -#### The toplevel directory of the source tree. Fossil can be built -# in a directory that is separate from the source tree. Just change -# the following to point from the build directory to the src/ folder. -# -SRCDIR = ./src -OBJDIR = ./wobj - -#### C Compiler and options for use in building executables that -# will run on the platform that is doing the build. This is used -# to compile code-generator programs as part of the build process. -# See TCC below for the C compiler for building the finished binary. -# -BCC = gcc -s -O2 - -#### The suffix to add to executable files. ".exe" for windows. -# Nothing for unix. -# -E = .exe - -#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) -# -FOSSIL_ENABLE_SSL=1 - -#### C Compile and options for use in building executables that -# will run on the target platform. This is usually the same -# as BCC, unless you are cross-compiling. This C compiler builds -# the finished binary for fossil. The BCC compiler above is used -# for building intermediate code-generator tools. -# -#TCC = gcc -O6 -#TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage -#TCC = gcc -g -Os -Wall -#TCC = gcc -g -Os -Wall -DFOSSIL_I18N=0 -L/usr/local/lib -I/usr/local/include -TCC=i686-pc-mingw32-gcc -O3 -s -Wall -DFOSSIL_I18N=0 - -# With HTTPS support -ifdef FOSSIL_ENABLE_SSL -TCC += -DFOSSIL_ENABLE_SSL=1 -endif - -#### Extra arguments for linking the finished binary. Fossil needs -# to link against the Z-Lib compression library. There are no -# other dependencies. We sometimes add the -static option here -# so that we can build a static executable that will run in a -# chroot jail. -# -LIB=-lz -lssl -lcrypto -lwsock32 -lgdi32 -CFLAGS=-O3 -s -LDFLAGS=-s - -#### Tcl shell for use in running the fossil testsuite. -# -TCLSH = tclsh - -#### Include a configuration file that can override any one of these settings. -# --include config.w32 - -# You should not need to change anything below this line -############################################################################### -include $(SRCDIR)/main.mk Index: win/fossil.rc ================================================================== --- win/fossil.rc +++ win/fossil.rc @@ -1,38 +1,105 @@ -#include -#include "VERSION.h" -#define _RC_COMPILE_ -#include "config.h" - -LANGUAGE LANG_ENGLISH,SUBLANG_ENGLISH_US - -VS_VERSION_INFO VERSIONINFO -FILEVERSION 1,0,0,0 -PRODUCTVERSION 1,0,0,0 -FILEFLAGSMASK 0x3F -FILEFLAGS 0x0 -FILEOS VOS__WINDOWS32 -FILETYPE VFT_APP -FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904B0" - BEGIN - VALUE "FileDescription", "distributed source code control system with integrated wiki and ticket-system\0" - VALUE "Comments", "compiler: "COMPILER_NAME"\0" - VALUE "FileVersion", MANIFEST_UUID"("COMPILER_NAME"\0" - VALUE "InternalName", "fossil\0" - VALUE "LegalCopyright", "Copyright (c) "MANIFEST_YEAR" D. Richard Hipp\0" - VALUE "OriginalFilename", "fossil.exe\0" - VALUE "ProductName", "fossil\0" - VALUE "ProductVersion", MANIFEST_VERSION" "MANIFEST_DATE" UTC\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 0x4B0 - END -END - -8001 ICON "fossil.ico" - +/* +** Copyright (c) 2012 D. Richard Hipp +** +** This program is free software; you can redistribute it and/or +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + +** This program is distributed in the hope that it will be useful, +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. +** +** Author contact information: +** drh@hwaci.com +** http://www.hwaci.com/drh/ +** +******************************************************************************* +** +** This file contains resource information for the executable on Windows. +*/ + +#if !defined(_WIN32_WCE) +#include "winresrc.h" +#else +#include "windows.h" +#endif + +#include "VERSION.h" +#define _RC_COMPILE_ +#include "config.h" +#include "sqlite3.h" +#include "zlib.h" + +#ifdef FOSSIL_ENABLE_SSL +#include "openssl/opensslv.h" +#endif + +#ifdef FOSSIL_ENABLE_TCL +#include "tcl.h" +#endif + +/* + * English (U.S.) resources + */ + +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif /* _WIN32 */ + +/* + * Icon + */ + +#define IDI_FOSSIL 8001 + +IDI_FOSSIL ICON "fossil.ico" + +/* + * Version + */ + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,0,0 + PRODUCTVERSION 1,0,0,0 + FILEFLAGSMASK 0x3F +#if defined(_DEBUG) + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "CompanyName", "Fossil Development Team\0" + VALUE "FileDescription", "Simple, high-reliability, distributed software configuration management system.\0" + VALUE "ProductName", "Fossil\0" + VALUE "ProductVersion", "Fossil " RELEASE_VERSION " " MANIFEST_VERSION " " MANIFEST_DATE " UTC\0" + VALUE "FileVersion", "Fossil " RELEASE_VERSION " " MANIFEST_VERSION " " MANIFEST_DATE " UTC\0" + VALUE "InternalName", "fossil\0" + VALUE "LegalCopyright", "Copyright © " MANIFEST_YEAR " by D. Richard Hipp. All rights reserved.\0" + VALUE "OriginalFilename", "fossil.exe\0" + VALUE "CompilerName", COMPILER_NAME "\0" + VALUE "SQLiteVersion", "SQLite " SQLITE_VERSION " " SQLITE_SOURCE_ID "\0" + VALUE "ZlibVersion", "zlib " ZLIB_VERSION "\0" +#ifdef FOSSIL_ENABLE_SSL + VALUE "SslEnabled", "Yes, " OPENSSL_VERSION_TEXT "\0" +#endif +#ifdef FOSSIL_ENABLE_TCL + VALUE "TclEnabled", "Yes, Tcl " TCL_PATCH_LEVEL "\0" +#endif +#ifdef FOSSIL_ENABLE_JSON + VALUE "JsonEnabled", "Yes, cson\0" +#endif + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 0x4B0 + END +END DELETED win/icon.rc Index: win/icon.rc ================================================================== --- win/icon.rc +++ /dev/null @@ -1,1 +0,0 @@ -ID ICON "../win/fossil.ico" Index: www/build.wiki ================================================================== --- www/build.wiki +++ www/build.wiki @@ -90,12 +90,15 @@

  • Unix without running "configure" → if you prefer to avoid running configure, you can also use: make -f Makefile.classic. You may want to make minor edits to Makefile.classic to configure the build for your system. -

  • Msys/MinGW → Use the -mingw makefile: "make -f win/Makefile.mingw" +

  • MinGW/MinGW-w64 → Use the mingw makefile: +"make -f win/Makefile.mingw". On a Windows box you will +need either Cygwin or Msys as build environment. On Cygwin, Linux +or Darwin you may want to make minor edits to win/Makefile.mingw +to configure the cross-compile environment.

  • VC++ → Use the msc makefile. First change to the "win/" subdirectory ("cd win") then run "nmake /f Makefile.msc".