[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/merge-cedet-tests 7eeab10 240/316: (cit-remove-and
From: |
Edward John Steere |
Subject: |
[Emacs-diffs] scratch/merge-cedet-tests 7eeab10 240/316: (cit-remove-and-do-shared-lib): Enable for use with Make projects too. Create the srcs in a new lib directory. |
Date: |
Fri, 27 Jan 2017 20:03:43 +0000 (UTC) |
branch: scratch/merge-cedet-tests
commit 7eeab10c49f3971d45801da0a1914e46757252c9
Author: zappo <address@hidden>
Commit: Edward John Steere <address@hidden>
(cit-remove-and-do-shared-lib): Enable for use with Make projects too.
Create the srcs in a new lib directory.
---
test/manual/cedet/cit-cpp.el | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/test/manual/cedet/cit-cpp.el b/test/manual/cedet/cit-cpp.el
index 466c032..e162eaf 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.6 2009-09-14 02:38:13 zappo Exp $
+;; X-RCS: $Id: cit-cpp.el,v 1.7 2009-10-15 02:55:46 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
@@ -140,18 +140,22 @@
)
-(defun cit-remove-add-to-project-cpp ()
- "Remve foo.cpp from the current project. Add in a new generated file."
-
- (find-file (cit-file "src/foo.cpp"))
+(defun cit-remove-add-to-project-cpp (make-type)
+ "Remve bar.cpp from the current project.
+Create a new shared lib with bar.cpp in it.
+Argument MAKE-TYPE is the type of make project to create."
+ (find-file (cit-file "src/bar.cpp"))
;; Whack the file
(ede-remove-file t)
(kill-buffer (current-buffer))
- (delete-file (cit-file "src/foo.cpp"))
+ (delete-file (cit-file "src/bar.cpp"))
- ;; Make a new one
- (cit-srecode-fill-with-stuff "src/bar.cpp" cit-src-cpp-tags)
- (ede-add-file "Prog")
+ ;; Create a new shared lib target, and add bar.cpp to it.
+ (find-file (cit-file "lib/bar.cpp"))
+ (cit-srecode-fill-with-stuff "lib/bar.cpp" cit-src-cpp-tags)
+ (ede-new make-type "Libs")
+ (ede-new-target "testlib" "sharedobject" "n")
+ (ede-add-file "testlib")
;; 1 g) build the sources.
;; Direct compile to test that make fails properly.
@@ -161,6 +165,13 @@
(accept-process-output)
(sit-for 1))
+ (let ((p (ede-current-project)))
+ (if (string= make-type "Automake")
+ (oset p :variables '( ( "AM_CPPFLAGS" . "-I../include") ))
+ (oset p :variables '( ( "CPPFLAGS" . "-I../include") )))
+ (ede-commit-project p)
+ )
+
(cit-compile-and-wait)
)
- [Emacs-diffs] scratch/merge-cedet-tests 3fd7717 192/316: Synchronize cedet/srecode with Emacs., (continued)
- [Emacs-diffs] scratch/merge-cedet-tests 3fd7717 192/316: Synchronize cedet/srecode with Emacs., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 558874e 169/316: Update comments, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests db5f56b 172/316: (cedet-integ-test): Post a PASSED message., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 40b4bd4 204/316: Adedd `ede-detect-utest', Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 24be9ac 184/316: Insert tag's code if it's there, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 6bd181e 224/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests df0e0e6 193/316: Synchronize cedet/srecode with Emacs., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 909e1b9 158/316: (ede-detect-utest-init-dirmatch): Force the dirmatch configdatastash to be unbound to force arduino to flush any cached values., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 50cce19 183/316: Added lib dir and make-type argument, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 82586cd 209/316: eieio: Move to obsolete and use the one that ships with Emacs, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 7eeab10 240/316: (cit-remove-and-do-shared-lib): Enable for use with Make projects too. Create the srcs in a new lib directory.,
Edward John Steere <=
- [Emacs-diffs] scratch/merge-cedet-tests 27001fd 271/316: Accept the make-tipe argument to control tests, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 9679584 296/316: Remove compatibility function `cedet-called-interactively-p'., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 2316f19 173/316: Add whitespace at the end of a filled buffer, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests ef97bdd 203/316: (cedet-utest-batch): Disable saving EDE's cache file., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 764db86 236/316: (cit-remove-add-to-project-cpp): Wait for make to finish., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests e492fd9 301/316: (semantic-ia-utest-file-list): Add testunion.cpp., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests c561582 298/316: Improve test utilities, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 644d6ca 278/316: Test external database tools., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 83bcf53 274/316: (cit-srecode-fill-el): Insert classes before methods., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 11d45fa 170/316: Restructure and improve output, Edward John Steere, 2017/01/27