diff options
| author | David Engster | 2014-03-18 22:12:42 +0100 |
|---|---|---|
| committer | David Engster | 2014-03-18 22:12:42 +0100 |
| commit | f6985e81564c91e84a998858f9446139e64405cf (patch) | |
| tree | fa4aa373ac5b0fb92b557ee635644488b8596452 | |
| parent | ac9b4703e1944a9ac4887ea7a9af6b9659e4600c (diff) | |
| download | emacs-f6985e81564c91e84a998858f9446139e64405cf.tar.gz emacs-f6985e81564c91e84a998858f9446139e64405cf.zip | |
Document new EDE features.
* ede.texi (ede-cpp-root): Document the :compile-command slot.
(ede-linux): Document new variables
`project-linux-build-directory-default' and
`project-linux-architecture-default'.
| -rw-r--r-- | doc/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/misc/ede.texi | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 4301afb60ea..a2d201ff692 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -4,6 +4,10 @@ | |||
| 4 | `ede-java-root' and the example using it. | 4 | `ede-java-root' and the example using it. |
| 5 | (Android projects, ede-java-root): Remove nodes since they are | 5 | (Android projects, ede-java-root): Remove nodes since they are |
| 6 | only in CEDET upstream (Bug#17030). All nodes updated. | 6 | only in CEDET upstream (Bug#17030). All nodes updated. |
| 7 | (ede-cpp-root): Document the :compile-command slot. | ||
| 8 | (ede-linux): Document new variables | ||
| 9 | `project-linux-build-directory-default' and | ||
| 10 | `project-linux-architecture-default'. | ||
| 7 | 11 | ||
| 8 | 2014-03-12 Glenn Morris <rgm@gnu.org> | 12 | 2014-03-12 Glenn Morris <rgm@gnu.org> |
| 9 | 13 | ||
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi index 1e1da0fddf9..954427d10bf 100644 --- a/doc/misc/ede.texi +++ b/doc/misc/ede.texi | |||
| @@ -792,6 +792,7 @@ override the default include path and system include path like this: | |||
| 792 | (ede-cpp-root-project "NAME" :file "FILENAME" | 792 | (ede-cpp-root-project "NAME" :file "FILENAME" |
| 793 | :include-path '( "/include" "../include" "/c/include" ) | 793 | :include-path '( "/include" "../include" "/c/include" ) |
| 794 | :system-include-path '( "/usr/include/c++/3.2.2/" ) | 794 | :system-include-path '( "/usr/include/c++/3.2.2/" ) |
| 795 | :compile-command "make compile" | ||
| 795 | :spp-table '( ("MOOSE" . "") | 796 | :spp-table '( ("MOOSE" . "") |
| 796 | ("CONST" . "const") ) ) | 797 | ("CONST" . "const") ) ) |
| 797 | @end example | 798 | @end example |
| @@ -809,6 +810,9 @@ The @code{:system-include-path} allows you to specify full directory | |||
| 809 | names to include directories where system header files can be found. | 810 | names to include directories where system header files can be found. |
| 810 | These will be applied to files in this project only. | 811 | These will be applied to files in this project only. |
| 811 | 812 | ||
| 813 | With @code{:compile-command} you can provide a command which should be | ||
| 814 | run when calling @code{ede-compile-project}. | ||
| 815 | |||
| 812 | The @code{:spp-table} provides a list of project specific #define | 816 | The @code{:spp-table} provides a list of project specific #define |
| 813 | style macros that are unique to this project, passed in to the | 817 | style macros that are unique to this project, passed in to the |
| 814 | compiler on the command line, or are in special headers. | 818 | compiler on the command line, or are in special headers. |
| @@ -911,6 +915,12 @@ Kernel source tree, and enable EDE project mode for it. | |||
| 911 | It pre-populates the C Preprocessor symbol map for reasonable parsing, | 915 | It pre-populates the C Preprocessor symbol map for reasonable parsing, |
| 912 | and has an optimized include file identification function. | 916 | and has an optimized include file identification function. |
| 913 | 917 | ||
| 918 | Through the variables @code{project-linux-build-directory-default} and | ||
| 919 | @code{project-linux-architecture-default}, you can set the build | ||
| 920 | directory and its architecture, resp. The default is to assume that | ||
| 921 | the build happens in the source directory and to auto-detect the | ||
| 922 | architecture; if the auto-detection fails, you will be asked. | ||
| 923 | |||
| 914 | @node ede-generic-project, Custom Locate, ede-linux, Simple projects | 924 | @node ede-generic-project, Custom Locate, ede-linux, Simple projects |
| 915 | @subsection ede-generic-project | 925 | @subsection ede-generic-project |
| 916 | 926 | ||