From aa0bfe811a90e7365b0f4198b563c5a3415bbaa9 Mon Sep 17 00:00:00 2001 From: martin Date: Wed, 1 Aug 2012 12:06:37 +0000 Subject: [PATCH] Win Installer: update readme / allow builddir from env git-svn-id: trunk@38104 - --- tools/install/win/create_installer.bat | 2 +- tools/install/win/readme.txt | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/install/win/create_installer.bat b/tools/install/win/create_installer.bat index f4c0c001f9..07ed4b0237 100644 --- a/tools/install/win/create_installer.bat +++ b/tools/install/win/create_installer.bat @@ -10,7 +10,7 @@ if [%ISCC%]==[] SET ISCC="C:\Program Files\Inno Setup 5\iscc.exe" :: Path to build directory. :: In this directory an image of the installation will be built. -SET BUILDDIR=c:\temp\lazbuild +if [%BUILDDIR%]==[] SET BUILDDIR=c:\temp\lazbuild :: Path to the svn executable if [%SVN%]==[] SET SVN="c:\program files\subversion\bin\svn.exe" diff --git a/tools/install/win/readme.txt b/tools/install/win/readme.txt index 07abe9503d..45c82f50e7 100644 --- a/tools/install/win/readme.txt +++ b/tools/install/win/readme.txt @@ -10,7 +10,7 @@ A.1 Inno Setup I used Inno Setup, a free installer for Windows programs. You can download it from http://www.jrsoftware.org/, and you need the QuickStart Pack and during installation choose Inno Setup Preprocessor too. A.2 Subversion -The build script assumes you have the Subversion installed. You can download it from http://subversion.tigris.org/, you can use the package with setup in name. +The build script assumes you have the Subversion client installed. You can download it from http://subversion.tigris.org/, you can use the package with setup in name. A.3 FPC sources The build script assumes you have a svn version of the fpcbuild sources. For information about getting the fpc sources from svn see: http://www.freepascal.org/ @@ -22,7 +22,7 @@ A.5 Lazarus binaries Some binaries from a lazarus/binaries svn tree. These binaries (like gdb and the qt interface dll) are distributed with Lazarus, but are not built from source. A.6. The latest release of the fpc compiler -Currently the latest release is fpc 2.2.0. You need just the ppcXXX.exe (ppc386.exe for win32 and ppcx64.exe for win64) to bootstrap compilation of the current fpc version. +Currently the latest release is fpc 2.6.0. You need just the ppcXXX.exe (ppc386.exe for win32 and ppcx64.exe for win64) to bootstrap compilation of the current fpc version. B Adjust create_installer.bat to your configuration @@ -38,9 +38,9 @@ Run the script: create_installer.bat FPCSVNDIR LAZSVNDIR LAZSVNBINDIR RELEASE_PPC where: -FPCSVNDIR: Path to the fpc sources checked out of svn -LAZSVNDIR: Path to the lazarus sources checked out of svn -LAZSVNBINDIR: Path to the svn lazarus binaries -RELEASE_PPC: Path to fpc 2.0.2 compiler +FPCSVNDIR: Path to the fpc sources checked out of svn (see A.3) +LAZSVNDIR: Path to the lazarus sources checked out of svn (see A.4) +LAZSVNBINDIR: Path to the svn lazarus binaries (see A.5) +RELEASE_PPC: Path to the FPC compiler required to start the build of fpc it FPCSVNDIR (see A.6) Just do it. Wait about 40 minutes (on 2.6 GHz P-IV). A log file named installer.log will be written to the current directory and setup file will be in the Output subdirectory of the current directory.