# # # patch "INSTALL" # from [91b324ecbcbac1631c53efa63e25abb53845d14c] # to [4f2bea8e102f4e49c88dbdc67ae56ec23407c599] # # patch "win32/README" # from [81332b9d5ae1b1f54f360f4079bba1c21561e0ca] # to [ec18a075b71683a6f6a95e2554f0028b0c0e8cfe] # # patch "win32/monotone.iss" # from [354842bbaab42fe67402005bd30a368681cd26de] # to [116a4d7701c0c52e7574787880e431b9b4138de2] # ============================================================ --- INSTALL 91b324ecbcbac1631c53efa63e25abb53845d14c +++ INSTALL 4f2bea8e102f4e49c88dbdc67ae56ec23407c599 @@ -95,7 +95,6 @@ 1. prerequisites: MingGW | 5.1.3 | http://prdownloads.sf.net/mingw/MinGW-5.1.3.exe?download MSYS | 1.0.10 | http://prdownloads.sf.net/mingw/MSYS-1.0.10.exe?download msysDTK | 1.0.1 | http://prdownloads.sf.net/mingw/msysDTK-1.0.1.exe?download - wget | 1.9.1 | http://prdownloads.sf.net/mingw/wget-1.9.1-mingwPORT.tar.bz2?download libiconv | 1.11 | http://prdownloads.sf.net/mingw/libiconv-1.11-mingwPORT-20070423-1.tar.bz2?download autoconf | 2.59 | http://prdownloads.sf.net/mingw/autoconf-2.59-mingwPORT.tar.bz2?download automake | 1.9.5 | http://prdownloads.sf.net/mingw/automake-1.9.5-mingwPORT.tar.bz2?download @@ -127,29 +126,22 @@ 1. prerequisites: 4. Rename `make`: $ mv /bin/mingw32-make.exe /bin/make.exe - 5. wget - $ mkdir -p /usr/src + 5. libiconv $ cd /usr/src - $ tar jxf wget-1.9.1-mingwPORT.tar.bz2 - $ cd wget-1.9.1/mingwPORT - $ cp -a wget.exe /mingw/bin - $ ./mingwPORT.sh - - 6. Accept all defaults by hitting the enter key. The following steps also always accept all defaults. - 7. libiconv - $ cd /usr/src $ export SRCROOT=/usr/src $ tar jxf libiconv-1.11-mingwPORT.tar.bz2 $ cd libiconv-1.11/mingwPORT $ ./mingwPORT.sh - 8. autoconf + 6. Accept all defaults by hitting the enter key. The following steps also always accept all defaults. + + 7. autoconf $ cd /usr/src $ tar jxf autoconf-2.59-mingwPORT.tar.bz2 $ cd autoconf-2.59/mingwPORT $ ./mingwPORT.sh - 9. Open `/mingw/bin/autoconf` in an editor and change the following line from something like + 8. Open `/mingw/bin/autoconf` in an editor and change the following line from something like : ${AUTOM4TE='c:/mingw/bin/autom4te'} @@ -157,73 +149,65 @@ 1. prerequisites: : ${AUTOM4TE='/mingw/bin/autom4te'} - 10. automake + 9. automake $ cd /usr/src $ tar jxf automake-1.9.5-mingwPORT.tar.bz2 $ cd automake-1.9.5/mingwPORT $ ./mingwPORT.sh - 11. Open the files `/mingw/bin/aclocal`, + 10. Open the files `/mingw/bin/aclocal`, `/mingw/bin/aclocal-1.9`, and all files matching `auto*` in an editor and delete `c:/` from all paths, as was done above for `autoconf`. - 12. zlib + 11. zlib $ cd /usr/src $ tar jxf zlib-1.2.3-mingwPORT.tar.bz2 $ cd zlib-1.2.3/mingwPORT $ ./mingwPORT.sh - 13. gettext + 12. gettext $ cd /usr/src $ tar zxf gettext-0.17.tar.gz $ cd gettext-0.17 $ ./configure --prefix=/usr/local $ make install - 14. If the wget command here fails, get the patch manually - from - ,
- on *version 1.15*, click "select for diffs"
on - *version 1.16*, click "diff to previous 1.15"
near - top of page, click on "patch"
save file as - `c:/Downloads/mingw/localename_1.15-1.16.patch` - - 15. boost; only need headers + 13. boost; only need headers $ cd /usr/src $ tar jxf boost_1_34_1.tar.bz2 $ cd boost_1_34_1 $ cp -a boost /mingw/include - 16. Lua + 14. Lua $ cd /usr/src $ tar zxf lua-5.1.4.tar.gz $ cd lua-5.1.4 $ make mingw $ make install - 17. pcre + 15. pcre $ cd /usr/src $ tar zxf pcre-7.8.tar.gz $ cd pcre-7.8 $ ./configure $ make install - 18. botan + 16. botan $ cd /usr/src $ tar zxf Botan-1.8.0.tgz $ cd Botan-1.8 $ ./configure.pl --with-tr1=none $ make install - 19. sqlite3 + 17. sqlite3 $ cd /usrsrc $ tar zxf sqlite-amalgamation-3_6_10.tar.gz $ cd sqlite-amalgamation-3.6.10 $ ./configure $ make install - 20. libidn + 18. libidn $ cd /usr/src $ tar zxf libidn-1.9.tar.gz $ cd libidn-1.9 ============================================================ --- win32/README 81332b9d5ae1b1f54f360f4079bba1c21561e0ca +++ win32/README ec18a075b71683a6f6a95e2554f0028b0c0e8cfe @@ -4,9 +4,10 @@ creating a MinGW release, on a fresh Win MinGW. Instead, we use Inno Setup. Here are all the steps for creating a MinGW release, on a fresh Windows machine: -Install MinGW tools, and a monotone binary; see -http://monotone.ca/wiki/Building/Windows/ +Install MinGW tools; see ../INSTALL, MinGW section +Install a monotone binary; see http://monotone.ca/ + Get a copy of the monotone repository; see http://monotone.ca/wiki/SelfHostingInfo/ @@ -16,19 +17,35 @@ autoreconf -i Build the release. In an MSYS shell: cd monotone- autoreconf -i -./configure +./configure lua_CFLAGS=-I/usr/local/include lua_LIBS="-L/usr/local/lib -llua" \ + sqlite_CFLAGS=-I/usr/local/include sqlite_LIBS="-L/usr/local/lib -lsqlite3" \ + idn_CFLAGS=-I/usr/local/include idn_LIBS="-L/usr/local/lib -lidn" make -Install Inno Setup; see http://www.jrsoftware.org/isinfo.php +Install Inno Setup and Inno Setup preprocessor; see +http://www.jrsoftware.org/isinfo.php, get the Quick Start Pack. In Inno Setup, open monotone/win32/monotone.iss -If you have installed MinGW in a non-default place, adjust the Source: -paths to the mingw dlls to match your mingw installation +Check that the APPVERS macro is correct. +If you have installed MinGW in a non-default place, adjust the +MINGWDIR macro to match. + If you have built monotone in a separate build directory, adjust -the Source: paths to monotone.exe and monotone.html +the BUILDDIR macro to match. +Update the list of dlls. Current list: + +DLL source +libiconv-2.dll ? +libidn-11.dll libidn +libintl-8.dll gettext +libpcre-0.dll pcre +libpcrecpp-0.dll pcre +libpcreposix-0.dll pcre +zlib1.dll zlib + Choose menu Build | Compile (or click the "compile" button). This generates monotone--setup.exe in the monotone/win32 directory. ============================================================ --- win32/monotone.iss 354842bbaab42fe67402005bd30a368681cd26de +++ win32/monotone.iss 116a4d7701c0c52e7574787880e431b9b4138de2 @@ -1,12 +1,14 @@ #define APPNAME="monotone" -#define APPVERS="0.42" +#define APPVERS="0.43dev" +#define BUILDDIR=".." +#define MINGWDIR="\MinGW" [Setup] AppName={#APPNAME} AppVersion={#APPVERS} AppVerName={#APPNAME} {#APPVERS} OutputBaseFileName={#APPNAME}-{#APPVERS}-setup -AppCopyright=Copyright © 2002-2008 Graydon Hoare et al. +AppCopyright=Copyright © 2002-2009 Graydon Hoare et al. AppPublisher=The monotone Development Team AppPublisherURL=http://www.monotone.ca/ DefaultDirName={pf}\{#APPNAME} @@ -21,17 +23,21 @@ WizardImageFile=monotone.bmp WizardImageFile=monotone.bmp [Files] -Source: "..\mtn.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\monotone.html"; DestDir: "{app}\documentation"; Flags: ignoreversion -Source: "..\figures\*.png"; DestDir: "{app}\documentation\figures"; Flags: ignoreversion +Source: "{#BUILDDIR}\mtn.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#BUILDDIR}\monotone.html"; DestDir: "{app}\documentation"; Flags: ignoreversion +Source: "{#BUILDDIR}\figures\*.png"; DestDir: "{app}\documentation\figures"; Flags: ignoreversion Source: "..\COPYING"; DestDir: "{app}"; Flags: ignoreversion Source: "..\po\de.gmo"; DestDir: "{app}\locale\de\LC_MESSAGES"; DestName: "monotone.mo"; Flags: ignoreversion Source: "..\po\es.gmo"; DestDir: "{app}\locale\es\LC_MESSAGES"; DestName: "monotone.mo"; Flags: ignoreversion Source: "..\po\it.gmo"; DestDir: "{app}\locale\it\LC_MESSAGES"; DestName: "monotone.mo"; Flags: ignoreversion Source: "..\po\sv.gmo"; DestDir: "{app}\locale\sv\LC_MESSAGES"; DestName: "monotone.mo"; Flags: ignoreversion -Source: "\mingw\bin\libiconv-2.dll"; DestDir: "{app}" -Source: "\mingw\bin\libintl-8.dll"; DestDir: "{app}" -Source: "\mingw\bin\zlib1.dll"; DestDir: "{app}" +Source: "{#MINGWDIR}\bin\libiconv-2.dll"; DestDir: "{app}" +Source: "{#MINGWDIR}\local\bin\libidn-11.dll"; DestDir: "{app}" +Source: "{#MINGWDIR}\bin\libintl-8.dll"; DestDir: "{app}" +Source: "{#MINGWDIR}\local\bin\libpcre-0.dll"; DestDir: "{app}" +Source: "{#MINGWDIR}\local\bin\libpcrecpp-0.dll"; DestDir: "{app}" +Source: "{#MINGWDIR}\local\bin\libpcreposix-0.dll"; DestDir: "{app}" +Source: "{#MINGWDIR}\bin\zlib1.dll"; DestDir: "{app}" [Tasks] Name: modifypath; Description: "Add monotone to your path"; GroupDescription: "Get up and running"; Flags: unchecked