unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH] for review - making use of {EXEEXT} more uniform in makefiles.
@ 2015-02-14  1:20 Pete Williamson
  2015-02-18  2:01 ` Pete Williamson
  0 siblings, 1 reply; 10+ messages in thread
From: Pete Williamson @ 2015-02-14  1:20 UTC (permalink / raw)
  To: emacs-devel

[-- Attachment #1: Type: text/plain, Size: 2410 bytes --]

I humbly submit my first patch for feedback and consideration.  My
apologies in advance if I am not following the proper protocol for a
patch email, I'm new to this (I did look at several other [PATCH]
emails.)

Rationale: I'm porting Emacs to a new platform, and we need to have a
file extension on all
executables for this platform when we run the executables. In several
places in the makefile,
no extension is used.  This catches the places that I ran into, and
uses the {EXEEXT}
extension to make sure the proper file name extension is used to
launch programs by.

Motivating case:
I'm porting Emacs to the Chromebook using the NaCl API, and we need
for executables to have the .nexe extension.  Even when running Emacs
during the build process on the host Linux build machine  (for
instance to create leim-list.el or build documentation), we need the
proper extension so that the machine emulator is not confused.

I have tested this by building and running Emacs on Ubuntu 14 (only),
let me know if it is expected to test in more places.

All feedback and comments are welcome.

The patch file is below, here is a text version of the diff (since it
is a small patch)

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 573acf7..70f2aca 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -47,7 +47,7 @@ unexport EMACSDATA EMACSDOC EMACSPATH

 # Which Emacs to use to convert TIT files to Emacs Lisp files,
 # and generate the file leim-list.el.
-EMACS = ../src/emacs
+EMACS = ../src/emacs{EXEEXT}

 # How to run Emacs.
 # Prevent any setting of EMACSLOADPATH in user environment causing problems.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index d2705e7..d08aac5 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -21,7 +21,7 @@
 SHELL = @SHELL@

 # Following ../lisp/Makefile.in.
-EMACS = ../src/emacs
+EMACS = ../src/emacs{EXEEXT}
 EMACSOPT = -batch --no-site-file --no-site-lisp

 # ==================== Things `configure' will edit ====================
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index e5cfc63..3b0d109 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -47,7 +47,7 @@ am__v_GEN_1 =
 # We never change directory before running Emacs, so a relative file
 # name is fine, and makes life easier.  If we need to change
 # directory, we can use emacs --chdir.
-EMACS = ../src/emacs
+EMACS = ../src/emacs{EXEEXT}

 # Command line flags for Emacs.

[-- Attachment #2: 0001-Use-EXEEXT-more-uniformly-in-makefiles-when-running-.patch --]
[-- Type: text/x-patch, Size: 1859 bytes --]

From 8d8cba85c2e4298e40442069368912e68149fb2f Mon Sep 17 00:00:00 2001
From: Pete Williamson <petewil@chromium.org>
Date: Fri, 13 Feb 2015 16:59:39 -0800
Subject: [PATCH] Use {EXEEXT} more uniformly in makefiles when running
 executables.

When porting Emacs to run on NaCl, we need to make sure that we always
call it with the proper extension (.nexe in this case) during the build,
when Emacs has to run to generate leim-list.el and documentation.
---
 leim/Makefile.in    | 2 +-
 lib-src/Makefile.in | 2 +-
 lisp/Makefile.in    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 573acf7..70f2aca 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -47,7 +47,7 @@ unexport EMACSDATA EMACSDOC EMACSPATH
 
 # Which Emacs to use to convert TIT files to Emacs Lisp files,
 # and generate the file leim-list.el.
-EMACS = ../src/emacs
+EMACS = ../src/emacs{EXEEXT}
 
 # How to run Emacs.
 # Prevent any setting of EMACSLOADPATH in user environment causing problems.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index d2705e7..d08aac5 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -21,7 +21,7 @@
 SHELL = @SHELL@
 
 # Following ../lisp/Makefile.in.
-EMACS = ../src/emacs
+EMACS = ../src/emacs{EXEEXT}
 EMACSOPT = -batch --no-site-file --no-site-lisp
 
 # ==================== Things `configure' will edit ====================
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index e5cfc63..3b0d109 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -47,7 +47,7 @@ am__v_GEN_1 =
 # We never change directory before running Emacs, so a relative file
 # name is fine, and makes life easier.  If we need to change
 # directory, we can use emacs --chdir.
-EMACS = ../src/emacs
+EMACS = ../src/emacs{EXEEXT}
 
 # Command line flags for Emacs.
 
-- 
2.2.0.rc0.207.ga3a616c


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

* Re: [PATCH] for review - making use of {EXEEXT} more uniform in makefiles.
  2015-02-14  1:20 [PATCH] for review - making use of {EXEEXT} more uniform in makefiles Pete Williamson
@ 2015-02-18  2:01 ` Pete Williamson
  2015-02-20 18:49   ` Pete Williamson
  0 siblings, 1 reply; 10+ messages in thread
From: Pete Williamson @ 2015-02-18  2:01 UTC (permalink / raw)
  To: emacs-devel

[-- Attachment #1: Type: text/plain, Size: 2712 bytes --]

Ah, it looks like this isn't compiling properly.  I'll come back with a new
patch when it does.

On Fri, Feb 13, 2015 at 5:20 PM, Pete Williamson <petewil@google.com> wrote:

> I humbly submit my first patch for feedback and consideration.  My
> apologies in advance if I am not following the proper protocol for a
> patch email, I'm new to this (I did look at several other [PATCH]
> emails.)
>
> Rationale: I'm porting Emacs to a new platform, and we need to have a
> file extension on all
> executables for this platform when we run the executables. In several
> places in the makefile,
> no extension is used.  This catches the places that I ran into, and
> uses the {EXEEXT}
> extension to make sure the proper file name extension is used to
> launch programs by.
>
> Motivating case:
> I'm porting Emacs to the Chromebook using the NaCl API, and we need
> for executables to have the .nexe extension.  Even when running Emacs
> during the build process on the host Linux build machine  (for
> instance to create leim-list.el or build documentation), we need the
> proper extension so that the machine emulator is not confused.
>
> I have tested this by building and running Emacs on Ubuntu 14 (only),
> let me know if it is expected to test in more places.
>
> All feedback and comments are welcome.
>
> The patch file is below, here is a text version of the diff (since it
> is a small patch)
>
> diff --git a/leim/Makefile.in b/leim/Makefile.in
> index 573acf7..70f2aca 100644
> --- a/leim/Makefile.in
> +++ b/leim/Makefile.in
> @@ -47,7 +47,7 @@ unexport EMACSDATA EMACSDOC EMACSPATH
>
>  # Which Emacs to use to convert TIT files to Emacs Lisp files,
>  # and generate the file leim-list.el.
> -EMACS = ../src/emacs
> +EMACS = ../src/emacs{EXEEXT}
>
>  # How to run Emacs.
>  # Prevent any setting of EMACSLOADPATH in user environment causing
> problems.
> diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
> index d2705e7..d08aac5 100644
> --- a/lib-src/Makefile.in
> +++ b/lib-src/Makefile.in
> @@ -21,7 +21,7 @@
>  SHELL = @SHELL@
>
>  # Following ../lisp/Makefile.in.
> -EMACS = ../src/emacs
> +EMACS = ../src/emacs{EXEEXT}
>  EMACSOPT = -batch --no-site-file --no-site-lisp
>
>  # ==================== Things `configure' will edit ====================
> diff --git a/lisp/Makefile.in b/lisp/Makefile.in
> index e5cfc63..3b0d109 100644
> --- a/lisp/Makefile.in
> +++ b/lisp/Makefile.in
> @@ -47,7 +47,7 @@ am__v_GEN_1 =
>  # We never change directory before running Emacs, so a relative file
>  # name is fine, and makes life easier.  If we need to change
>  # directory, we can use emacs --chdir.
> -EMACS = ../src/emacs
> +EMACS = ../src/emacs{EXEEXT}
>
>  # Command line flags for Emacs.
>

[-- Attachment #2: Type: text/html, Size: 3255 bytes --]

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

* Re: [PATCH] for review - making use of {EXEEXT} more uniform in makefiles.
  2015-02-18  2:01 ` Pete Williamson
@ 2015-02-20 18:49   ` Pete Williamson
  2015-02-20 20:10     ` Michal Nazarewicz
  0 siblings, 1 reply; 10+ messages in thread
From: Pete Williamson @ 2015-02-20 18:49 UTC (permalink / raw)
  To: emacs-devel


[-- Attachment #1.1: Type: text/plain, Size: 2961 bytes --]

OK, Here is a corrected patch.  I would be grateful for any and all
comments.

Thanks!

On Tue, Feb 17, 2015 at 6:01 PM, Pete Williamson <petewil@google.com> wrote:

> Ah, it looks like this isn't compiling properly.  I'll come back with a
> new patch when it does.
>
> On Fri, Feb 13, 2015 at 5:20 PM, Pete Williamson <petewil@google.com>
> wrote:
>
>> I humbly submit my first patch for feedback and consideration.  My
>> apologies in advance if I am not following the proper protocol for a
>> patch email, I'm new to this (I did look at several other [PATCH]
>> emails.)
>>
>> Rationale: I'm porting Emacs to a new platform, and we need to have a
>> file extension on all
>> executables for this platform when we run the executables. In several
>> places in the makefile,
>> no extension is used.  This catches the places that I ran into, and
>> uses the {EXEEXT}
>> extension to make sure the proper file name extension is used to
>> launch programs by.
>>
>> Motivating case:
>> I'm porting Emacs to the Chromebook using the NaCl API, and we need
>> for executables to have the .nexe extension.  Even when running Emacs
>> during the build process on the host Linux build machine  (for
>> instance to create leim-list.el or build documentation), we need the
>> proper extension so that the machine emulator is not confused.
>>
>> I have tested this by building and running Emacs on Ubuntu 14 (only),
>> let me know if it is expected to test in more places.
>>
>> All feedback and comments are welcome.
>>
>> The patch file is below, here is a text version of the diff (since it
>> is a small patch)
>>
>> diff --git a/leim/Makefile.in b/leim/Makefile.in
>> index 573acf7..70f2aca 100644
>> --- a/leim/Makefile.in
>> +++ b/leim/Makefile.in
>> @@ -47,7 +47,7 @@ unexport EMACSDATA EMACSDOC EMACSPATH
>>
>>  # Which Emacs to use to convert TIT files to Emacs Lisp files,
>>  # and generate the file leim-list.el.
>> -EMACS = ../src/emacs
>> +EMACS = ../src/emacs{EXEEXT}
>>
>>  # How to run Emacs.
>>  # Prevent any setting of EMACSLOADPATH in user environment causing
>> problems.
>> diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
>> index d2705e7..d08aac5 100644
>> --- a/lib-src/Makefile.in
>> +++ b/lib-src/Makefile.in
>> @@ -21,7 +21,7 @@
>>  SHELL = @SHELL@
>>
>>  # Following ../lisp/Makefile.in.
>> -EMACS = ../src/emacs
>> +EMACS = ../src/emacs{EXEEXT}
>>  EMACSOPT = -batch --no-site-file --no-site-lisp
>>
>>  # ==================== Things `configure' will edit ====================
>> diff --git a/lisp/Makefile.in b/lisp/Makefile.in
>> index e5cfc63..3b0d109 100644
>> --- a/lisp/Makefile.in
>> +++ b/lisp/Makefile.in
>> @@ -47,7 +47,7 @@ am__v_GEN_1 =
>>  # We never change directory before running Emacs, so a relative file
>>  # name is fine, and makes life easier.  If we need to change
>>  # directory, we can use emacs --chdir.
>> -EMACS = ../src/emacs
>> +EMACS = ../src/emacs{EXEEXT}
>>
>>  # Command line flags for Emacs.
>>
>
>

[-- Attachment #1.2: Type: text/html, Size: 3798 bytes --]

[-- Attachment #2: 0001-Use-EXEEXT-more-uniformly-in-makefiles-when-running-.patch --]
[-- Type: text/x-patch, Size: 1863 bytes --]

From 6329df655614bee06536d0dab0da7ac1108f51d9 Mon Sep 17 00:00:00 2001
From: Pete Williamson <petewil@chromium.org>
Date: Fri, 13 Feb 2015 16:59:39 -0800
Subject: [PATCH 1/2] Use {EXEEXT} more uniformly in makefiles when running
 executables.

When porting Emacs to run on NaCl, we need to make sure that we always
call it with the proper extension (.nexe in this case) during the build,
when Emacs has to run to generate leim-list.el and documentation.
---
 leim/Makefile.in    | 2 +-
 lib-src/Makefile.in | 2 +-
 lisp/Makefile.in    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 573acf7..70f2aca 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -47,7 +47,7 @@ unexport EMACSDATA EMACSDOC EMACSPATH
 
 # Which Emacs to use to convert TIT files to Emacs Lisp files,
 # and generate the file leim-list.el.
-EMACS = ../src/emacs
+EMACS = ../src/emacs{EXEEXT}
 
 # How to run Emacs.
 # Prevent any setting of EMACSLOADPATH in user environment causing problems.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index d2705e7..d08aac5 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -21,7 +21,7 @@
 SHELL = @SHELL@
 
 # Following ../lisp/Makefile.in.
-EMACS = ../src/emacs
+EMACS = ../src/emacs{EXEEXT}
 EMACSOPT = -batch --no-site-file --no-site-lisp
 
 # ==================== Things `configure' will edit ====================
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index e5cfc63..3b0d109 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -47,7 +47,7 @@ am__v_GEN_1 =
 # We never change directory before running Emacs, so a relative file
 # name is fine, and makes life easier.  If we need to change
 # directory, we can use emacs --chdir.
-EMACS = ../src/emacs
+EMACS = ../src/emacs{EXEEXT}
 
 # Command line flags for Emacs.
 
-- 
2.2.0.rc0.207.ga3a616c


[-- Attachment #3: 0002-Fix-build.patch --]
[-- Type: text/x-patch, Size: 1622 bytes --]

From 549b2e8b31286bd10e40115608a86d4f7e408e76 Mon Sep 17 00:00:00 2001
From: Pete Williamson <petewil@chromium.org>
Date: Fri, 20 Feb 2015 10:34:16 -0800
Subject: [PATCH 2/2] Fix build

---
 leim/Makefile.in    | 2 +-
 lib-src/Makefile.in | 2 +-
 lisp/Makefile.in    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 70f2aca..2ec03db 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -47,7 +47,7 @@ unexport EMACSDATA EMACSDOC EMACSPATH
 
 # Which Emacs to use to convert TIT files to Emacs Lisp files,
 # and generate the file leim-list.el.
-EMACS = ../src/emacs{EXEEXT}
+EMACS = ../src/emacs${EXEEXT}
 
 # How to run Emacs.
 # Prevent any setting of EMACSLOADPATH in user environment causing problems.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index d08aac5..6b5d379 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -21,7 +21,7 @@
 SHELL = @SHELL@
 
 # Following ../lisp/Makefile.in.
-EMACS = ../src/emacs{EXEEXT}
+EMACS = ../src/emacs${EXEEXT}
 EMACSOPT = -batch --no-site-file --no-site-lisp
 
 # ==================== Things `configure' will edit ====================
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 3b0d109..22d5ddc 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -47,7 +47,7 @@ am__v_GEN_1 =
 # We never change directory before running Emacs, so a relative file
 # name is fine, and makes life easier.  If we need to change
 # directory, we can use emacs --chdir.
-EMACS = ../src/emacs{EXEEXT}
+EMACS = ../src/emacs${EXEEXT}
 
 # Command line flags for Emacs.
 
-- 
2.2.0.rc0.207.ga3a616c


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

* Re: [PATCH] for review - making use of {EXEEXT} more uniform in makefiles.
  2015-02-20 18:49   ` Pete Williamson
@ 2015-02-20 20:10     ` Michal Nazarewicz
  2015-02-20 20:31       ` Paul Eggert
  0 siblings, 1 reply; 10+ messages in thread
From: Michal Nazarewicz @ 2015-02-20 20:10 UTC (permalink / raw)
  To: Pete Williamson, emacs-devel

On Fri, Feb 20 2015, Pete Williamson wrote:
> OK, Here is a corrected patch.  I would be grateful for any and all
> comments.

Seems to compile with:

    make distclean
    ./autogen.sh
    ./configure --with-x-toolkit=no --without-toolkit-scroll-bars \
        --without-dbus --without-gconf --without-gsettings \
        --without-selinux --with-x --enable-link-time-optimization
    make -j8 bootstrap
    make -j8

Unless there are some concerns I’ll push the fixed patch on Monday.

-- 
Best regards,                                         _     _
.o. | Liege of Serenely Enlightened Majesty of      o' \,=./ `o
..o | Computer Science,  Michał “mina86” Nazarewicz    (o o)
ooo +--<mpn@google.com>--<xmpp:mina86@jabber.org>--ooO--(_)--Ooo--



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

* Re: [PATCH] for review - making use of {EXEEXT} more uniform in makefiles.
  2015-02-20 20:10     ` Michal Nazarewicz
@ 2015-02-20 20:31       ` Paul Eggert
  2015-02-20 21:58         ` Przemysław Wojnowski
  2015-02-23 17:55         ` Pete Williamson
  0 siblings, 2 replies; 10+ messages in thread
From: Paul Eggert @ 2015-02-20 20:31 UTC (permalink / raw)
  To: Michal Nazarewicz, Pete Williamson, emacs-devel

Michal Nazarewicz wrote:
> Unless there are some concerns I’ll push the fixed patch on Monday.

It's missing a ChangeLog entry and a commit message.  Could you please construct 
a single combined patch (rather than two), and generate it with the command 'git 
format-patch', and attach it to a followup email?   For an example of an email 
containing such a patch, please see:

http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00909.html



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

* Re: [PATCH] for review - making use of {EXEEXT} more uniform in makefiles.
  2015-02-20 20:31       ` Paul Eggert
@ 2015-02-20 21:58         ` Przemysław Wojnowski
  2015-02-20 22:27           ` Paul Eggert
  2015-02-23 17:55         ` Pete Williamson
  1 sibling, 1 reply; 10+ messages in thread
From: Przemysław Wojnowski @ 2015-02-20 21:58 UTC (permalink / raw)
  To: Paul Eggert, emacs-devel

Is a ChangeLog entry needed when a patch touches only the tests?

W dniu 20.02.2015 o 21:31, Paul Eggert pisze:
> Michal Nazarewicz wrote:
>> Unless there are some concerns I’ll push the fixed patch on Monday.
> 
> It's missing a ChangeLog entry and a commit message.  Could you please construct
> a single combined patch (rather than two), and generate it with the command 'git
> format-patch', and attach it to a followup email?   For an example of an email
> containing such a patch, please see:
> 
> http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00909.html
> 



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

* Re: [PATCH] for review - making use of {EXEEXT} more uniform in makefiles.
  2015-02-20 21:58         ` Przemysław Wojnowski
@ 2015-02-20 22:27           ` Paul Eggert
  0 siblings, 0 replies; 10+ messages in thread
From: Paul Eggert @ 2015-02-20 22:27 UTC (permalink / raw)
  To: Przemysław Wojnowski, emacs-devel

Przemysław Wojnowski wrote:
> Is a ChangeLog entry needed when a patch touches only the tests?

When in doubt about ChangeLogs, the answer is "yes". :-)

Generally speaking, git commit messages should use ChangeLog format, and a patch 
that changes tests should have ChangeLog entries.  See, for example, commit 
e7d21b4ab11e73c709420eeeb32ffe2421fafe98 here:

http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=e7d21b4ab11e73c709420eeeb32ffe2421fafe98



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

* Re: [PATCH] for review - making use of {EXEEXT} more uniform in makefiles.
  2015-02-20 20:31       ` Paul Eggert
  2015-02-20 21:58         ` Przemysław Wojnowski
@ 2015-02-23 17:55         ` Pete Williamson
  2015-02-23 18:17           ` Michal Nazarewicz
  2015-02-23 18:20           ` Paul Eggert
  1 sibling, 2 replies; 10+ messages in thread
From: Pete Williamson @ 2015-02-23 17:55 UTC (permalink / raw)
  To: Paul Eggert; +Cc: Michal Nazarewicz, emacs-devel


[-- Attachment #1.1: Type: text/plain, Size: 679 bytes --]

Here is a single combined patch, with a change log entry.

Thanks, Paul for your comments!  All comments welcome!



On Fri, Feb 20, 2015 at 12:31 PM, Paul Eggert <eggert@cs.ucla.edu> wrote:

> Michal Nazarewicz wrote:
>
>> Unless there are some concerns I’ll push the fixed patch on Monday.
>>
>
> It's missing a ChangeLog entry and a commit message.  Could you please
> construct a single combined patch (rather than two), and generate it with
> the command 'git format-patch', and attach it to a followup email?   For an
> example of an email containing such a patch, please see:
>
> http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00909.html
>

[-- Attachment #1.2: Type: text/html, Size: 1283 bytes --]

[-- Attachment #2: 0001-Use-EXEEXT-more-uniformly-in-makefiles-when-running-.patch --]
[-- Type: text/x-patch, Size: 2320 bytes --]

From 1f2133ca8a968a40a04216bffbbbbcebebe2c72b Mon Sep 17 00:00:00 2001
From: Pete Williamson <petewil@chromium.org>
Date: Fri, 20 Feb 2015 17:44:42 -0800
Subject: [PATCH] Use {EXEEXT} more uniformly in makefiles when running
 executables.

When porting Emacs to run on NaCl, we need to make sure that we always
call it with the proper extension (.nexe in this case) during the build,
when Emacs has to run to generate leim-list.el and documentation.
---
 ChangeLog           | 4 ++++
 leim/Makefile.in    | 2 +-
 lib-src/Makefile.in | 2 +-
 lisp/Makefile.in    | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4365668..98b68ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-20 Pete Williamson <petewil0@googlemail.com>
+	* Makefile.in - Use the {EXEEXT} environment variable more uniformly
+	to make sure that the emacs binary is used with the proper extension.
+
 2015-02-13  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* configure.ac: Set locallisppath to empty for NS self contained,
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 573acf7..2ec03db 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -47,7 +47,7 @@ unexport EMACSDATA EMACSDOC EMACSPATH
 
 # Which Emacs to use to convert TIT files to Emacs Lisp files,
 # and generate the file leim-list.el.
-EMACS = ../src/emacs
+EMACS = ../src/emacs${EXEEXT}
 
 # How to run Emacs.
 # Prevent any setting of EMACSLOADPATH in user environment causing problems.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index d2705e7..6b5d379 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -21,7 +21,7 @@
 SHELL = @SHELL@
 
 # Following ../lisp/Makefile.in.
-EMACS = ../src/emacs
+EMACS = ../src/emacs${EXEEXT}
 EMACSOPT = -batch --no-site-file --no-site-lisp
 
 # ==================== Things `configure' will edit ====================
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index e5cfc63..22d5ddc 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -47,7 +47,7 @@ am__v_GEN_1 =
 # We never change directory before running Emacs, so a relative file
 # name is fine, and makes life easier.  If we need to change
 # directory, we can use emacs --chdir.
-EMACS = ../src/emacs
+EMACS = ../src/emacs${EXEEXT}
 
 # Command line flags for Emacs.
 
-- 
2.2.0.rc0.207.ga3a616c


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

* Re: [PATCH] for review - making use of {EXEEXT} more uniform in makefiles.
  2015-02-23 17:55         ` Pete Williamson
@ 2015-02-23 18:17           ` Michal Nazarewicz
  2015-02-23 18:20           ` Paul Eggert
  1 sibling, 0 replies; 10+ messages in thread
From: Michal Nazarewicz @ 2015-02-23 18:17 UTC (permalink / raw)
  To: Pete Williamson; +Cc: Paul Eggert, emacs-devel

On Mon, Feb 23 2015, Pete Williamson <petewil@google.com> wrote:
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,7 @@
> +2015-02-20 Pete Williamson <petewil0@googlemail.com>

This email address disagrees with commit’s author.  It makes more sense
to use the same in both places, so which one do you prefer?

> +	* Makefile.in - Use the {EXEEXT} environment variable more uniformly

This should actually be:

+	* Makefile.in: Use the {EXEEXT} environment variable more uniformly

Note colon instead of a hyphen.

> +	to make sure that the emacs binary is used with the proper extension.
> +
>  2015-02-13  Jan Djärv  <jan.h.d@swipnet.se>
>  
>  	* configure.ac: Set locallisppath to empty for NS self contained,

Actually you do not edit Makefile.in in the root directory so ChangeLog
entry in root ChangeLog is invalid.  Instead, you need to repeat the
entry in directories where you did modify Makefile.in files.  Yeah,
I know, I hate ChangeLog files too. ;)

Anyway, I have a commit ready with all that fixed, so no need to resend
a next one, just let me know which email address you want to use.

> diff --git a/leim/Makefile.in b/leim/Makefile.in
> index 573acf7..2ec03db 100644
> --- a/leim/Makefile.in
> +++ b/leim/Makefile.in
> @@ -47,7 +47,7 @@ unexport EMACSDATA EMACSDOC EMACSPATH
>  
>  # Which Emacs to use to convert TIT files to Emacs Lisp files,
>  # and generate the file leim-list.el.
> -EMACS = ../src/emacs
> +EMACS = ../src/emacs${EXEEXT}
>  
>  # How to run Emacs.
>  # Prevent any setting of EMACSLOADPATH in user environment causing problems.
> diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
> index d2705e7..6b5d379 100644
> --- a/lib-src/Makefile.in
> +++ b/lib-src/Makefile.in
> @@ -21,7 +21,7 @@
>  SHELL = @SHELL@
>  
>  # Following ../lisp/Makefile.in.
> -EMACS = ../src/emacs
> +EMACS = ../src/emacs${EXEEXT}
>  EMACSOPT = -batch --no-site-file --no-site-lisp
>  
>  # ==================== Things `configure' will edit ====================
> diff --git a/lisp/Makefile.in b/lisp/Makefile.in
> index e5cfc63..22d5ddc 100644
> --- a/lisp/Makefile.in
> +++ b/lisp/Makefile.in
> @@ -47,7 +47,7 @@ am__v_GEN_1 =
>  # We never change directory before running Emacs, so a relative file
>  # name is fine, and makes life easier.  If we need to change
>  # directory, we can use emacs --chdir.
> -EMACS = ../src/emacs
> +EMACS = ../src/emacs${EXEEXT}
>  
>  # Command line flags for Emacs.
>  

-- 
Best regards,                                         _     _
.o. | Liege of Serenely Enlightened Majesty of      o' \,=./ `o
..o | Computer Science,  Michał “mina86” Nazarewicz    (o o)
ooo +--<mpn@google.com>--<xmpp:mina86@jabber.org>--ooO--(_)--Ooo--



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

* Re: [PATCH] for review - making use of {EXEEXT} more uniform in makefiles.
  2015-02-23 17:55         ` Pete Williamson
  2015-02-23 18:17           ` Michal Nazarewicz
@ 2015-02-23 18:20           ` Paul Eggert
  1 sibling, 0 replies; 10+ messages in thread
From: Paul Eggert @ 2015-02-23 18:20 UTC (permalink / raw)
  To: Pete Williamson; +Cc: Michal Nazarewicz, emacs-devel

[-- Attachment #1: Type: text/plain, Size: 687 bytes --]

Thanks, I installed the attached patch into Emacs master.  It's the same 
as your patch, but with the ChangeLogs redone to match our current 
style.  (Admittedly our current ChangeLog style is complex; on my list 
of things to do is simplify this; please see <http://bugs.gnu.org/19113>.)

This patch is small enough that it can be installed as a tiny change 
without copyright papers (and that's why it's marked "(tiny change)" in 
the attached patch).  If you would like to get more changes installed in 
the future, would you be willing to jump through the copyright-paperwork 
hoops?  If so, please reply privately and I'll send you the info needed 
to get the ball rolling on that.

[-- Attachment #2: exeext.patch --]
[-- Type: text/x-patch, Size: 2568 bytes --]

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 4bda9a6..a8dbca2 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-23  Pete Williamson  <petewil0@googlemail.com>  (tiny change)
+
+	Use ${EXEEXT} more uniformly in makefiles
+	When porting Emacs to run on NaCl, we need to make sure that we always
+	call it with the proper extension (.nexe in this case) during the build.
+	* Makefile.in (EMACS): Append ${EXEEXT}.
+
 2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Less 'make' chatter for leim
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 573acf7..2ec03db 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -47,7 +47,7 @@ unexport EMACSDATA EMACSDOC EMACSPATH
 
 # Which Emacs to use to convert TIT files to Emacs Lisp files,
 # and generate the file leim-list.el.
-EMACS = ../src/emacs
+EMACS = ../src/emacs${EXEEXT}
 
 # How to run Emacs.
 # Prevent any setting of EMACSLOADPATH in user environment causing problems.
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 4ac9638..5c55bce 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-23  Pete Williamson  <petewil0@googlemail.com>  (tiny change)
+
+	Use ${EXEEXT} more uniformly in makefiles
+	* Makefile.in (EMACS): Append ${EXEEXT}.
+
 2015-02-20  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Simplify binary I/O configuration
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index d2705e7..6b5d379 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -21,7 +21,7 @@
 SHELL = @SHELL@
 
 # Following ../lisp/Makefile.in.
-EMACS = ../src/emacs
+EMACS = ../src/emacs${EXEEXT}
 EMACSOPT = -batch --no-site-file --no-site-lisp
 
 # ==================== Things `configure' will edit ====================
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c22ed2..d401852 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-23  Pete Williamson  <petewil0@googlemail.com>  (tiny change)
+
+	Use ${EXEEXT} more uniformly in makefiles
+	* Makefile.in (EMACS): Append ${EXEEXT}.
+
 2015-02-23  Sam Steingold  <sds@gnu.org>
 
 	* files.el (recover-session): Handle `auto-save-list-file-prefix'
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index e5cfc63..22d5ddc 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -47,7 +47,7 @@ am__v_GEN_1 =
 # We never change directory before running Emacs, so a relative file
 # name is fine, and makes life easier.  If we need to change
 # directory, we can use emacs --chdir.
-EMACS = ../src/emacs
+EMACS = ../src/emacs${EXEEXT}
 
 # Command line flags for Emacs.
 

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

end of thread, other threads:[~2015-02-23 18:20 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-14  1:20 [PATCH] for review - making use of {EXEEXT} more uniform in makefiles Pete Williamson
2015-02-18  2:01 ` Pete Williamson
2015-02-20 18:49   ` Pete Williamson
2015-02-20 20:10     ` Michal Nazarewicz
2015-02-20 20:31       ` Paul Eggert
2015-02-20 21:58         ` Przemysław Wojnowski
2015-02-20 22:27           ` Paul Eggert
2015-02-23 17:55         ` Pete Williamson
2015-02-23 18:17           ` Michal Nazarewicz
2015-02-23 18:20           ` Paul Eggert

Code repositories for project(s) associated with this public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).