Index: gnucash.iss.in =================================================================== --- gnucash.iss.in (revision 15277) +++ gnucash.iss.in (working copy) @@ -5,22 +5,45 @@ ; Inno Setup Compiler: See http://www.jrsoftware.org/isdl.php ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +[ISPP] +; Using the name here directly because we want it capitalized +; implementing all config-preprocessor calls +#define GC "GnuCash" +#define GCVER "GnuCash @VERSION@" +#define GCPUB "GnuCash Development Team" +#define GCURL "http://www.gnucash.org" +#define GCDIR "{pf}\@PACKAGE@" +#define GCDIST "@prefix@/../dist" +#define GCDOC "@prefix@/../dist\share\@PACKAGE@\doc" +#define GCOUT "@PACKAGE@-@VERSION@-setup" +#define GCUNINST "{app}\uninstall\@PACKAGE@" +#define GCBIN "{app}\bin" +#define GCBAT "{app}\bin\gnucash.bat" +#define GCCOMMENT "GnuCash Free Finance Manager" +;#define GCICON "@prefix@/../dist\share\@PACKAGE@\pixmaps\gnucash-icon.ico" +#define GCICON "{pf}\@PACKAGE@\share\@PACKAGE@\pixmaps\gnucash-icon.ico" +#define GCSHR "@prefix@/../dist\share\@PACKAGE@" +#define GCSHROUT "{pf}\@PACKAGE@\share\@PACKAGE@" +#define GCPOSTRUN "{app}\bin\guile.bat" +#define GCDOCOUT "{app}\doc\@PACKAGE@" +#define GCPATH "Software\GnuCash\Paths" +; end-Preprocessor defines + [Setup] -; Using the name here directly because we want it capitalized -AppName=GnuCash -AppVerName=GnuCash @VERSION@ -AppPublisher=GnuCash Development Team -AppPublisherURL=http://www.gnucash.org -AppSupportURL=http://www.gnucash.org -AppUpdatesURL=http://www.gnucash.org -DefaultDirName={pf}\@PACKAGE@ -DefaultGroupName=GnuCash -LicenseFile=@prefix@\..\dist\share\@PACKAGE@\doc\COPYING +AppName={#GC} +AppVerName={#GCVER} +AppPublisher={#GCPUB} +AppPublisherURL={#GCURL} +AppSupportURL={#GCURL} +AppUpdatesURL={#GCURL} +DefaultDirName={#GCDIR} +DefaultGroupName={#GC} +LicenseFile={#GCDOC}\COPYING Compression=lzma OutputDir=. -OutputBaseFilename=@PACKAGE@-@VERSION@-setup -UninstallFilesDir={app}\uninstall\@PACKAGE@ -InfoAfterFile=@prefix@\..\dist\share\@PACKAGE@\doc\README +OutputBaseFilename={#GCOUT} +UninstallFilesDir={#GCUNINST} +InfoAfterFile={#GCDOC}\README [Types] Name: "full"; Description: "{cm:FullInstall}" @@ -36,13 +59,13 @@ Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}" [Icons] -Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash.bat"; WorkingDir: "{app}\bin"; Comment: "GnuCash Free Finance Manager"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon -Name: "{group}\Uninstall GnuCash"; Filename: "{uninstallexe}"; Tasks: menuicon -Name: "{userdesktop}\GnuCash"; Filename: "{app}\bin\gnucash.bat"; WorkingDir: "{app}\bin"; Comment: "GnuCash Free Finance Manager"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon +Name: "{group}\{#GC}"; Filename: "{#GCBAT}"; WorkingDir: "{#GCBIN}"; Comment: "{#GCCOMMENT}"; IconFilename: "{#GCICON}"; Tasks: menuicon +Name: "{group}\Uninstall {#GC}"; Filename: "{uninstallexe}"; Tasks: menuicon +Name: "{userdesktop}\{#GC}"; Filename: "{#GCBAT}"; WorkingDir: "{#GCBIN}"; Comment: "{#GCCOMMENT}"; IconFilename: "{#GCICON}"; Tasks: desktopicon [Run] -Filename: "{app}\bin\gnucash.bat"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; Flags: postinstall skipifsilent -Filename: "{app}\bin\guile.bat"; Parameters: "-c ""(use-modules (ice-9 slib)) (require 'printf)"""; Flags: runhidden +Filename: "{#GCBAT}"; Description: "{cm:RunPrg}"; WorkingDir: "{#GCBIN}"; Flags: postinstall skipifsilent +Filename: "{#GCPOSTRUN}"; Parameters: "-c ""(use-modules (ice-9 slib)) (require 'printf)"""; Flags: runhidden ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Here we configure the included files and the place of their @@ -50,44 +73,44 @@ ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; [Files] ; The main executables and DLLs -Source: "@prefix@\..\dist\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs; Components: main; AfterInstall: MyAfterInstallConfig() +Source: "{#GCDIST}\bin\*"; DestDir: "{#GCBIN}"; Flags: recursesubdirs; Components: main; AfterInstall: MyAfterInstallConfig() ; Note: The above AfterInstall function will create the ; gnucash.bat file on-the-fly by the Pascal script below. -Source: "@prefix@\..\dist\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main -Source: "@prefix@\..\dist\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main -Source: "@prefix@\..\dist\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main -Source: "@prefix@\..\dist\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main +Source: "{#GCDIST}\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main +Source: "{#GCDIST}\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main +Source: "{#GCDIST}\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main +Source: "{#GCDIST}\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main ;; The translations (no idea why mingw installs them in prefix/lib/locale) -;Source: "@prefix@\..\dist\lib\locale\*"; DestDir: "{app}\lib\locale"; Flags: recursesubdirs; Components: translations +;Source: "{#GCDIST}\lib\locale\*"; DestDir: "{app}\lib\locale"; Flags: recursesubdirs; Components: translations ; ;; The account templates -;Source: "@prefix@\..\dist\share\gnucash\accounts\*"; DestDir: "{app}\share\gnucash\accounts"; Flags: recursesubdirs; Components: templates +;Source: "{#GCSHR}\accounts\*"; DestDir: "{#GCSHROUT}\accounts"; Flags: recursesubdirs; Components: templates ; And all the documentation -Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main -Source: "@prefix@\..\dist\share\@PACKAGE@\doc\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main -Source: "@prefix@\..\dist\share\@PACKAGE@\doc\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main -Source: "@prefix@\..\dist\share\@PACKAGE@\doc\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main +Source: "{#GCDOC}\README"; DestDir: "{#GCDOCOUT}"; Components: main +Source: "{#GCDOC}\COPYING"; DestDir: "{#GCDOCOUT}"; Flags: ignoreversion; Components: main +Source: "{#GCDOC}\AUTHORS"; DestDir: "{#GCDOCOUT}"; Components: main +Source: "{#GCDOC}\ChangeLog"; DestDir: "{#GCDOCOUT}"; Components: main ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Define the registry keys Setup should create (HKCU = HKEY_CURRENT_USER) ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; [Registry] -Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "prefix"; ValueData: "{app}" -Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "libdir"; ValueData: "{app}\lib" -Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "pkglibdir"; ValueData: "{app}\lib\@PACKAGE@" -Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc" -Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale" +Root: HKCU; Subkey: "{#GCPATH}"; ValueType: string; ValueName: "prefix"; ValueData: "{app}" +Root: HKCU; Subkey: "{#GCPATH}"; ValueType: string; ValueName: "libdir"; ValueData: "{app}\lib" +Root: HKCU; Subkey: "{#GCPATH}"; ValueType: string; ValueName: "pkglibdir"; ValueData: "{app}\lib\@PACKAGE@" +Root: HKCU; Subkey: "{#GCPATH}"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc" +Root: HKCU; Subkey: "{#GCPATH}"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale" ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Delete the created config script on uninstall ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; [UninstallDelete] -Type: files; Name: "{app}\bin\gnucash.bat" -Type: files; Name: "{app}\bin\guile.bat" +Type: files; Name: "{#GCBAT}" +Type: files; Name: "{#GCPOSTRUN}" Type: files; Name: "{app}\share\guile\1.6\slibcat" Type: filesandordirs; Name: "{app}\etc\gconf" Type: dirifempty; Name: "{app}\etc" Index: dist.sh =================================================================== --- dist.sh (revision 15277) +++ dist.sh (working copy) @@ -159,6 +159,7 @@ mv $file.new $file done + setup Finish... echo "You can now run the Inno Setup Compiler for creating the setup.exe:" echo ${_INNO_UDIR}/iscc ${_GNUCASH_UDIR}/gnucash.iss }