User: vins Date: 06/01/28 23:55:47 Branch: xemacs/nt release-21-4 Modified: xemacs/nt ChangeLog XEmacs.iss Log: Update InnoSetup script for 21.4.19. Revision Changes Path 1.89.2.41 +5 -0 XEmacs/xemacs/nt/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/ChangeLog,v retrieving revision 1.89.2.40 retrieving revision 1.89.2.41 diff -u -p -r1.89.2.40 -r1.89.2.41 --- ChangeLog 2005/12/28 15:58:58 1.89.2.40 +++ ChangeLog 2006/01/28 22:55:46 1.89.2.41 ＠＠ -1,3 +1,8 ＠＠ +2006-01-28 Vin Shelton <acs(a)xemacs.org&gt; + + * XEmacs.iss: 21.4.19 version. No registry fiddling, please. + Package root is now found automatically. + 2005-12-27 Vin Shelton <acs(a)xemacs.org&gt; * XEmacs.iss: 21.4.19-pre1 version 1.1.2.5 +24 -10 XEmacs/xemacs/nt/Attic/XEmacs.iss Index: XEmacs.iss =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/Attic/XEmacs.iss,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -p -r1.1.2.4 -r1.1.2.5 --- XEmacs.iss 2005/12/28 15:58:59 1.1.2.4 +++ XEmacs.iss 2006/01/28 22:55:47 1.1.2.5 ＠＠ -2,6 +2,9 ＠＠ ; This script runs with Inno Setup version 5.1.6, see http://www.jrsoftware.org/ for more info. ; ; Version History +; 2006-01-26 Vin Shelton <acs(a)xemacs.org&gt; Don't append XEmacs binary directory to system path. +; 2006-01-21 Vin Shelton <acs(a)xemacs.org&gt; Append XEmacs binary directory to system path; this is not currently deleted on uninstall. +; Get built kit from C:\XEmacs-built. ; 2005-12-26 Vin Shelton <acs(a)xemacs.org&gt; Packages are now installed directly into {app}\xemacs-packages, etc. As of 21.4.19, the package root is found automatically, so EMACSPACKAGEPATH is no longer necessary. ; 2005-12-17 Vin Shelton <acs(a)xemacs.org&gt; Move packages out of the version-specific tree ; 2005-12-13 Vin Shelton <acs(a)xemacs.org&gt; Created. ＠＠ -18,9 +21,10 ＠＠ DefaultDirName={pf}\XEmacs DefaultGroupName=XEmacs AllowNoIcons=yes OutputDir=. -OutputBaseFilename=XEmacs Setup 21.4.19-pre1 +OutputBaseFilename=XEmacs Setup 21.4.19 Compression=lzma SolidCompression=yes +InfoAfterFile=README [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" ＠＠ -30,9 +34,9 ＠＠ Name: "desktopicon"; Description: "{cm:C Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -; Before you run this script, XEmacs-21.4 must be installed in c:\Program Files\XEmacs\XEmacs-21.4.xx -; and any packages you want to include must be installed in c:\Program Files\XEmacs\{xemacs,mule,site}-packages -Source: "C:\Program Files\XEmacs\*"; Excludes: "C:\Program Files\XEmacs\XEmacs-21.5*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +; Before you run this script, XEmacs-21.4 must be installed in C:\XEmacs-built\XEmacs-21.4.xx +; and any packages you want to include must be installed in C:\XEmacs-built\{xemacs,mule,site}-packages +Source: "C:\XEmacs-built\*"; Excludes: "C:\XEmacs-built\XEmacs-21.5*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [INI] ＠＠ -49,7 +53,10 ＠＠ Name: "{userappdata}\Microsoft\Internet ; Set a registry key to point to the packages so they can be shared between multiple installed versions of XEmacs ; This is no longer necessary as of version 21.4.19. ;Root: HKLM; Subkey: "Software\XEmacs\XEmacs"; ValueType: string; ValueName: "EMACSPACKAGEPATH"; ValueData: "{app}\Packages"; Flags: uninsdeletekey +; Don't fiddle with the system path +;Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}\XEmacs-{code:XEmacsVersion}\i586-pc-win32" + [Run] Filename: "{app}\XEmacs-{code:XEmacsVersion}\i586-pc-win32\xemacs.exe"; Description: "{cm:LaunchProgram,XEmacs}"; Flags: nowait postinstall skipifsilent ＠＠ -59,32 +66,39 ＠＠ Type: files; Name: "{app}\xemacs.url" [Code] function XEmacsVersion(Param: String): String; begin - Result := '21.4.18'; + Result := '21.4.19'; end; procedure CurStepChanged(CurStep: TSetupStep); var + BinDir: String; EtcDir: String; + InstallBase: String; SiteStart: String; begin - // Create a site-start.el file to allow easy package downloading in the future. + // Create a site-start.el file to allow easy package downloading in the future and to add the binary directory to exec-path. // E.g, here's what we're going to add to lisp\site-start.el: - // (setq package-get-package-index-file-location "C:\\Program Files\XEmacs\\XEmacs-21.4.18\\etc") + // (setq package-get-package-index-file-location "C:\\Program Files\XEmacs\\XEmacs-21.4.98\\etc") // ; Uncomment the next line to select the primary XEmacs package download site // ;(setq package-get-remote '("ftp.xemacs.org" "pub/xemacs/packages")) if CurStep = ssPostInstall then begin - // Convert etc directory name to lisp format by doubling each backslash - EtcDir := WizardDirValue + '\XEmacs-' + XEmacsVersion('') + '\etc'; - StringChange(EtcDir, '\', '\\'); + // Convert directory names to lisp format by doubling each backslash + InstallBase := WizardDirValue + '\XEmacs-' + XEmacsVersion(''); + StringChange(InstallBase, '\', '\\'); + EtcDir := InstallBase + '\\etc'; + //BinDir := InstallBase + '\\i586-pc-win32\\'; SiteStart := WizardDirValue + '\site-packages\lisp'; CreateDir(SiteStart); SiteStart := SiteStart + '\site-start.el'; + SaveStringToFile(SiteStart, #13#10 + '(setq package-get-package-index-file-location "' + EtcDir + '")' + #13#10, True); SaveStringToFile(SiteStart, '; Uncomment the next line to select the primary XEmacs package download site' + #13#10, True); SaveStringToFile(SiteStart, ';(setq package-get-remote ' + Chr(39) + '("ftp.xemacs.org" "pub/xemacs/packages"))' + #13#10, True); + + //SaveStringToFile(SiteStart, '(pushnew "' + BinDir + '" exec-path)' + #13#10, True); end; end;