Re: Problems with EDE

[Chong Yidong]

Sascha Wilde <address@hidden> writes:

> Yet another one:
> ede-make-dist does not work for ede automake projects:
>
>   -*- mode: compilation; default-directory: "/tmp/cedet-test1/" -*-
>   Compilation started at Thu Oct  8 22:52:13
>
>   make -f /tmp/cedet-test1/Makefile.am dist
>   make: *** No rule to make target `dist'.  Stop.
>
>   Compilation exited abnormally with code 2 at Thu Oct  8 22:52:13
>
> Using the Makefile.am is obviously wrong.  The actual Makefile contains
> an working dist target.

This is a bug in project-make-dist (the filename comparison forgets that
ede-proj-dist-makefile returns a full filename).  I've checked in a fix
into the trunk.

Eric, here's a patch for your tree (it also includes a stylistic
correction, to use expand-file-name instead of concat to generate full
filenames).


* cedet/ede/ede-proj.el (project-make-dist, project-compile-project):
Fix filename test.
(ede-proj-dist-makefile): Use expand-file-name instead of concat
to expand file names.

*** cedet/ede/ede-proj.el.~1.62.~       2009-08-18 19:56:57.000000000 -0400
--- cedet/ede/ede-proj.el       2009-10-08 18:12:20.000000000 -0400
***************
*** 453,459 ****
             (not (y-or-n-p "Dist file already exists.  Rebuild? ")))
        (error "Try `ede-update-version' before making a distribution"))
      (ede-proj-setup-buildenvironment this)
!     (if (string= pm "Makefile.am") (setq pm "Makefile"))
      (compile (concat ede-make-command " -f " pm " dist"))
      ))
  
--- 453,461 ----
             (not (y-or-n-p "Dist file already exists.  Rebuild? ")))
        (error "Try `ede-update-version' before making a distribution"))
      (ede-proj-setup-buildenvironment this)
!     (if (string= (file-name-nondirectory pm) "Makefile.am")
!       (setq pm (expand-file-name "Makefile"
!                                  (file-name-directory pm))))
      (compile (concat ede-make-command " -f " pm " dist"))
      ))
  
***************
*** 470,476 ****
    (let ((pm (ede-proj-dist-makefile proj))
        (default-directory (file-name-directory (oref proj file))))
      (ede-proj-setup-buildenvironment proj)
!     (if (string= pm "Makefile.am") (setq pm "Makefile"))
      (compile (concat ede-make-command" -f " pm " all"))))
  
  ;;; Target type specific compilations/debug
--- 472,480 ----
    (let ((pm (ede-proj-dist-makefile proj))
        (default-directory (file-name-directory (oref proj file))))
      (ede-proj-setup-buildenvironment proj)
!     (if (string= (file-name-nondirectory pm) "Makefile.am")
!       (setq pm (expand-file-name "Makefile"
!                                  (file-name-directory pm))))
      (compile (concat ede-make-command" -f " pm " all"))))
  
  ;;; Target type specific compilations/debug
***************
*** 599,609 ****
         (concat (file-name-directory (oref this file))
                 "Makefile.am"))
        ((eq (oref this makefile-type) 'Makefile.in)
!        (concat (file-name-directory (oref this file))
!                "Makefile.in"))
        ((object-assoc "Makefile" 'makefile (oref this targets))
!        (concat (file-name-directory (oref this file))
!                "Makefile"))
        (t
         (let ((targets (oref this targets)))
           (while (and targets
--- 603,613 ----
         (concat (file-name-directory (oref this file))
                 "Makefile.am"))
        ((eq (oref this makefile-type) 'Makefile.in)
!        (expand-file-name "Makefile.in"
!                          (file-name-directory (oref this file))))
        ((object-assoc "Makefile" 'makefile (oref this targets))
!        (expand-file-name "Makefile"
!                          (file-name-directory (oref this file))))
        (t
         (let ((targets (oref this targets)))
           (while (and targets
***************
*** 612,619 ****
                             'ede-proj-target-makefile)))
             (setq targets (cdr targets)))
           (if targets (oref (car targets) makefile)
!            (concat (file-name-directory (oref this file))
!                    "Makefile"))))))
  
  (defun ede-proj-regenerate ()
    "Regenerate Makefiles for and edeproject project."
--- 616,623 ----
                             'ede-proj-target-makefile)))
             (setq targets (cdr targets)))
           (if targets (oref (car targets) makefile)
!            (expand-file-name "Makefile"
!                              (file-name-directory (oref this file))))))))
  
  (defun ede-proj-regenerate ()
    "Regenerate Makefiles for and edeproject project."