Re: [PATCH] for review - making use of {EXEEXT} more uniform in makefiles.

[Pete Williamson <petewil@google.com>]

[-- 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