Mercurial > emacs
view nt/gmake.defs @ 106168:83924fb4f59c
2009-11-20 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-diary-entry-in-org-file): Rebuild
agenda after adding new entry.
* org-datetree.el (org-datetree-find-day-create): Fix regular
expression.
* org.el (org-display-outline-path): Use a format specifier for
message, to avoid problems with heading containing `%'.
* org-agenda.el (org-agenda-hide-tags-regexp): New option.
(org-format-agenda-item): Call `org-agenda-fix-displayed-tags'.
(org-agenda-fix-displayed-tags): New function.
(org-agenda-do-context-action): Just call
`org-display-outline-path', without piping the result through
`message'.
* org-latex.el (org-export-latex-preprocess): Protect secondary
footnote references.
* org-indent.el (org-indent-initialize): Avoid empty strings as
line prefixes.
* org-agenda.el (org-agenda-diary-entry-in-org-file): Make sure
hat checking for the mark does not throw an error.
(org-agenda-diary-entry-in-org-file): Catch the case that there is
not `day' text property in the cursor line.
* org.el (org-sort-entries-or-items): Make sure that the final
entry has a newline before doing the sorting.
* org-agenda.el (org-agenda-diary-entry-in-org-file): Get the text
property at the beginning of the line.
* org.el (org-make-link-string): Don't allow a description with
only white space.
* org-agenda.el (org-agenda-insert-diary-strategy): New variable.
(org-agenda-insert-diary-as-top-level): New function.
(org-agenda-add-entry-to-org-agenda-diary-file): Call
`org-agenda-insert-diary-as-top-level'.
* org.el (org-occur-in-agenda-files): Make sure none of the
buffers is narrowed.
(org-activate-plain-links): Add the face property here.
(org-set-font-lock-defaults): Do not add the face to plain links,
the activator function does this.
* org-habit.el (org-is-habit-p): Add doc string.
* org-archive.el (org-archive-subtree-default-with-confirmation):
Autoload.
* org-latex.el (org-export-latex-fontify): Fix regexp to make char
after match optional (happens at the end of a line...).
* org.el (org-fontify-meta-lines-and-blocks): Apply special faces
for special blocks.
* org-faces.el (org-copy-face): Set lisp indentation.
(org-quote, org-verse): New faces.
* org-agenda.el (org-agenda-remove-date): Remove variable.
* org-freemind.el (org-freemind-escape-str-from-org): Fix encoding.
* org-html.el (org-export-as-html): Move the home/up link into
the content div.
* org.el (org-export-latex-packages-alist): Option definition
moved here from org-latex.el.
* org-html.el (org-export-html-home/up-format): Add an ID to the
up/home div.
* org-wl.el (org-wl-store-link): Handle the case that
`wl-use-petname' is set.
* org.el (org-set-effort): Improve prompt.
(org-get-outline-path): Widen to get full path.
(org-compact-display-after-subtree-move): Function removed.
2009-11-20 Eric Schulte <schulte.eric@gmail.com>
* org-exp-blocks.el (org-export-blocks-format-ditaa): Use sha1
hash keys to cache and re-use images generated by the
org-exp-blocks interface to ditaa and dot.
* org.el (org-format-latex): Latex images are now saved to files
named by the sha1 hash of the latex source text avoiding
regeneration of identical images.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Fri, 20 Nov 2009 20:50:32 +0000 |
parents | 3956d6b01ba1 |
children | 1d1d5d9bd884 |
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 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 CFLAGS = -I. $(ARCH_CFLAGS) $(DEBUG_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