User: vins
Date: 05/12/28 16:58:59
Branch: xemacs/lisp release-21-4
xemacs/nt release-21-4
Modified: xemacs/nt ChangeLog XEmacs.iss
Log:
Check in code to find packages dynamically at run-time.
Latest improvements to Windows native setup kit.
Revision Changes Path
1.266.2.89 +9 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.266.2.88
retrieving revision 1.266.2.89
diff -u -p -r1.266.2.88 -r1.266.2.89
--- ChangeLog 2005/12/07 01:16:46 1.266.2.88
+++ ChangeLog 2005/12/28 15:58:53 1.266.2.89
@@ -1,3 +1,12 @@
+2005-12-26 Vin Shelton <acs(a)xemacs.org>
+
+ * find-paths.el:
+ * find-paths.el (paths-emacs-root-p): Add search for package root.
+ * find-paths.el (paths-find-emacs-root): Replaced with
+ paths-find-invocation-roots, which returns a list of roots.
+ * find-paths.el (paths-find-invocation-roots): New.
+ * find-paths.el (paths-find-emacs-roots): Call paths-find-invocation-roots.
+
2005-12-05 Ville Skyttä <scop(a)xemacs.org>
* minibuf.el (x-library-search-path): Add /usr(/local)/share/X11.
1.19.2.3 +15 -13 XEmacs/xemacs/lisp/find-paths.el
Index: find-paths.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/find-paths.el,v
retrieving revision 1.19.2.2
retrieving revision 1.19.2.3
diff -u -p -r1.19.2.2 -r1.19.2.3
--- find-paths.el 2002/08/20 11:34:41 1.19.2.2
+++ find-paths.el 2005/12/28 15:58:54 1.19.2.3
@@ -108,8 +108,13 @@ from the search."
;; in-place or windows-nt
(and
(paths-file-readable-directory-p (paths-construct-path (list directory
"lisp")))
- (paths-file-readable-directory-p (paths-construct-path (list directory
"etc"))))))
+ (paths-file-readable-directory-p (paths-construct-path (list directory
"etc"))))
+ ;; searching for a package directory on Windows
+ (and
+ (string-match "win32\\|cygwin" system-configuration)
+ (paths-file-readable-directory-p (paths-construct-path (list directory
"xemacs-packages"))))))
+
(defun paths-root-in-place-p (root)
"Check if ROOT is an in-place installation root for XEmacs."
(paths-file-readable-directory-p (paths-construct-path (list root "lisp"))))
@@ -123,9 +128,10 @@ from the search."
(paths-chase-symlink destination))
file-name)))
-(defun paths-find-emacs-root
- (invocation-directory invocation-name)
- "Find the run-time root of XEmacs."
+(defun paths-find-invocation-roots (invocation-directory invocation-name)
+ "Find the list of run-time roots of XEmacs.
+INVOCATION-DIRECTORY is a directory containing the XEmacs executable.
+INVOCATION-NAME is the name of the executable itself."
(let* ((executable-file-name (paths-chase-symlink
(concat invocation-directory
invocation-name)))
@@ -134,10 +140,9 @@ from the search."
(paths-construct-path '("..") executable-directory)))
(maybe-root-2 (file-name-as-directory
(paths-construct-path '(".." "..") executable-directory))))
- (or (and (paths-emacs-root-p maybe-root-1)
- maybe-root-1)
- (and (paths-emacs-root-p maybe-root-2)
- maybe-root-2))))
+
+ (paths-filter #'paths-emacs-root-p
+ (list maybe-root-1 maybe-root-2))))
(defun paths-construct-path (components &optional expand-directory)
"Convert list of path components COMPONENTS into a path.
@@ -301,11 +306,8 @@ Otherwise, they are left alone."
(defun paths-find-emacs-roots (invocation-directory
invocation-name)
"Find all plausible installation roots for XEmacs."
- (let* ((potential-invocation-root
- (paths-find-emacs-root invocation-directory invocation-name))
- (invocation-roots
- (and potential-invocation-root
- (list potential-invocation-root)))
+ (let* ((invocation-roots
+ (paths-find-invocation-roots invocation-directory invocation-name))
(potential-installation-roots
(paths-uniq-append
(and configure-exec-prefix-directory
1.89.2.40 +6 -0 XEmacs/xemacs/nt/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/ChangeLog,v
retrieving revision 1.89.2.39
retrieving revision 1.89.2.40
diff -u -p -r1.89.2.39 -r1.89.2.40
--- ChangeLog 2005/12/18 01:45:13 1.89.2.39
+++ ChangeLog 2005/12/28 15:58:58 1.89.2.40
@@ -1,3 +1,9 @@
+2005-12-27 Vin Shelton <acs(a)xemacs.org>
+
+ * XEmacs.iss: 21.4.19-pre1 version
+ Remove registry key for EMACSPACKAGEPATH.
+ Install by default to c:\Program Files\XEmacs.
+
2005-12-17 Vin Shelton <acs(a)xemacs.org>
* XEmacs.iss: Move packages out of version-specific location.
1.1.2.4 +10 -9 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.3
retrieving revision 1.1.2.4
diff -u -p -r1.1.2.3 -r1.1.2.4
--- XEmacs.iss 2005/12/18 01:45:14 1.1.2.3
+++ XEmacs.iss 2005/12/28 15:58:59 1.1.2.4
@@ -2,6 +2,7 @@
; This script runs with Inno Setup version 5.1.6, see
http://www.jrsoftware.org/ for more
info.
;
; Version History
+; 2005-12-26 Vin Shelton <acs(a)xemacs.org> 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> Move packages out of the
version-specific tree
; 2005-12-13 Vin Shelton <acs(a)xemacs.org> Created.
@@ -13,11 +14,11 @@ AppPublisher=The XEmacs Development Team
AppPublisherURL=http://www.xemacs.org
AppSupportURL=http://www.xemacs.org
AppUpdatesURL=http://www.xemacs.org
-DefaultDirName={sd}\XEmacs
+DefaultDirName={pf}\XEmacs
DefaultGroupName=XEmacs
AllowNoIcons=yes
OutputDir=.
-OutputBaseFilename=XEmacs Setup 21.4.18-1
+OutputBaseFilename=XEmacs Setup 21.4.19-pre1
Compression=lzma
SolidCompression=yes
@@ -29,10 +30,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:\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
+; 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
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[INI]
@@ -47,7 +47,8 @@ Name: "{userappdata}\Microsoft\Internet
[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
+; 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
[Run]
Filename: "{app}\XEmacs-{code:XEmacsVersion}\i586-pc-win32\xemacs.exe";
Description: "{cm:LaunchProgram,XEmacs}"; Flags: nowait postinstall
skipifsilent
@@ -69,7 +70,7 @@ 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\\XEmacs-21.4.18\\etc")
+ // (setq package-get-package-index-file-location "C:\\Program
Files\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 CurStep = ssPostInstall then begin
@@ -78,7 +79,7 @@ begin
EtcDir := WizardDirValue + '\XEmacs-' + XEmacsVersion('') +
'\etc';
StringChange(EtcDir, '\', '\\');
- SiteStart := WizardDirValue + '\Packages\site-packages\lisp';
+ 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);