[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/merge-cedet-tests 152728b 238/316: New make-type a
From: |
Edward John Steere |
Subject: |
[Emacs-diffs] scratch/merge-cedet-tests 152728b 238/316: New make-type argument to control which include |
Date: |
Sat, 28 Jan 2017 09:10:07 +0000 (UTC) |
branch: scratch/merge-cedet-tests
commit 152728bdb506257f988c4358cb7740002dc41de6
Author: zappo <address@hidden>
Commit: Edward John Steere <address@hidden>
New make-type argument to control which include
variable is used
* test/manual/cedet/cit-cpp.el: (cit-srecode-fill-cpp): Accept
make-type argument. Control how projects are made based on what
include variable is used based on above.
---
test/manual/cedet/cit-cpp.el | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/test/manual/cedet/cit-cpp.el b/test/manual/cedet/cit-cpp.el
index f3e20c7..b10cf10 100644
--- a/test/manual/cedet/cit-cpp.el
+++ b/test/manual/cedet/cit-cpp.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2008, 2009 Eric M. Ludlam
;; Author: Eric M. Ludlam <address@hidden>
-;; X-RCS: $Id: cit-cpp.el,v 1.4 2009-03-12 02:04:35 zappo Exp $
+;; X-RCS: $Id: cit-cpp.el,v 1.5 2009-08-08 21:51:27 zappo Exp $
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the GNU General Public License as
@@ -108,19 +108,19 @@
"Tags to be inserted into main.")
-(defun cit-srecode-fill-cpp ()
+(defun cit-srecode-fill-cpp (make-type)
"Fill up a base set of files with some base tags."
;; 2 b) Test various templates.
(cit-srecode-fill-with-stuff "include/foo.hh" cit-header-cpp-tags)
- (ede-new "Make" "Includes")
+ (ede-new make-type "Includes")
;; 1 e) Tell EDE where the srcs are
(ede-new-target "Includes" "miscellaneous" "n")
(ede-add-file "Includes")
(cit-srecode-fill-with-stuff "src/foo.cpp" cit-src-cpp-tags)
- (ede-new "Make" "Src")
+ (ede-new make-type "Src")
;; 1 e) Tell EDE where the srcs are
(ede-new-target "Prog" "program" "n")
(ede-add-file "Prog")
@@ -130,7 +130,9 @@
(ede-add-file "Prog")
(let ((p (ede-current-project)))
- (oset p :variables '( ( "CPPFLAGS" . "-I../include") ))
+ (if (string= make-type "Automake")
+ (oset p :variables '( ( "AM_CPPFLAGS" . "-I../include") ))
+ (oset p :variables '( ( "CPPFLAGS" . "-I../include") )))
(ede-commit-project p)
)
- [Emacs-diffs] scratch/merge-cedet-tests 82a840d 244/316: Use ldflags and libs for in project libraries, (continued)
- [Emacs-diffs] scratch/merge-cedet-tests 82a840d 244/316: Use ldflags and libs for in project libraries, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests cb8b935 245/316: (cit-remove-and-do-shared-lib): Add ldlibs-local test., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests ecb61db 211/316: New test files combining macros and EDE, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 853dd10 259/316: New test C file for linux., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 558de0d 220/316: Fake emacs.c for project detection purposes., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 31d40a7 257/316: Fix EIEIO methodinvoke-utest and semantic-fmt-utest., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests cdfb2f7 252/316: Tests for completiong symbols in wisent grammars., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 323ca78 196/316: New test file for unions., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests a86650d 198/316: Use `cedet-version' instead of `cedet-version-print', Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests a4202a0 188/316: Call external db testing suite, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 152728b 238/316: New make-type argument to control which include,
Edward John Steere <=
- [Emacs-diffs] scratch/merge-cedet-tests bff505d 132/316: Synchronize cedet/semantic with Emacs., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests ef97bdd 203/316: (cedet-utest-batch): Disable saving EDE's cache file., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests c561582 298/316: Improve test utilities, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 9ab6e1b 270/316: Emacs Lisp support for cedet integration tests., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 5cc7300 264/316: Synchronize cedet/semantic with Emacs., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 0caf48a 302/316: Improve test output, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 975468f 275/316: Add header comments and provide., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 60a3f4b 299/316: (semantic-ia-utest-file-list): add testwisent.wy, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests e492fd9 301/316: (semantic-ia-utest-file-list): Add testunion.cpp., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 644d6ca 278/316: Test external database tools., Edward John Steere, 2017/01/28