User: vins Date: 05/12/18 02:28:50 Branch: xemacs/nt release-21-4 Modified: xemacs/nt ChangeLog XEmacs.iss Log: Updated install script for Windows native kit. Revision Changes Path 1.89.2.38 +4 -0 XEmacs/xemacs/nt/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/ChangeLog,v retrieving revision 1.89.2.37 retrieving revision 1.89.2.38 diff -u -p -r1.89.2.37 -r1.89.2.38 --- ChangeLog 2005/12/16 01:12:14 1.89.2.37 +++ ChangeLog 2005/12/18 01:28:46 1.89.2.38 ＠＠ -1,3 +1,7 ＠＠ +2005-12-17 Vin Shelton <acs(a)xemacs.org&gt; + + * XEmacs.iss: Move packages out of version-specific location. + 2005-12-15 Vin Shelton <acs(a)xemacs.org&gt; * XEmacs.iss: Created for generating winoze setup kits. 1.1.2.2 +27 -22 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.1 retrieving revision 1.1.2.2 diff -u -p -r1.1.2.1 -r1.1.2.2 --- XEmacs.iss 2005/12/16 01:12:15 1.1.2.1 +++ XEmacs.iss 2005/12/18 01:28:48 1.1.2.2 ＠＠ -1,5 +1,8 ＠＠ ; This script generates an installation kit for a Windows-native XEmacs, version 21.4. ; This script runs with Inno Setup version 5.1.6, see http://www.jrsoftware.org/ for more info. +; +; Version History +; 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. [Setup] ＠＠ -10,11 +13,11 ＠＠ AppPublisher=The XEmacs Development Team AppPublisherURL=http://www.xemacs.org AppSupportURL=http://www.xemacs.org AppUpdatesURL=http://www.xemacs.org -DefaultDirName={sd}\XEmacs-{code:XEmacsVersion} +DefaultDirName={sd}\XEmacs DefaultGroupName=XEmacs AllowNoIcons=yes OutputDir=. -OutputBaseFilename=XEmacs Setup 21.4.18 +OutputBaseFilename=XEmacs Setup 21.4.18-1 Compression=lzma SolidCompression=yes ＠＠ -26,60 +29,62 ＠＠ Name: "desktopicon"; Description: "{cm:C Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "C:\XEmacs-21.4.18\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +; Before you run this script, XEmacs-21.4 must be installed in c:\XEmacs\XEmacs-21.4.xx +; and any packages you want to include must be installed in c:\XEmacs\Packages +Source: "C:\XEmacs\XEmacs-21.4.18\*"; DestDir: "{app}\XEmacs-{code:XEmacsVersion}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "C:\XEmacs\Packages\*"; DestDir: "{app}\Packages"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [INI] Filename: "{app}\xemacs.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.xemacs.org" [Icons] -Name: "{group}\XEmacs"; Filename: "{app}\i586-pc-win32\xemacs.exe" +Name: "{group}\XEmacs"; Filename: "{app}\XEmacs-{code:XEmacsVersion}\i586-pc-win32\xemacs.exe" Name: "{group}\{cm:ProgramOnTheWeb,XEmacs}"; Filename: "{app}\xemacs.url" Name: "{group}\{cm:UninstallProgram,XEmacs}"; Filename: "{uninstallexe}" -Name: "{userdesktop}\XEmacs"; Filename: "{app}\i586-pc-win32\xemacs.exe"; Tasks: desktopicon -Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\XEmacs"; Filename: "{app}\i586-pc-win32\xemacs.exe"; Tasks: quicklaunchicon +Name: "{userdesktop}\XEmacs"; Filename: "{app}\XEmacs-{code:XEmacsVersion}\i586-pc-win32\xemacs.exe"; Tasks: desktopicon +Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\XEmacs"; Filename: "{app}\XEmacs-{code:XEmacsVersion}\i586-pc-win32\xemacs.exe"; Tasks: quicklaunchicon +[Registry] +; Set a registry key to point to the packages so they can be shared between multiple installed versions of XEmacs +Root: HKLM; Subkey: "Software\XEmacs\XEmacs"; ValueType: string; ValueName: "EMACSPACKAGEPATH"; ValueData: "{app}\Packages"; Flags: uninsdeletekey + [Run] -Filename: "{app}\i586-pc-win32\xemacs.exe"; Description: "{cm:LaunchProgram,XEmacs}"; Flags: nowait postinstall skipifsilent +Filename: "{app}\XEmacs-{code:XEmacsVersion}\i586-pc-win32\xemacs.exe"; Description: "{cm:LaunchProgram,XEmacs}"; Flags: nowait postinstall skipifsilent [UninstallDelete] Type: files; Name: "{app}\xemacs.url" [Code] -var - FinishedInstall: Boolean; - -procedure CurStepChanged(CurStep: TSetupStep); +function XEmacsVersion(Param: String): String; begin - if CurStep = ssPostInstall then - FinishedInstall := True; + Result := '21.4.18'; end; -procedure DeinitializeSetup(); +procedure CurStepChanged(CurStep: TSetupStep); var EtcDir: String; SiteStart: String; begin + // Create a site-start.el file to allow easy package downloading in the future. // E.g, here's what we're going to add to lisp\site-start.el: - // (setq package-get-package-index-file-location "C:\\XEmacs-21.4.18\\etc") + // (setq package-get-package-index-file-location "C:\\XEmacs\\XEmacs-21.4.18\\etc") // ; Uncomment the next line to select the primary XEmacs package download site // ;(setq package-get-remote '("ftp.xemacs.org" "pub/xemacs/packages")) - if FinishedInstall = True then begin + if CurStep = ssPostInstall then begin // Convert etc directory name to lisp format by doubling each backslash - EtcDir := WizardDirValue + '\etc'; + EtcDir := WizardDirValue + '\XEmacs-' + XEmacsVersion('') + '\etc'; StringChange(EtcDir, '\', '\\'); - SiteStart := WizardDirValue + '\lisp\site-start.el'; + SiteStart := WizardDirValue + '\Packages\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); end; end; -function XEmacsVersion(Param: String): String; -begin - Result := '21.4.18'; -end;