From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: CEDET merge (was: Feature freeze on October 1) Date: Wed, 26 Sep 2012 22:24:09 +0200 Message-ID: <87bogsedna.fsf_-_@engster.org> References: <87fw6izq6z.fsf@gnu.org> <87obl6c7dj.fsf@engster.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1348691073 12628 80.91.229.3 (26 Sep 2012 20:24:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 26 Sep 2012 20:24:33 +0000 (UTC) Cc: Chong Yidong , emacs-devel@gnu.org, "Eric M. Ludlam" To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Sep 26 22:24:36 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TGy9l-0005ic-AB for ged-emacs-devel@m.gmane.org; Wed, 26 Sep 2012 22:24:29 +0200 Original-Received: from localhost ([::1]:60114 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGy9g-0007g0-8X for ged-emacs-devel@m.gmane.org; Wed, 26 Sep 2012 16:24:24 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:43078) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGy9d-0007fs-KN for emacs-devel@gnu.org; Wed, 26 Sep 2012 16:24:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGy9c-00081C-AR for emacs-devel@gnu.org; Wed, 26 Sep 2012 16:24:21 -0400 Original-Received: from randomsample.de ([83.169.19.17]:36911) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGy9b-00080C-Tn; Wed, 26 Sep 2012 16:24:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=xNH7NpDFyTDOyN9TJ8cA6bJ2FiPSsLgTkdKBczc9xKw=; b=gfGnzvoLbrwBNlyb7bpTxerDZBD13t6WHs/f2FizxBc+wBvuZkldKU3/FsMI5UJb2EFOlt1Myr8T3i51W3LemDzihJgLUl4Ri8GMnYCcIeCDxsxAfTChpQdCkQBgW1B2; Original-Received: from dslc-082-083-058-053.pools.arcor-ip.net ([82.83.58.53] helo=spaten) by randomsample.de with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1TGy9S-0007EF-0Q; Wed, 26 Sep 2012 22:24:10 +0200 In-Reply-To: (Stefan Monnier's message of "Sun, 16 Sep 2012 15:04:33 -0400") User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.1.50 (gnu/linux) Mail-Followup-To: Stefan Monnier , Chong Yidong , "Eric M. Ludlam" , emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 83.169.19.17 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:153604 Archived-At: Stefan Monnier writes: >> the other way round. I think I should be able to have our 'to-emacs' >> branch ready till October 1st, which could then be merged in. > > This merge is important, yes. Please let us know if you can't make it > for October 1st. I have successfully merged CEDET trunk into the current codebase from Emacs bzr. The result can be seen in the 'to-emacs' branch from CEDET upstream: bzr checkout bzr://cedet.bzr.sourceforge.net/bzrroot/cedet/code/to-emacs To update the Emacs repository, first get a patch by doing cd to-emacs bzr diff -r tag:EMACS_110047.. admin etc lisp > ~/cedet-patch and then simply cd emacs/trunk patch -p0 < ~/cedet-patch It should apply and compile cleanly (only the Python parser is throwing some warnings). Please do not commit this patch yet, since it definitely needs some further testing. My plan is to check the code with our test suite, which will need a few tweaks first to work with stock Emacs, though. A few further comments: - I've restricted myself to the files currently in Emacs trunk, meaning no new files are pulled in. This means, the patch will not introduce new CEDET features like support for Android, Arduino, Fortran 90, the M3 menu, clang completions, etc. - As you can see in the above 'bzr diff' command, I've not yet taken care of the texinfo files. - Then there's the ChangeLog issue... We have a package in CEDET which generates ChangeLogs from our bzr commit logs. I'm not sure if such a fine-grained ChangeLog is necessary for an update like this. Also, I would have to exclude all logs regarding files not in Emacs trunk. - I cannot check for FSF papers, but I've been careful to always ask, and I'm sure the same applies to Eric and others who can commit to CEDET. Still, please double-check. A 'bzr log -n0 -r 8208' will give you a list of the commits from the merge. I'd like to thank Llu=EDs in helping us to get this thing going. I hope this branch is pretty much what he envisioned in the beginning. :-) Also, many thanks go to Aaron Bentley for helping me when I hit a bzr bug during the final merge. -David