Mercurial > hg > xemacs-beta
view netinstall/desktop.cc @ 4539:061e030e3270
Fix some bugs in load-history construction, built-in symbol file names.
lib-src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* make-docfile.c (main): Allow more than one -d argument, followed
by a directory to change to.
(put_filename): Don't strip directory information; with previous
change, allows retrieval of Lisp function and variable origin
files from #'built-in-symbol-file relative to lisp-directory.
(scan_lisp_file): Don't add an extraneous newline after the file
name, put_filename has added the newline already.
lisp/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* loadup.el (load-history):
Add the contents of current-load-list to load-history before
clearing it. Move the variable declarations earlier in the file to
a format understood by make-docfile.c.
* custom.el (custom-declare-variable): Add the variable's symbol
to the current file's load history entry correctly, don't use a
cons. Eliminate a comment that we don't need to worry about, we
don't need to check the `initialized' C variable in Lisp.
* bytecomp.el (byte-compile-output-file-form):
Merge Andreas Schwab's pre-GPLv3 GNU change of 19970831 here;
treat #'custom-declare-variable correctly, generating the
docstrings in a format understood by make-docfile.c.
* loadhist.el (symbol-file): Correct behaviour for checking
autoloaded macros and functions when supplied with a TYPE
argument. Accept fully-qualified paths from
#'built-in-symbol-file; if a path is not fully-qualified, return
it relative to lisp-directory if the filename corresponds to a
Lisp file, and relative to (concat source-directory "/src/")
otherwise.
* make-docfile.el (preloaded-file-list):
Rationalise some let bindings a little. Use the "-d" argument to
make-docfile.c to supply Lisp paths relative to lisp-directory,
not absolutely. Add in loadup.el explicitly to the list of files
to be processed by make-docfile.c--it doesn't make sense to add it
to preloaded-file-list, since that is used for purposes of
byte-compilation too.
src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* doc.c (Fbuilt_in_symbol_file):
Return a subr's filename immediately if we've found it. Check for
compiled function and compiled macro docstrings in DOC too, and
return them if they exist.
The branch of the if statement focused on functions may have
executed, but we may still want to check variable bindings; an
else clause isn't appropriate.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 27 Dec 2008 14:05:50 +0000 |
parents | 6504113e7c2d |
children |
line wrap: on
line source
/* * Copyright (c) 2000, Red Hat, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * A copy of the GNU General Public License can be found at * http://www.gnu.org/ * * Written by DJ Delorie <dj@cygnus.com> * */ /* The purpose of this file is to manage all the desktop setup, such as start menu, batch files, desktop icons, and shortcuts. Note that unlike other do_* functions, this one is called directly from install.cc */ #include "win32.h" #include <shlobj.h> #include <io.h> #include <stdio.h> #include <stdlib.h> #ifndef WIN32_NATIVE #include <unistd.h> #endif #include "resource.h" #include "ini.h" #include "msg.h" #include "state.h" #include "concat.h" #include "mkdir.h" #include "dialog.h" #include "version.h" #include "reginfo.h" #include "regedit.h" #include "port.h" #include "log.h" #include "desktop.h" extern "C" { void make_link_2 (char *exepath, char *args, char *icon, char *lname); }; static OSVERSIONINFO verinfo; /* Lines starting with '@' are conditionals - include 'N' for NT, '5' for Win95, '8' for Win98, '*' for all, like this: echo foo @N8 echo NT or 98 @* */ #define COMMAND9XARGS "/E:4096 /c" #define COMMAND9XEXE "\\command.com" static char *iconname; static char *batname; static char *uninstname; static void make_link (char *linkpath, char *title, char *target, char* args) { #if 0 char argbuf[_MAX_PATH]; #endif char *fname = concat (linkpath, "/", title, ".lnk", 0); if (_access (fname, 0) == 0) return; /* already exists */ msg ("make_link %s, %s, %s, %s\n", fname, title, target, args); mkdir_p (0, fname); char *exepath; #if 0 /* If we are running Win9x, build a command line. */ if (verinfo.dwPlatformId == VER_PLATFORM_WIN32_NT) { #endif exepath = target; #if 0 } else { char windir[MAX_PATH]; GetWindowsDirectory (windir, sizeof (windir)); exepath = concat (windir, COMMAND9XEXE, 0); sprintf (argbuf, "%s %s", COMMAND9XARGS, target); args = argbuf; } #endif msg ("make_link_2 (%s, %s, %s, %s)", exepath, args, iconname, fname); make_link_2 (backslash (exepath), args, iconname, fname); } static char* find_xemacs_version () { char* v = strdup (xemacs_package->info[xemacs_package->trust].version); char* dash = strrchr (v, '-'); if (dash) *dash = 0; return v; } static char* find_xemacs_exe_path () { if (xemacs_package->type == TY_CYGWIN) return backslash (concat (root_dir, "/bin/", XEMACS_CYGWIN_ARCH_NAME, 0)); else return backslash (concat (root_dir, "\\XEmacs-", find_xemacs_version (), "\\", XEMACS_NATIVE_ARCH_NAME, 0)); } char* find_xemacs_exe_name () { /* Hack to support older versions. */ if (strncmp (xemacs_package->info[xemacs_package->trust].version, "21.1", 4) == 0) return strdup ("runemacs.exe"); else if (xemacs_package->type == TY_CYGWIN) return backslash (concat ("xemacs-", find_xemacs_version (), ".exe", 0)); else return strdup ("xemacs.exe"); } static void remove_link (char *linkpath, char* title) { if (title) { char *fname = backslash (concat (linkpath, "/", title, ".lnk", 0)); msg ("remove_link %s, %s\n", fname, title); if (_access (fname, 0) != 0) return; /* doesn't exist */ _unlink (fname); } else { msg ("remove_link %s\n", linkpath); if (_access (linkpath, 0) != 0) return; /* doesn't exist */ _rmdir (linkpath); } } static void start_menu (char *title, char *target, int rem, char* args) { char path[_MAX_PATH]; LPITEMIDLIST id; int issystem = (root_scope == IDC_ROOT_SYSTEM) ? 1 : 0; SHGetSpecialFolderLocation (NULL, issystem ? CSIDL_COMMON_PROGRAMS : CSIDL_PROGRAMS, &id); SHGetPathFromIDList (id, path); // following lines added because it appears Win95 does not use common programs // unless it comes into play when multiple users for Win95 is enabled msg("Program directory for program link: %s",path); if ( strlen(path) == 0) { SHGetSpecialFolderLocation (NULL, CSIDL_PROGRAMS, &id); SHGetPathFromIDList (id, path); msg("Program directory for program link changed to: %s",path); } // end of Win95 addition strcat (path, "\\"); strcat (path, XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME); if (rem == 0) make_link (path, title, target, args); else remove_link (path, title); } static void desktop_icon (char *title, char *target, int rem) { char path[_MAX_PATH]; LPITEMIDLIST id; int issystem = (root_scope == IDC_ROOT_SYSTEM) ? 1 : 0; //SHGetSpecialFolderLocation (NULL, issystem ? CSIDL_DESKTOP : CSIDL_COMMON_DESKTOPDIRECTORY, &id); SHGetSpecialFolderLocation (NULL, issystem ? CSIDL_COMMON_DESKTOPDIRECTORY : CSIDL_DESKTOPDIRECTORY, &id); SHGetPathFromIDList (id, path); // following lines added because it appears Win95 does not use common programs // unless it comes into play when multiple users for Win95 is enabled msg("Desktop directory for desktop link: %s",path); if ( strlen(path) == 0) { SHGetSpecialFolderLocation (NULL, CSIDL_DESKTOPDIRECTORY, &id); SHGetPathFromIDList (id, path); msg("Desktop directory for deskop link changed to: %s",path); } // end of Win95 addition if (rem == 0) make_link (path, title, target, ""); else remove_link (path, title); } static void save_icon () { iconname = backslash (concat (root_dir, XEMACS_RESOURCE_DIR, "xemacs.ico", 0)); HRSRC rsrc = FindResource (NULL, "XEMACS.ICON", "FILE"); if (rsrc == NULL) { fatal ("FindResource failed"); } HGLOBAL res = LoadResource (NULL, rsrc); char *data = (char *) LockResource (res); int len = SizeofResource (NULL, rsrc); FILE *f = fopen (iconname, "wb"); if (f) { fwrite (data, 1, len, f); fclose (f); } } void remove_xemacs_setup() { if (xemacs_package == 0) return; start_menu ("XEmacs", 0, 1, 0); desktop_icon ("XEmacs", 0, 1); #define FROB(exe) remove_app_path (exe) FROB (find_xemacs_exe_name ()); FROB ("runemacs.exe"); FROB ("xemacs.exe"); #undef FROB } void remove_desktop_setup() { remove_xemacs_setup(); start_menu ("Uninstall XEmacs", 0, 1, 0); start_menu (0, 0, 1, 0); } static void do_desktop_setup() { save_icon (); if (root_menu && batname) { start_menu ("XEmacs", batname, 0, ""); start_menu ("Uninstall XEmacs", uninstname, 0, "-u"); } if (root_desktop && batname) { desktop_icon ("XEmacs", batname, 0); } // set regkeys for the application if (xemacs_package != 0) { int issystem = (root_scope == IDC_ROOT_SYSTEM ? 1 : 0); if (xemacs_package->type == TY_NATIVE || xemacs_package->type == TY_CYGWIN) { if (xemacs_package->type == TY_NATIVE) { #define FROB(exe) set_app_path ((exe), \ find_xemacs_exe_path (), \ issystem) FROB (find_xemacs_exe_name ()); FROB ("runemacs.exe"); FROB ("xemacs.exe"); #undef FROB } else if (xemacs_package->type == TY_CYGWIN) { int junk; char* root = find_cygwin_root (&junk); #define FROB(exe) set_app_path ((exe), \ concat (find_xemacs_exe_path (), ";", \ root, "\\bin;", \ root, "\\usr\\bin", 0), \ issystem) FROB (find_xemacs_exe_name ()); FROB ("runemacs.exe"); FROB ("xemacs.exe"); #undef FROB } set_install_path (find_xemacs_exe_path(), issystem); } // Register file types if (batname) { if (reg_java) { log (0, "Registering .java files"); setup_explorer ("java", "Java Source file", batname); setup_explorer ("jav", "Java Source file", batname); } if (reg_cpp) { log (0, "Registering .cpp files"); setup_explorer ("cpp", "C++ Source file", batname); setup_explorer ("cc", "C++ Source file", batname); setup_explorer ("cxx", "C++ Source file", batname); setup_explorer ("hh", "C++ Header file", batname); setup_explorer ("hpp", "C++ Header file", batname); setup_explorer ("hxx", "C++ Header file", batname); } if (reg_c) { log (0, "Registering .c files"); setup_explorer ("c", "C Source file", batname); setup_explorer ("h", "C Header file", batname); } if (reg_elisp) { log (0, "Registering .el files"); setup_explorer ("el", "E-Lisp Source file", batname); } if (reg_txt) { log (0, "Registering .txt files"); setup_explorer ("txt", "Text file", batname); } if (reg_idl) { log (0, "Registering .idl files"); setup_explorer ("idl", "OMG IDL file", batname); } } } } static int da[] = { IDC_ROOT_DESKTOP, 0 }; static int ma[] = { IDC_ROOT_MENU, 0 }; static int ct[] = { IDC_C_TYPE, 0 }; static int javat[] = { IDC_JAVA_TYPE, 0 }; static int cppt[] = { IDC_CPP_TYPE, 0 }; static int elispt[] = { IDC_ELISP_TYPE, 0 }; static int txtt[] = { IDC_TXT_TYPE, 0 }; static int idlt[] = { IDC_IDL_TYPE, 0 }; static void check_if_enable_next (HWND h) { EnableWindow (GetDlgItem (h, IDOK), 1); } static void load_dialog (HWND h) { rbset (h, da, root_desktop); rbset (h, ma, root_menu); rbset (h, ct, reg_c); rbset (h, javat, reg_java); rbset (h, cppt, reg_cpp); rbset (h, elispt, reg_elisp); rbset (h, txtt, reg_txt); rbset (h, idlt, reg_idl); check_if_enable_next (h); } static int check_desktop (char *title, char *target) { char path[_MAX_PATH]; LPITEMIDLIST id; int issystem = (root_scope == IDC_ROOT_SYSTEM) ? 1 : 0; SHGetSpecialFolderLocation (NULL, issystem ? CSIDL_COMMON_DESKTOPDIRECTORY : CSIDL_DESKTOPDIRECTORY, &id); SHGetPathFromIDList (id, path); // following lines added because it appears Win95 does not use common programs // unless it comes into play when multiple users for Win95 is enabled msg ("Desktop directory for desktop link: %s",path); if (strlen (path) == 0) { SHGetSpecialFolderLocation (NULL, CSIDL_DESKTOPDIRECTORY, &id); SHGetPathFromIDList (id, path); msg ("Desktop directory for deskop link changed to: %s",path); } // end of Win95 addition char *fname = concat (path, "/", title, ".lnk", 0); if (_access (fname, 0) == 0) return 0; /* already exists */ fname = concat (path, "/", title, ".pif", 0); /* check for a pif as well */ if (_access (fname, 0) == 0) return 0; /* already exists */ return IDC_ROOT_DESKTOP; } static int check_startmenu (char *title, char *target) { char path[_MAX_PATH]; LPITEMIDLIST id; int issystem = (root_scope == IDC_ROOT_SYSTEM) ? 1 : 0; SHGetSpecialFolderLocation (NULL, issystem ? CSIDL_COMMON_PROGRAMS : CSIDL_PROGRAMS, &id); SHGetPathFromIDList (id, path); // following lines added because it appears Win95 does not use common programs // unless it comes into play when multiple users for Win95 is enabled msg ("Program directory for program link: %s",path); if (strlen (path) == 0) { SHGetSpecialFolderLocation (NULL, CSIDL_PROGRAMS, &id); SHGetPathFromIDList (id, path); msg ("Program directory for program link changed to: %s",path); } // end of Win95 addition strcat (path, "\\"); strcat (path, XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME); char *fname = concat (path, "\\", title, ".lnk", 0); if (_access (fname, 0) == 0) return 0; /* already exists */ fname = concat (path, "\\", title, ".pif", 0); /* check for a pif as well */ if (_access (fname, 0) == 0) return 0; /* already exists */ return IDC_ROOT_MENU; } static void save_dialog (HWND h) { root_desktop= rbget (h, da); root_menu = rbget (h, ma); reg_c = rbget (h, ct); reg_java = rbget (h, javat); reg_cpp = rbget (h, cppt); reg_elisp = rbget (h, elispt); reg_txt = rbget (h, txtt); reg_idl = rbget (h, idlt); } static BOOL dialog_cmd (HWND h, int id, HWND hwndctl, UINT code) { switch (id) { case IDC_ROOT_DESKTOP: case IDC_ROOT_MENU: save_dialog (h); check_if_enable_next (h); break; case IDOK: save_dialog (h); do_desktop_setup(); NEXT (IDD_S_POSTINSTALL); break; case IDC_BACK: save_dialog (h); NEXT (IDD_CHOOSE); break; case IDCANCEL: NEXT (0); break; } return FALSE; } static BOOL CALLBACK dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { case WM_INITDIALOG: load_dialog (h); return FALSE; case WM_COMMAND: return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd); } return FALSE; } void do_desktop (HINSTANCE h) { CoInitialize (NULL); verinfo.dwOSVersionInfoSize = sizeof (verinfo); GetVersionEx (&verinfo); batname = 0; uninstname = 0; if (xemacs_package != 0 && xemacs_package->type != TY_GENERIC) { batname = concat (find_xemacs_exe_path (), "\\", find_xemacs_exe_name (), 0); uninstname = concat (find_xemacs_exe_path (), "\\", "setup.exe", 0); root_desktop = check_desktop ("XEmacs", batname); root_menu = check_startmenu ("XEmacs", batname); reg_c = IDC_C_TYPE; reg_cpp = IDC_CPP_TYPE; reg_java = IDC_JAVA_TYPE; reg_elisp = IDC_ELISP_TYPE; reg_txt = IDC_TXT_TYPE; reg_idl = IDC_IDL_TYPE; } else { root_desktop = 0; root_menu = 0; reg_c = 0; reg_cpp = 0; reg_java = 0; reg_elisp = 0; reg_txt = 0; reg_idl = 0; } int rv = 0; rv = DialogBox (h, MAKEINTRESOURCE (IDD_DESKTOP), 0, dialog_proc); if (rv == -1) fatal (IDS_DIALOG_FAILED); }