From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: Why does make run git? Date: Sat, 12 Aug 2017 09:11:48 -0700 Organization: UCLA Computer Science Department Message-ID: <1376de6f-c2ff-78d2-2815-f3e640330af7@cs.ucla.edu> References: <83bmo00yw7.fsf@gnu.org> <6d947774-836a-7286-4214-ddc5f516577f@cs.ucla.edu> <83a83hzuqv.fsf@gnu.org> <02f6233d-b0ef-5a8f-9089-f3fc3496df02@cs.ucla.edu> <8360e5zsxv.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------77A0A89B4DCFC9C4658C32F2" X-Trace: blaine.gmane.org 1502554334 27825 195.159.176.226 (12 Aug 2017 16:12:14 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 12 Aug 2017 16:12:14 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 Cc: emacs-devel@gnu.org, rms@gnu.org, tino.calancha@gmail.com To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Aug 12 18:12:09 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 1dgZ1C-0006jz-8M for ged-emacs-devel@m.gmane.org; Sat, 12 Aug 2017 18:12:06 +0200 Original-Received: from localhost ([::1]:37118 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dgZ1I-0000Fp-LC for ged-emacs-devel@m.gmane.org; Sat, 12 Aug 2017 12:12:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dgZ14-0000Dp-Eb for emacs-devel@gnu.org; Sat, 12 Aug 2017 12:12:00 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dgZ13-0005ZK-22 for emacs-devel@gnu.org; Sat, 12 Aug 2017 12:11:58 -0400 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:51376) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dgZ0y-0005KX-AM; Sat, 12 Aug 2017 12:11:52 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 405B5160850; Sat, 12 Aug 2017 09:11:50 -0700 (PDT) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id lXRTnAxpaYd6; Sat, 12 Aug 2017 09:11:48 -0700 (PDT) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id B5EB8160859; Sat, 12 Aug 2017 09:11:48 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id GAfOehh5ZQFP; Sat, 12 Aug 2017 09:11:48 -0700 (PDT) Original-Received: from [192.168.1.9] (unknown [47.153.184.153]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 7D68D160850; Sat, 12 Aug 2017 09:11:48 -0700 (PDT) In-Reply-To: Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 131.179.128.68 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:217486 Archived-At: This is a multi-part message in MIME format. --------------77A0A89B4DCFC9C4658C32F2 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Paul Eggert wrote: > This is a typo regardless of whether my recently-proposed patch is acce= pted, and=20 > I fixed it with the attached. No further comment after the fix, and as the fix means that the proposed = patch=20 seems to be the right thing to do I installed it, along with a followup c= leanup=20 patch. Both patches are attached. --------------77A0A89B4DCFC9C4658C32F2 Content-Type: text/x-patch; name="0001-Default-autogen.sh-to-all.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-Default-autogen.sh-to-all.patch" =46rom 7518b6a88d1da01066aa2fc7fb59b9308dc4d7e4 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 12 Aug 2017 08:56:52 -0700 Subject: [PATCH 1/2] Default autogen.sh to 'all' This addresses a problem noted by RMS in: http://lists.gnu.org/archive/html/emacs-devel/2017-08/msg00052.html * autogen.sh (do_git): Set to true if this script is invoked with no arguments and there is a .git subdirectory. --- CONTRIBUTE | 2 +- INSTALL.REPO | 2 +- autogen.sh | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTE b/CONTRIBUTE index 365e423..9b5fb09 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -14,7 +14,7 @@ Briefly, the following shell commands build and run Ema= cs from scratch: git config --global transfer.fsckObjects true git clone git://git.sv.gnu.org/emacs.git cd emacs - ./autogen.sh all + ./autogen.sh ./configure make src/emacs diff --git a/INSTALL.REPO b/INSTALL.REPO index ce346bb..e7bb3bb 100644 --- a/INSTALL.REPO +++ b/INSTALL.REPO @@ -19,7 +19,7 @@ To use the autotools, run the following shell command t= o generate the 'configure' script and some related files, and to set up your git configuration: =20 - $ ./autogen.sh all + $ ./autogen.sh =20 You can then configure your build as follows: =20 diff --git a/autogen.sh b/autogen.sh index 76fde9e..70f9cbd 100755 --- a/autogen.sh +++ b/autogen.sh @@ -127,7 +127,8 @@ do_git=3D =20 case $do_autoconf,$do_git in false,false) - do_autoconf=3Dtrue;; + do_autoconf=3Dtrue + test -e .git && do_git=3Dtrue;; esac =20 # Generate Autoconf-related files, if requested. --=20 2.7.4 --------------77A0A89B4DCFC9C4658C32F2 Content-Type: text/x-patch; name="0002-Simplify-re-and-document-autoconf.sh-all.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-Simplify-re-and-document-autoconf.sh-all.patch" =46rom 4c8996ded106007dee26508d23769933fc59a375 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 12 Aug 2017 09:06:55 -0700 Subject: [PATCH 2/2] Simplify re and document 'autoconf.sh all' * GNUmakefile (ALL_IF_GIT): Remove; no longer needed, now that =2E/autogen.sh defaults to "all". All uses removed. * README: Mention autoconf.sh's effect on Git configuration. --- GNUmakefile | 7 ++----- README | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 98d31f4..304a7b3 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -62,13 +62,10 @@ default $(ORDINARY_GOALS): # Execute in sequence, so that multiple user goals don't conflict. .NOTPARALLEL: =20 -# 'all' if a .git subdirectory is present, empty otherwise. -ALL_IF_GIT =3D $(subst .git,all,$(wildcard .git)) - configure: @echo >&2 'There seems to be no "configure" file in this directory.' - @echo >&2 Running ./autogen.sh $(ALL_IF_GIT) ... - ./autogen.sh $(ALL_IF_GIT) + @echo >&2 Running ./autogen.sh ... + ./autogen.sh @echo >&2 '"configure" file built.' =20 Makefile: configure diff --git a/README b/README index 494ee08..527e406 100644 --- a/README +++ b/README @@ -45,7 +45,8 @@ The file 'configure.ac' is the input used by the autoco= nf program to construct the 'configure' script. =20 The shell script 'autogen.sh' generates 'configure' and other files by -running Autoconf, which in turn uses GNU m4. If you want to use it, +running Autoconf (which in turn uses GNU m4), and configures files in +the .git subdirectory if you are using Git. If you want to use it, you will need to install recent versions of these build tools. This should be needed only if you edit files like 'configure.ac' that specify Emacs's autobuild procedure. --=20 2.7.4 --------------77A0A89B4DCFC9C4658C32F2--