all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* CEDET Merge
@ 2017-01-12 19:32 Edward John Steere
  2017-01-12 19:45 ` Eli Zaretskii
                   ` (2 more replies)
  0 siblings, 3 replies; 153+ messages in thread
From: Edward John Steere @ 2017-01-12 19:32 UTC (permalink / raw)
  To: emacs-devel

Hello Everyone,

I've been working on a branch in upstream CEDET which brings it up to
date with the changes which have been made in Emacs core.  I started
this work with the intention of simplifying the merge process from CEDET
upstream into core so that users can benefit from improvements to CEDET
more easily.  I found that the divergence between the two versions of
CEDET has grown quite a bit and all of my work has been dedicated to
getting it to run on Emacs master (26?).

My branch now passes all of CEDETs tests when built against Emacs
@512e988.  I'd like to get these changes synchronised with Emacs core
and have my branch merged to upstream (i.e. CEDET on source forge).

This could be the first step with the second being a repackaging of
upstream so that it only contains the parts which are under active
development and can be installed via ELPA.

May I contribute my changes to a branch on the Savannah repository for
review/commentary?  (If yes, then It'll take a little bit of time to
merge the changes in my branch of CEDET back into Emacs core before I
actually push them up.)

Kind regards,

Edward Steere



^ permalink raw reply	[flat|nested] 153+ messages in thread
* Re: CEDET Merge
@ 2017-09-26 18:31 Edward John Steere
  0 siblings, 0 replies; 153+ messages in thread
From: Edward John Steere @ 2017-09-26 18:31 UTC (permalink / raw)
  To: Charles A. Roelli; +Cc: emacs-devel


> Thanks for your detailed response.
>
>> The problem which I face, without the help of those more experienced
>> than I, is that I don't have enough context on how to resolve some of
>> the problems which arise as part of doing a partial merge of CEDET into
>> core.  I'm not an expert wrt to the CEDET project -- I'm a user and an
>> occasional hacker who has an understanding of the project and wants to
>> give back, help it grow and enjoy the benefits of this growth and
>> improvement to Emacs.
>
> Can you say which parts of the merge caused difficulty?  I'd like to
> help move the process along, if it's possible (though I'm also not a
> frequent Elisp hacker).

That's great.  I'd be interested in collaborating with you.

I think that the biggest problem which I faced was in untangling the
dependencies which had been created between code in files which exist in
both core and upstream and some of the newer files which only exist in
upstream.  Some of these dependencies don't seem to be correct.  For
example; there is now an indirect link between the parser and java
support and not in the downwards direction but from the parser up to
java support (!?)

Others dependencies appear to be valid but exist between code which
should be merged and which shouldn't.  This made my approach of trying
to preserve history very challenging because I not only had to ensure
that the roots of patches from CEDET matched the correct destination in
their new home, but I also had to resolve conflicts where they diverged
and simultaneously remove dependencies where they were built up between
those parts which were destined for core and those which were not.

Dependency issues caused problems when trying to bootstrap Emacs on my
branch which had the whole of CEDET merged.  I did receive some help
from Eli at that point, but didn't get very far before David got
involved and started to drive that side of things.

Unfortunately, this vague description is the best I can do without
diving in again.

> Also, do you know which parts of CEDET were going to be offered as
> ELPA packages?  You mentioned COGRE already -- were there any others?

What follows is a (possibly non-exhaustive) list of the parts of CEDET
which I don't think were intended to reach core (gathered by diffing
trees and combining that with what I remember).  This is based on the
premise that if it wasn't in core previously then it shouldn't be merged
-- which is what was agreed upon.  Looking at the list though this does
exclude a lot of good stuff.
  - Everything in contrib (since I don't think that any of it is in
    core) including:
    - eassist
    - ede-gnustep
    - semantic-ectag-scala
    - semnatic-tag-folding
    - wisent-csharp
    - wisent-php
    - wisent-ruby
  - cedet-java and related including:
    - java-tags
    - java
    - jvm-base
  - cedet-graphviz
  - Various ede extensions
    - ant
    - maven
    - compdb
    - android
    - java-root
    - arduino
    - lein2
  - parts of db:
    - db-cscope
    - db-mozrepl
    - db-javap
    - db-mk
  - support for ectags:
    - ectags/util
    - ectags/lang2
    - ectags/parse
    - ectags/lang
    - ectags/db
  - more bovine parsers:
    - clang
    - f90
    - erlang
  - canned configs
  - db-search



^ permalink raw reply	[flat|nested] 153+ messages in thread
* Re: CEDET merge
@ 2012-10-02  2:44 Dmitry Gutov
  2012-10-02  5:05 ` Chong Yidong
  0 siblings, 1 reply; 153+ messages in thread
From: Dmitry Gutov @ 2012-10-02  2:44 UTC (permalink / raw)
  To: cyd; +Cc: eric, deng, emacs-devel

Chong Yidong <cyd@gnu.org> writes:
 > I've done the merge, omitting senator and the defadvices as you
 > suggested.

Was removing the "Package-Version" header from eieio.el intentional?
It broke some ELPA packages.

Warning (emacs): Unable to activate package `pcache'.
Required package `eieio-1.3' is unavailable
Warning (emacs): Unable to activate package `logito'.
Required package `eieio-1.3' is unavailable
Warning (emacs): Unable to activate package `gist'.
Required package `eieio-1.3' is unavailable
Warning (emacs): Unable to activate package `gh'.
Required package `eieio-1.3' is unavailable



^ permalink raw reply	[flat|nested] 153+ messages in thread
* Feature freeze on October 1
@ 2012-09-16  1:55 Chong Yidong
  2012-09-16 15:30 ` David Engster
  0 siblings, 1 reply; 153+ messages in thread
From: Chong Yidong @ 2012-09-16  1:55 UTC (permalink / raw)
  To: emacs-devel

The trunk is just about ready to go into feature freeze for the 24.3
release.  We will begin the freeze on October 1, a couple of weeks from
now.  If you are working on a feature that you'd like included in 24.3,
please commit it before October 1 or ask for an extension.

As usual, once the freeze is in effect, please commit only bug fixes to
the trunk, i.e. no new features or non-trivial internals changes.  If
you would like an exception, ask for one on emacs-devel.

Thanks.



^ permalink raw reply	[flat|nested] 153+ messages in thread
* CEDET merge
@ 2009-09-28 15:31 Chong Yidong
  2009-09-28 17:31 ` Ulrich Mueller
                   ` (10 more replies)
  0 siblings, 11 replies; 153+ messages in thread
From: Chong Yidong @ 2009-09-28 15:31 UTC (permalink / raw)
  To: emacs-devel

I have merged most of the CEDET branch into the trunk.  You may need to
bootstrap; please let me know if there are any build failures.

I have done what I can to clean up CEDET to conform to Emacs standards;
if you see anything I missed, please go ahead and make the change.

Currently, the interface to Semantic is via "M-x semantic-mode", and to
EDE via "M-x global-ede-mode"; these should install a "Development" menu
on the menu bar that can be used to enable further features.
Suggestions about improving this interface, and the CEDET integration in
general, are welcome.

(If you want to make bigger changes to the internals of CEDET itself,
please discuss first, because we need to coordinate that kind of change
with upstream.)




^ permalink raw reply	[flat|nested] 153+ messages in thread

end of thread, other threads:[~2017-09-26 18:31 UTC | newest]

Thread overview: 153+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-12 19:32 CEDET Merge Edward John Steere
2017-01-12 19:45 ` Eli Zaretskii
2017-01-12 20:27   ` Edward John Steere
2017-01-12 20:10 ` Bastian Beischer
2017-01-12 20:40   ` Edward John Steere
2017-01-16 18:45     ` Edward John Steere
2017-01-16 19:30       ` Eli Zaretskii
2017-01-16 19:55         ` Edward John Steere
2017-01-16 20:06           ` Eli Zaretskii
2017-01-16 20:12             ` Edward John Steere
2017-01-17 15:59               ` Eli Zaretskii
2017-01-17 16:10                 ` Edward John Steere
2017-01-17 16:36                   ` Stephen Leake
2017-01-17 20:36                     ` Edward John Steere
2017-01-17 21:22                       ` Stephen Leake
2017-01-17 21:23                       ` David Engster
2017-01-18 10:12                         ` Edward Steere
2017-01-18 22:05                           ` David Engster
2017-01-19 18:01                             ` Edward John Steere
2017-01-19 21:57                               ` David Engster
2017-01-19 22:29                                 ` Karl Fogel
2017-01-20 22:20                                   ` David Engster
2017-01-20 22:40                                     ` Stefan Monnier
2017-01-20 22:57                                       ` David Engster
2017-01-21  0:08                                         ` Stefan Monnier
2017-01-21 12:02                                     ` Eli Zaretskii
2017-01-21 18:29                                       ` Glenn Morris
2017-01-21 18:37                                         ` Eli Zaretskii
2017-01-21 18:52                                           ` Glenn Morris
2017-01-21 19:50                                             ` Eli Zaretskii
2017-01-21 22:57                                               ` Paul Eggert
2017-01-22 16:08                                                 ` Eli Zaretskii
2017-01-22 22:00                                             ` David Engster
2017-01-23  1:37                                               ` Paul Eggert
2017-01-22 21:31                                 ` David Engster
2017-01-24 19:02                                   ` Edward John Steere
2017-01-26 19:54                                     ` Edward John Steere
2017-01-26 21:06                                       ` David Engster
2017-01-27  4:38                                         ` Edward Steere
2017-01-27 20:20                                   ` Edward John Steere
2017-01-27 21:04                                     ` David Engster
2017-01-28  9:23                                       ` Edward John Steere
2017-01-29 21:34                                         ` David Engster
2017-01-31 16:51                                           ` Lars Ingebrigtsen
2017-01-31 18:48                                             ` Ted Zlatanov
2017-01-28 13:45                                       ` Edward John Steere
2017-01-17 21:10                     ` David Engster
2017-01-17 21:25                       ` Stephen Leake
2017-01-16 20:26           ` David Engster
2017-01-16 20:37             ` Edward John Steere
2017-01-16 21:13               ` David Engster
2017-01-17  5:21                 ` Edward Steere
2017-01-17 21:06                   ` David Engster
2017-01-17 21:19                     ` Dmitry Gutov
2017-01-17 21:32                       ` David Engster
2017-01-18  3:10                         ` Lee Hinman
2017-01-18  5:31                           ` Edward John Steere
2017-01-18 12:58                             ` Stephen Leake
2017-01-18 21:57                             ` David Engster
2017-01-19 17:51                               ` Edward John Steere
2017-01-19 20:25                                 ` Lee Hinman
2017-01-29 19:25                                   ` John Wiegley
2017-01-21 18:06                               ` Eric Ludlam
2017-09-23 11:38 ` Charles A. Roelli
2017-09-23 12:55   ` Edward John Steere
2017-09-24  8:24     ` Charles A. Roelli
  -- strict thread matches above, loose matches on Subject: below --
2017-09-26 18:31 Edward John Steere
2012-10-02  2:44 CEDET merge Dmitry Gutov
2012-10-02  5:05 ` Chong Yidong
2012-10-02  5:56   ` David Engster
2012-09-16  1:55 Feature freeze on October 1 Chong Yidong
2012-09-16 15:30 ` David Engster
2012-09-16 19:04   ` Stefan Monnier
2012-09-26 20:24     ` CEDET merge (was: Feature freeze on October 1) David Engster
2012-09-30 13:55       ` CEDET merge David Engster
2012-09-30 14:10         ` David Engster
2012-09-30 18:58         ` Glenn Morris
2012-09-30 19:17           ` Paul Eggert
2012-10-01  0:16             ` Glenn Morris
2012-10-01  3:44         ` Chong Yidong
2012-10-01 11:44           ` Eric M. Ludlam
2012-10-01 15:17           ` David Engster
2012-10-01 17:48             ` Chong Yidong
2012-10-01 17:56               ` Chong Yidong
2012-10-02 15:24               ` Chong Yidong
2012-10-04 19:32         ` David Engster
2012-10-06 11:19           ` Chong Yidong
2012-10-06 11:30             ` David Engster
2012-10-06 14:24               ` Chong Yidong
2012-10-06 14:54                 ` Stefan Monnier
2012-10-06 17:29                   ` David Engster
2012-10-06 18:10                     ` Stefan Monnier
2012-10-07 11:19                       ` David Engster
2012-10-06 23:31                     ` Glenn Morris
2012-10-07  1:15                       ` Glenn Morris
2012-10-07 11:03                         ` David Engster
2012-10-27 14:40                           ` David Engster
2012-10-28 18:50                             ` Glenn Morris
2012-11-17  3:23                               ` Glenn Morris
2012-11-18 15:42                                 ` David Engster
2012-11-20  2:45                                   ` Glenn Morris
2012-11-21 13:09                                   ` Chong Yidong
2012-10-07 20:50                 ` David Engster
2012-11-08 12:32         ` Alex Ott
2009-09-28 15:31 Chong Yidong
2009-09-28 17:31 ` Ulrich Mueller
2009-09-28 17:55   ` Chong Yidong
2009-09-28 18:42     ` Ulrich Mueller
2009-09-28 19:30       ` Chong Yidong
2009-09-28 20:03         ` Ulrich Mueller
2009-09-28 20:20           ` Rupert Swarbrick
2009-09-28 22:16             ` Ulrich Mueller
2009-09-28 17:47 ` Eli Zaretskii
2009-09-28 18:00 ` Eli Zaretskii
2009-09-28 18:25   ` Chong Yidong
2009-09-28 19:23     ` Eli Zaretskii
2009-09-28 19:27       ` Andreas Schwab
2009-09-28 18:20 ` Phil Hagelberg
2009-09-28 22:10   ` Chong Yidong
2009-09-28 22:25     ` Phil Hagelberg
2009-09-30 16:38     ` Phil Hagelberg
2009-09-30 17:29       ` Chong Yidong
2009-09-30 21:43         ` Phil Hagelberg
2009-10-01  1:19           ` Chong Yidong
2009-10-01  3:20             ` Phil Hagelberg
2009-10-01  5:14               ` Phil Hagelberg
2009-10-01  7:07                 ` Stefan Monnier
2009-10-02 17:46                   ` Phil Hagelberg
2009-09-28 19:34 ` Andreas Schwab
2009-09-28 20:20   ` Andreas Schwab
2009-09-28 20:20 ` Alan Mackenzie
2009-09-28 21:57   ` Chong Yidong
2009-09-29  4:28 ` Glenn Morris
2009-09-29 11:28   ` Eric M. Ludlam
2009-09-30  9:32 ` Juanma Barranquero
2009-09-30 18:38   ` Eli Zaretskii
2009-09-30 19:32     ` Juanma Barranquero
2009-09-30 10:29 ` Sascha Wilde
2009-10-01 10:58   ` Sascha Wilde
2009-10-01 11:38     ` Eric M. Ludlam
2009-10-01 12:51       ` Sascha Wilde
2009-10-01 16:28         ` Sascha Wilde
2009-10-03 13:07           ` Eric M. Ludlam
2009-10-03 21:01             ` Sascha Wilde
2009-10-06 16:15               ` Sascha Wilde
2009-10-06 17:51                 ` Chong Yidong
2009-10-03 20:10       ` Chong Yidong
2009-10-03 20:31         ` Eric M. Ludlam
2009-10-04  1:44           ` Chong Yidong
2009-10-04  2:30             ` Eric M. Ludlam
2009-10-04  5:52               ` Chong Yidong
2009-10-01  3:58 ` Miles Bader
2009-10-01 11:31   ` Eric M. Ludlam
2009-10-01 14:48     ` Chong Yidong
2009-10-07  3:43 ` Phil Hagelberg
2009-10-07  5:37   ` Chong Yidong
2009-10-07 16:20     ` Eric M. Ludlam

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.