From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Edward John Steere Newsgroups: gmane.emacs.devel Subject: Re: CEDET Merge Date: Mon, 16 Jan 2017 20:45:01 +0200 Message-ID: <87inpelu8i.fsf@gmail.com> References: <87r348ul9n.fsf@gmail.com> <87lgugm2qg.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1484592342 24187 195.159.176.226 (16 Jan 2017 18:45:42 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 16 Jan 2017 18:45:42 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) To: Emacs-Devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 16 19:45:36 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cTCHc-0005at-2z for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2017 19:45:32 +0100 Original-Received: from localhost ([::1]:58902 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTCHg-0007Yv-Nz for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2017 13:45:36 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49499) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTCHa-0007Yd-1I for emacs-devel@gnu.org; Mon, 16 Jan 2017 13:45:31 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cTCHV-0005uO-4g for emacs-devel@gnu.org; Mon, 16 Jan 2017 13:45:30 -0500 Original-Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]:38264) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cTCHU-0005ty-TR for emacs-devel@gnu.org; Mon, 16 Jan 2017 13:45:25 -0500 Original-Received: by mail-wm0-x234.google.com with SMTP id r144so188027968wme.1 for ; Mon, 16 Jan 2017 10:45:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version; bh=mu7auRAxY64gz6qlU1FWNju/GSxeEOe4P7lxweA3zXM=; b=jiEndrfxJ61aPaXa2zE/y8oPlzITVqUJiruv0RU6lUpbmxk+r+ZZsy32yH1SuUap9r 1IeKgQvRnXel9q6YYwKzopppY/WCQfH9u9lb8tygyU1IN6nthYWevqP+c0lX+8hVq5dt NxMBaRhfpAYvZ2AAyLhk5plV5IJE8xhqRq/S9+0prF3nAWJ31wC414utt//llur21MPH BVCGJ1n04V2KUgOPbQoYrf2mfc8ivuc/8RaOQ1fjwHNybUQXjUNfvYHQWe/7pmbti8La CiATkIegV9aF+X2rfcRxbVpjFlaAgV3lS2tn9v0chAz47UliTOfw9URV5ZX9NYZlOQ/2 n+Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references :user-agent:date:message-id:mime-version; bh=mu7auRAxY64gz6qlU1FWNju/GSxeEOe4P7lxweA3zXM=; b=fh7YLJNUhzK1VNAwvIy3Rgge8PiKXi/oRpotuDEwdDb/1gPlmcNrgiQgVP0uI8xvuR 566pi2hV+vPYDeiSqrj0lYzn9HxDho+4Zmrv3qK5WgRjTryoJFOY1BVq3hYn08i9d2sb QZ0ozA+3dhvpHilVSK71BFeM1TPlAR7TZXkYrt0Y6fDoWXavuZP4g3erCMJ4EPrJguhE vZR9Efo9seUIuJcjczXSQgi7O2qBzYlqTP4FVyvsUjv/4hHgQ+jyWCAeYoUgxHejuEcl ltMX9f51uiAfbM8V1/y0VBGhe3g9aPLH+5OySlwV2eq5AiXDH/yKmsPzJHBfXDhAnYZq tORA== X-Gm-Message-State: AIkVDXJ13P+EKeioPdHiWQYAPCVzdBNSRTfQi5807EV+LJ64HPLr2qVHy7MDgjAEPrmjrg== X-Received: by 10.28.226.67 with SMTP id z64mr12429975wmg.137.1484592321956; Mon, 16 Jan 2017 10:45:21 -0800 (PST) Original-Received: from edward ([41.193.194.172]) by smtp.gmail.com with ESMTPSA id c9sm30149445wmi.16.2017.01.16.10.45.19 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Jan 2017 10:45:20 -0800 (PST) In-Reply-To: <87lgugm2qg.fsf@gmail.com> (Edward John Steere's message of "Thu, 12 Jan 2017 22:40:07 +0200") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::234 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:211330 Archived-At: > Hi Bastian, > >> It's great to hear that you have been working on this. I'm also very >> interested in getting CEDET upstream and CEDET in emacs synchronized >> again. Please see also this bug report: >> >> https://debbugs.gnu.org/cgi/bugreport.cgi?bug=23792 > > I remember seeing your post a while ago, but had forgotten about it. > I'll take a look now. > >> This also contains a patch for the emacs sources which I've come up >> with half a year ago, but it's probably incomplete and even wrong in >> places. But maybe we can compare what we did. >> >> Do you have a git repository cloned from CEDET upstream which contains >> your work somewhere? Or did you start by modifying the built-in CEDET >> in emacs? > > I tried various approaches (with varying degrees of success) before > going for something rather brute force: I diffed every file in CEDET > from Emacs core to it's corresponding file in upstream (creating a diff > file per file-pair) and applied the changes to upstream by hand. > > At the moment my changes are living on a private repository. I'd like > to do some tidying up with regards to commits before I make them > available. I'll get to work on that tomorrow. > >> Cheers >> Bastian > > Kind regards, > > Edward Steere Hi All, Please may I have some advice. I've been trying to get my change merged into Emacs core locally, and have had little (read no) success. These are the approaches I've tried so far (not verbatim): 1. git remote add ~/wip/cedet cedet && git merge --allow-unrelated-histories etc. 2. git subtree (not the right model because Cedet mirrors the layout of sources in Emacs core) 3. rm -rf ~/wip/emacs/lisp/cedet && cp ~/wip/cedet/lisp/cedet ~/wip/emacs/cedet I've opted for option 3 because I realised that I'd already done the merge in the other direction and now the state of that branch should be exactly reflected in core. However, when I try to bootstrap Emacs I get errors when loading loaddefs.el in lisp/. It complains about eieio-defclass-autoload being undefined -- which is fair enough because that's only autoloaded later, removing the class autoloads which caused the autoloads to be added produces the same error for ede-project-autoload. In the interests of seeing how far I could go before completely bombing out I removed this autoload as well and I was confronted with another autoload error, this time in the `jka' compression library (!?) What follows is the error with a few lines before it for context (you can substitute the void variable error with a similar function is void error for an idea of how the previous two errors looked): make[3]: Leaving directory '/home/edward/emacs/leim' LC_ALL=C ./temacs -batch -l loadup dump Loading loadup.el (source)... Using load-path (/home/edward/emacs/lisp) Loading emacs-lisp/byte-run... Loading emacs-lisp/backquote... Loading subr... Loading version... Loading widget... Loading custom... Loading emacs-lisp/map-ynp... Loading international/mule... Loading international/mule-conf... Loading env... Loading format... Loading bindings... Loading window... Loading files... Loading emacs-lisp/macroexp... Loading cus-face... Loading faces... Loading button... Loading loaddefs.el (source)... Symbol's value as variable is void: jka-compr-load-suffixes Makefile:546: recipe for target 'emacs' failed make[2]: *** [emacs] Error 255 make[2]: Leaving directory '/home/edward/emacs/src' Makefile:409: recipe for target 'src' failed make[1]: *** [src] Error 2 make[1]: Leaving directory '/home/edward/emacs' Makefile:1123: recipe for target 'bootstrap-build' failed make: *** [bootstrap-build] Error 2 I would greatly appreciate any advice with regards to the best way to debug errors like this in the build process. Kind regards, Edward Steere