Mercurial > emacs
view nt/gmake.defs @ 110321:4b26adbef9a2
Major code cleanup. Split tramp.el into tramp.el and tramp-sh.el.
* Makefile.in (TRAMP_SRC): Remove tramp-fish.el. Add tramp-sh.el.
* net/tramp.el (top): Don't show loading message. Require just
'tramp-compat, everything else is required there. Use
`ignore-errors' where appropriate.
(tramp-inline-compress-start-size, tramp-copy-size-limit)
(tramp-terminal-type, tramp-end-of-output)
(tramp-initial-end-of-output, tramp-completion-function-alist-rsh)
(tramp-completion-function-alist-ssh)
(tramp-completion-function-alist-telnet)
(tramp-completion-function-alist-su)
(tramp-completion-function-alist-putty, tramp-remote-path)
(tramp-remote-process-environment, tramp-sh-extra-args)
(tramp-actions-before-shell, tramp-uudecode)
(tramp-perl-file-truename, tramp-perl-file-name-all-completions)
(tramp-perl-file-attributes)
(tramp-perl-directory-files-and-attributes)
(tramp-perl-encode-with-module, tramp-perl-decode-with-module)
(tramp-perl-encode, tramp-perl-decode)
(tramp-vc-registered-read-file-names, tramp-file-mode-type-map)
(tramp-file-name-handler-alist, tramp-make-tramp-temp-file)
(tramp-handle-make-symbolic-link, tramp-handle-load)
(tramp-handle-file-name-as-directory)
(tramp-handle-file-name-directory)
(tramp-handle-file-name-nondirectory, tramp-handle-file-truename)
(tramp-handle-file-exists-p, tramp-handle-file-attributes)
(tramp-do-file-attributes-with-ls)
(tramp-do-file-attributes-with-perl)
(tramp-do-file-attributes-with-stat)
(tramp-handle-set-visited-file-modtime)
(tramp-handle-verify-visited-file-modtime)
(tramp-handle-set-file-modes, tramp-handle-set-file-times)
(tramp-set-file-uid-gid, tramp-remote-selinux-p)
(tramp-handle-file-selinux-context)
(tramp-handle-set-file-selinux-context)
(tramp-handle-file-executable-p, tramp-handle-file-readable-p)
(tramp-handle-file-newer-than-file-p, tramp-handle-file-modes)
(tramp-handle-file-directory-p, tramp-handle-file-regular-p)
(tramp-handle-file-symlink-p, tramp-handle-file-writable-p)
(tramp-handle-file-ownership-preserved-p)
(tramp-handle-directory-file-name, tramp-handle-directory-files)
(tramp-handle-directory-files-and-attributes)
(tramp-do-directory-files-and-attributes-with-perl)
(tramp-do-directory-files-and-attributes-with-stat)
(tramp-handle-file-name-all-completions)
(tramp-handle-file-name-completion, tramp-handle-add-name-to-file)
(tramp-handle-copy-file, tramp-handle-copy-directory)
(tramp-handle-rename-file, tramp-do-copy-or-rename-file)
(tramp-do-copy-or-rename-file-via-buffer)
(tramp-do-copy-or-rename-file-directly)
(tramp-do-copy-or-rename-file-out-of-band)
(tramp-handle-make-directory, tramp-handle-delete-directory)
(tramp-handle-delete-file)
(tramp-handle-dired-recursive-delete-directory)
(tramp-handle-dired-compress-file, tramp-handle-dired-uncache)
(tramp-handle-insert-directory)
(tramp-handle-unhandled-file-name-directory)
(tramp-handle-expand-file-name)
(tramp-handle-substitute-in-file-name)
(tramp-handle-executable-find, tramp-process-sentinel)
(tramp-handle-start-file-process, tramp-handle-process-file)
(tramp-handle-call-process-region, tramp-handle-shell-command)
(tramp-handle-file-local-copy, tramp-handle-file-remote-p)
(tramp-handle-insert-file-contents)
(tramp-handle-insert-file-contents-literally)
(tramp-handle-find-backup-file-name)
(tramp-handle-make-auto-save-file-name, tramp-handle-write-region)
(tramp-vc-registered-file-names, tramp-handle-vc-registered)
(tramp-sh-file-name-handler, tramp-vc-file-name-handler)
(tramp-maybe-send-script, tramp-set-auto-save, tramp-run-test)
(tramp-run-test2, tramp-find-executable, tramp-set-remote-path)
(tramp-find-file-exists-command, tramp-open-shell)
(tramp-find-shell, tramp-barf-if-no-shell-prompt)
(tramp-open-connection-setup-interactive-shell)
(tramp-local-coding-commands, tramp-remote-coding-commands)
(tramp-find-inline-encoding, tramp-call-local-coding-command)
(tramp-inline-compress-commands, tramp-find-inline-compress)
(tramp-compute-multi-hops, tramp-maybe-open-connection)
(tramp-send-command , tramp-wait-for-output)
(tramp-send-command-and-check, tramp-barf-unless-okay)
(tramp-send-command-and-read, tramp-mode-string-to-int)
(tramp-convert-file-attributes, tramp-check-cached-permissions)
(tramp-file-mode-from-int, tramp-file-mode-permissions)
(tramp-shell-case-fold, tramp-make-copy-program-file-name)
(tramp-method-out-of-band-p, tramp-local-host-p)
(tramp-get-remote-path, tramp-get-remote-tmpdir)
(tramp-get-ls-command, tramp-get-ls-command-with-dired)
(tramp-get-test-command, tramp-get-test-nt-command)
(tramp-get-file-exists-command, tramp-get-remote-ln)
(tramp-get-remote-perl, tramp-get-remote-stat)
(tramp-get-remote-readlink, tramp-get-remote-trash)
(tramp-get-remote-id, tramp-get-remote-uid, tramp-get-remote-gid)
(tramp-get-local-uid, tramp-get-local-gid)
(tramp-get-inline-compress, tramp-get-inline-coding, ): Move to
tramp-sh.el.
(tramp-methods, tramp-default-method-alist)
(tramp-default-user-alist, tramp-foreign-file-name-handler-alist):
Move initialization to tramp-sh.el.
(tramp-temp-name-prefix): Make it a defconst.
(tramp-dissect-file-name): Don't check anymore for multi-hop
methods.
(tramp-debug-outline-regexp): Add a docstring.
(tramp-debug-outline-level): Renamed from `tramp-outline-level'.
(tramp-get-debug-buffer): Use it.
* net/tramp-cache.el (top): Set tramp-autoload cookie for
initialization forms.
(tramp-set-connection-property): Don't protect `tramp-message'
call, it isn't necessary any longer.
(tramp-dump-connection-properties): Use `ignore-errors'.
* net/tramp-compat.el (top): Require 'advice, 'format-spec,
'password-cache and 'auth-source.
* net/tramp-gvfs.el (top):
* net/tramp-smb.el (top): Require 'tramp-sh.
* net/tramp-gw.el (tramp-gw-open-network-stream): Use `ignore-errors'.
* net/tramp-sh.el: New file, derived from tramp.el.
(top): Initialize `tramp-methods', `tramp-default-method-alist',
`tramp-default-user-alist', tramp-foreign-file-name-handler-alist.
Remove "scp1_old", "scp2_old", "ssh1_old", "ssh2_old". Use
`ignore-errors' where appropriate.
(tramp-sh-file-name-handler-alist): Renamed from
`tramp-file-name-handler-alist'.
(tramp-send-command-and-check): Return t or nil. Remove all
`zerop' checks, where called.
(tramp-handle-set-file-modes)
(tramp-do-copy-or-rename-file-directly)
(tramp-handle-delete-directory, tramp-handle-delete-file)
(tramp-maybe-send-script, ): Use `tramp-barf-unless-okay'.
(tramp-sh-file-name-handler, tramp-send-command-and-check)
(tramp-get-remote-ln): Set tramp-autoload cookie.
* net/tramp-fish.el: Remove file.
author | Michael Albinus <michael.albinus@gmx.de> |
---|---|
date | Mon, 13 Sep 2010 17:17:01 +0200 |
parents | 0c42e0c36463 |
children | f41f9fcfa769 |
line wrap: on
line source
# -*- Makefile -*- definition file for building GNU Emacs on Windows NT. # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, # 2008, 2009, 2010 Free Software Foundation, Inc. # This file is part of GNU Emacs. # GNU Emacs 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 3 of the License, or # (at your option) any later version. # GNU Emacs is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. # Ensure 'all' is the default target all: # NOTES # # I tried to force gmake to use the native shell for simplicity, by # setting SHELL as below, but this didn't work reliably because of # various case sensitivity niggles. Specifically, COMSPEC (which is in # fact usually spelled ComSpec on NT, to make life difficult) typically # references "cmd.exe" (on NT) when the file is actually called # "CMD.EXE" on disk for hysterical raisons. As a result, GNU make # thinks it doesn't exist (unless compiled with a switch to ignore # case), and so doesn't change which shell it will invoke to execute # commands. # # It would be possible, though very tedious using just gmake facilities, # to convert the COMSPEC value to uppercase to solve this problem, but # it isn't worth it. That is partly because, even when using the native # shell, gmake tends to not be happy with backslashes in command # strings. The obvious solution is to use forward slashes as much as # possible, which can be made to work most of the time (putting # filenames in quotes often helps), but there are still some internal # cmd.exe commands like `del' and `copy' that won't work with them. # Although it is possible to convert slashes to backslashes when # necessary, gmake requires explicitly calling its subst function, which # nmake does not understand). For this reason, it is simplest to # mandate that rm and cp be available, so we can use Unix-format file # names everywhere. (Fortunately both MS and GNU make, and the # respective compilers, are happy with Unix-format names.) # # Since we cannot easily force the choice of a particular shell, we must # make the effort to cope with whichever shell is being used. # Fortunately, the only command we need to use that is shell specific is # the testing of a file's existence for the purpose of working out when # we are copying files to their original location. That particular # requirement is abstracted easily enough. # # The only other problem area was the change of directory when running # temacs to dump emacs.exe (where gmake doesn't support cd foo in any # useful way), but that has been resolved by modifying the Windows # unexec function slightly to not require the directory change while # still allowing objects and binaries to be in subdirectories. # This doesn't work. #SHELL:=$(COMSPEC) # Determine whether make is using sh or cmd/command as shell; cmd.exe # will output "ECHO is on" when echo is given by itself, while sh will # not produce any output. sh_output := $(shell echo) ifeq "$(findstring ECHO, $(sh_output))" "ECHO" THE_SHELL = $(COMSPEC)$(ComSpec) SHELLTYPE=CMD else USING_SH = 1 THE_SHELL = $(SHELL) SHELLTYPE=SH endif MAKETYPE=gmake # The following "ifeq" does not appear to DTRT, and therefore breaks # the build on mingw32. Also the -m option does not exist in many # (reasonably recent even) versions of Cygwin. These issues need to be # remedied before putting this cygpath kludge back in. # Convert CURDIR to native file name, if in Cygwin format #ifeq "$(shell cygpath $(CURDIR))" "$(CURDIR)" #CURDIR := $(shell cygpath -m $(CURDIR)) #endif THISDIR = . # Cygwin has changed quoting rules somewhat since b20, in a way that # affects makefiles using sh as the command processor, so we need to # detect which rules to use. ifdef USING_SH sh_output := $(shell echo [Please ignore a syntax error on the next line - it is intentional] 1>&2) sh_output := $(shell echo foo") ifeq "$(sh_output)" "" NEW_CYGWIN = 1 endif # By default, newer versions of Cygwin mess with NTFS ACLs in an # attempt to emulate traditional posix file permissions. This can # cause bad effects, such as .exe files that are missing the # FILE_EXECUTE/FILE_GENERIC_EXECUTE permissions when they are created # with Cygwin commands that don't expect to be creating executable # files. Then when we later use a non-Cygwin program to create the # real .exe, the previous Cygwin defined ACL sticks. CYGWIN=nontsec export CYGWIN endif ALL_DEPS = $^ EMPTY = SPACE = $(EMPTY) $(EMPTY) SUBSYSTEM_WINDOWS=-Wl,-subsystem,windows SUBSYSTEM_CONSOLE=-Wl,-subsystem,console # INSTALL_DIR is the directory into which emacs will be installed. # ifndef INSTALL_DIR INSTALL_DIR = $(CURDIR)/.. endif export EMACSLOADPATH # Determine the architecture we're running on. # Define ARCH for our purposes; # Define CPU for use by ntwin32.mak; # Define CONFIG_H to the appropriate config.h for the system; # ifdef PROCESSOR_ARCHITECTURE # We're on Windows NT CPU = $(PROCESSOR_ARCHITECTURE) CONFIG_H = config.nt OS_TYPE = windowsnt ifeq "$(PROCESSOR_ARCHITECTURE)" "x86" ARCH = i386 CPU = i386 else ifeq "$(PROCESSOR_ARCHITECTURE)" "MIPS" ARCH = mips else ifeq "$(PROCESSOR_ARCHITECTURE)" "ALPHA" ARCH = alpha else ifeq "$(PROCESSOR_ARCHITECTURE)" "PPC" ARCH = ppc else error Unknown architecture type "$(PROCESSOR_ARCHITECTURE)" endif endif endif endif else # We're on Windows 95 ARCH = i386 CPU = i386 CONFIG_H = config.nt OS_TYPE = windows95 endif AR = ar -rsc AR_OUT = CC = gcc CC_OUT = -o$(SPACE) LINK = gcc LINK_OUT = -o$(SPACE) RC = windres -O coff RC_OUT = -o$(SPACE) RC_INCLUDE = --include-dir$(SPACE) libc = baselibs = O = o A = a BASE_LIBS = $(libc) $(baselibs) ADVAPI32 = -ladvapi32 COMCTL32 = -lcomctl32 COMDLG32 = -lcomdlg32 GDI32 = -lgdi32 MPR = -lmpr SHELL32 = -lshell32 USER32 = -luser32 WSOCK32 = -lwsock32 WINMM = -lwinmm WINSPOOL = -lwinspool OLE32 = -lole32 UNISCRIBE = -lusp10 UUID = -luuid ifdef NOOPT DEBUG_CFLAGS = -DEMACSDEBUG else DEBUG_CFLAGS = endif ifdef ENABLECHECKS CHECKING_CFLAGS = -DENABLE_CHECKING -DXASSERTS -fno-crossjumping else CHECKING_CFLAGS = endif CFLAGS = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(PROFILE_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS) EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1 ifdef PROFILE PROFILE_CFLAGS = -pg PROFILE_LDFLAGS = -pg else PROFILE_CFLAGS = PROFILE_LDFLAGS = endif # see comments in allocate_heap in w32heap.c before changing any of the # -stack, -heap, or -image-base settings. TEMACS_EXTRA_LINK = -Wl,-stack,0x00800000 -Wl,-heap,0x00100000 -Wl,-image-base,0x01000000 $(SUBSYSTEM_CONSOLE) -Wl,-entry,__start -Wl,-Map,$(BLD)/temacs.map ifdef NOOPT OBJDIR = oo else OBJDIR = oo-spd endif $(OBJDIR):; -mkdir "$(OBJDIR)" BLD = $(OBJDIR)/$(ARCH) stamp_BLD: $(OBJDIR) -mkdir "$(BLD)" echo $(BLD) > $@ COMPILER_TEMP_FILES = CP = cp -f CP_DIR = cp -rf DEL = rm DEL_TREE = rm -r ifdef USING_SH IFNOTSAMEDIR = if [ ! -s ../same-dir.tst ] ; then FOREACH = for f in FORVAR = $${f} FORDO = ; do ENDFOR = ; done ENDIF = ; fi ARGQUOTE = ' ifdef NEW_CYGWIN DQUOTE = " else DQUOTE = "" endif else IFNOTSAMEDIR = if not exist ../same-dir.tst FOREACH = for %%f in ( FORVAR = %%f FORDO = ) do ENDFOR = ENDIF = ARGQUOTE = " DQUOTE = \" endif ifdef NODEBUG DEBUG_FLAG = DEBUG_LINK = else DEBUG_FLAG = $(DEBUG_INFO) DEBUG_LINK = $(DEBUG_INFO) endif ifdef NOCYGWIN NOCYGWIN = -mno-cygwin endif ifeq "$(ARCH)" "i386" ifdef NOOPT ARCH_CFLAGS = -c $(DEBUG_FLAG) $(NOCYGWIN) else ARCH_CFLAGS = -c $(DEBUG_FLAG) $(NOCYGWIN) $(MCPU_FLAG) -O2 \ # -fbuiltin \ # -finline-functions \ # -fomit-frame-pointer endif ARCH_LDFLAGS = $(SYS_LDFLAGS) else ERROR Unknown architecture type "$(ARCH)". endif LINK_FLAGS = $(ARCH_LDFLAGS) $(DEBUG_LINK) $(PROFILE_LDFLAGS) $(NOCYGWIN) $(USER_LDFLAGS) export XMFLAGS .DEFAULT: $(BLD)/%.o: %.c $(CC) $(CFLAGS) $(CC_OUT)$@ $< # arch-tag: 35eb9662-8534-4bcf-b891-0730a09d657f