diff options
author | lloyd <[email protected]> | 2012-07-11 20:12:04 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2012-07-11 20:12:04 +0000 |
commit | 71c8f3803819464db90226c22e77f5a13ef2c38d (patch) | |
tree | fce560832a9e9734ea7c086304be2c0f01b297f1 /src | |
parent | b69b268c9b3160f165400437fc6e12791ca7f2c6 (diff) |
Update the InnoSetup script:
- Have configure.py create a new var %{innosetup_arch} which means
one doesn't have to remmeber to uncomment the ArchitecturesAllowed
and ArchitecturesInstallIn64BitMode for 64-bit installs. Also it
would theoretically work out of the box for IA-64 installs though
this is completely untested.
- InnoSetup 5.5 drops support for Windows 95/98/ME. While I'm in
there, move MinVersion to 5.1 (XP) since 2000 is (as with 9x)
totally an unknown quantity (not to mention EOLed).
- No PDF manual anymore, don't try to install it
- The files under doc are .rst rather than .txt now
- Include %{arch} in OutputBaseFilename so I don't have to rename
the output afterwards.
and outline the process for creating the installer in release_process.rst
Diffstat (limited to 'src')
-rw-r--r-- | src/build-data/innosetup.in | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/build-data/innosetup.in b/src/build-data/innosetup.in index ed618e8fb..a0928ca40 100644 --- a/src/build-data/innosetup.in +++ b/src/build-data/innosetup.in @@ -8,15 +8,14 @@ AppPublisher=Jack Lloyd AppPublisherURL=http://botan.randombit.net/ AppVersion=%{version} -VersionInfoCopyright=Copyright (C) 1999-2010 Jack Lloyd and others +VersionInfoCopyright=Copyright (C) 1999-2012 Jack Lloyd and others VersionInfoVersion=%{version_major}.%{version_minor}.%{version_patch}.0 -; Require at least Windows 98 or 2000 -MinVersion=4.1,5.0 +; Require at least Windows XP +MinVersion=5.1 -; Uncomment for 64 bit builds -;ArchitecturesAllowed = x64 -;ArchitecturesInstallIn64BitMode = x64 +ArchitecturesAllowed=%{innosetup_arch} +ArchitecturesInstallIn64BitMode=%{innosetup_arch} DefaultDirName={pf}\botan DefaultGroupName=botan @@ -24,7 +23,7 @@ DefaultGroupName=botan SolidCompression=yes OutputDir=. -OutputBaseFilename=botan-%{version} +OutputBaseFilename=botan-%{version}-%{arch} [Types] Name: "user"; Description: "User" @@ -39,23 +38,20 @@ name: "docs"; Description: "Developer Documentation"; Types: devel [Files] ; DLL and license file is always included -Source: "..\doc\license.txt"; DestDir: "{app}"; Components: dll; AfterInstall: ConvertLineEndings +Source: "..\doc\license.rst"; DestDir: "{app}"; Components: dll; AfterInstall: ConvertLineEndings Source: "..\botan.dll"; DestDir: "{app}"; Components: dll Source: "..\botan.dll.manifest"; DestDir: "{app}"; Components: dll; Flags: skipifsourcedoesntexist Source: "include\botan\*"; DestDir: "{app}\include\botan"; Components: includes; AfterInstall: ConvertLineEndings Source: "..\readme.txt"; DestDir: "{app}\doc"; Components: docs; AfterInstall: ConvertLineEndings -Source: "..\doc\*.txt"; DestDir: "{app}\doc"; Excludes: "license.txt"; Components: docs; AfterInstall: ConvertLineEndings +Source: "..\doc\*.rst"; DestDir: "{app}\doc"; Excludes: "license.txt"; Components: docs; AfterInstall: ConvertLineEndings Source: "..\doc\examples\*.cpp"; DestDir: "{app}\doc\examples"; Components: docs; AfterInstall: ConvertLineEndings Source: "..\botan.exp"; DestDir: "{app}"; Components: implib Source: "..\botan.lib"; DestDir: "{app}"; Components: implib -Source: "..\doc\manual.pdf"; DestDir: "{app}\doc"; Components: docs; Flags: skipifsourcedoesntexist -Source: "..\doc\tutorial.pdf"; DestDir: "{app}\doc"; Components: docs; Flags: skipifsourcedoesntexist - [Code] const LF = #10; |