[Emacs-diffs] /srv/bzr/emacs/trunk r104150: * nt/configure.bat: Renamed the fusercflags variable to escusercflags

[Ben Key]

------------------------------------------------------------
revno: 104150
committer: Ben Key <address@hidden>
branch nick: trunk
timestamp: Fri 2011-05-06 23:00:12 -0500
message:
  * nt/configure.bat: Renamed the fusercflags variable to escusercflags
  so that the variable name better matches its purpose, to be identical
  to usercflags with the exception that all quotes are escaped by the \
  character.
  
  Renamed the fuserldflags variable to escuserldflags so that the
  variable name better matches its purpose, to be identical to
  userldflags with the exception that all quotes are escaped by the \
  character.
  
  A new ESC_USER_CFLAGS variable is written to config.settings.  This
  variable has the same value as the escusercflags variable.
  
  * nt/gmake.defs, nt/nmake.defs: Added the variable ESC_CFLAGS.  This
  variable is identical to the CFLAGS variable except that it includes
  the new ESC_USER_CFLAGS variable instead of USER_CFLAGS.
  
  * src/makefile.w32-in: The bootstrap-temacs rule now makes use of one
  of two shell specific rules, either bootstrap-temacs-CMD or
  bootstrap-temacs-SH.  The bootstrap-temacs-SH rule is identical to the
  previous implementation of the bootstrap-temacs rule.  The
  bootstrap-temacs-CMD rule is similar to the previous implementation of
  the bootstrap-temacs rule except that it makes use of the ESC_CFLAGS
  variable instead of the CFLAGS variable.
  
  
  These changes are required to extend my earlier fix to add support for
  --cflags and --ldflags options that include quotes so that it works
  whether make uses cmd or sh as the shell.
modified:
  nt/ChangeLog
  nt/configure.bat
  nt/gmake.defs
  nt/nmake.defs
  src/ChangeLog
  src/makefile.w32-in

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2011-05-06 12:09:08 +0000
+++ b/nt/ChangeLog      2011-05-07 04:00:12 +0000
@@ -1,3 +1,27 @@
+2011-05-07  Ben Key  <address@hidden>
+
+       * configure.bat: Renamed the fusercflags variable to escusercflags
+       so that the variable name better matches its purpose, to be
+       identical to usercflags with the exception that all quotes are
+       escaped by the \ character.
+
+       Renamed the fuserldflags variable to escuserldflags so that the
+       variable name better matches its purpose, to be identical to
+       userldflags with the exception that all quotes are escaped by
+       the \ character.
+
+       A new ESC_USER_CFLAGS variable is written to config.settings.
+       This variable has the same value as the escusercflags variable.
+
+       * gmake.defs, nmake.defs: Added the variable ESC_CFLAGS.  This
+       variable is identical to the CFLAGS variable except that it
+       includes the new ESC_USER_CFLAGS variable instead of USER_CFLAGS.
+
+       These changes, along with some changes to src/makefile.w32-in,
+       are required to extend my earlier fix to add support for
+       --cflags and --ldflags options that include quotes so that it
+       works whether make uses cmd or sh as the shell.
+
 2011-05-06  Eli Zaretskii  <address@hidden>
 
        * inc/inttypes.h [!__MINGW32__]: Include stdint.h.  Move the

=== modified file 'nt/configure.bat'
--- a/nt/configure.bat  2011-05-05 02:56:16 +0000
+++ b/nt/configure.bat  2011-05-07 04:00:12 +0000
@@ -97,10 +97,10 @@
 set nocygwin=N
 set COMPILER=
 set usercflags=
-set fusercflags=
+set escusercflags=
 set docflags=
 set userldflags=
-set fuserldflags=
+set escuserldflags=
 set extrauserlibs=
 set doldflags=
 set doextralibs=
@@ -240,7 +240,7 @@
 :ucflagex
 shift
 set usercflags=%usercflags%%sep1%%~1
-set fusercflags=%usercflags:"=\"%
+set escusercflags=%usercflags:"=\"%
 set sep1= %nothing%
 shift
 goto again
@@ -248,7 +248,7 @@
 :ucflagne
 shift
 set usercflags=%usercflags%%sep1%%1
-set fusercflags=%usercflags%
+set escusercflags=%usercflags%
 set sep1= %nothing%
 shift
 goto again
@@ -270,7 +270,7 @@
 :ulflagex
 shift
 set userldflags=%userldflags%%sep2%%~1
-set fuserldflags=%userldflags:"=\"%
+set escuserldflags=%userldflags:"=\"%
 set sep2= %nothing%
 shift
 goto again
@@ -278,7 +278,7 @@
 :ulflagne
 shift
 set userldflags=%userldflags%%sep2%%1
-set fuserldflags=%userldflags%
+set escuserldflags=%userldflags%
 set sep2= %nothing%
 shift
 goto again
@@ -443,7 +443,7 @@
 :chkuser
 rm -f junk.o
 echo int main (int argc, char *argv[]) {>junk.c
-echo char *usercflags = "%fusercflags%";>>junk.c
+echo char *usercflags = "%escusercflags%";>>junk.c
 echo }>>junk.c
 echo gcc -Werror -c junk.c >>config.log
 gcc -Werror -c junk.c >>config.log 2>&1
@@ -739,6 +739,7 @@
 rem and the if command cannot cope with this
 for %%v in (%usercflags%) do if not (%%v)==() set docflags=Y
 if (%docflags%)==(Y) echo USER_CFLAGS=%usercflags%>>config.settings
+if (%docflags%)==(Y) echo ESC_USER_CFLAGS=%escusercflags%>>config.settings
 for %%v in (%userldflags%) do if not (%%v)==() set doldflags=Y
 if (%doldflags%)==(Y) echo USER_LDFLAGS=%userldflags%>>config.settings
 for %%v in (%extrauserlibs%) do if not (%%v)==() set doextralibs=Y
@@ -751,8 +752,8 @@
 echo /* Start of settings from configure.bat.  */ >>config.tmp
 rem   We write USER_CFLAGS and USER_LDFLAGS starting with a space to simplify
 rem   processing of compiler options in w32.c:get_emacs_configuration_options
-if (%docflags%) == (Y) echo #define USER_CFLAGS " %fusercflags%">>config.tmp
-if (%doldflags%) == (Y) echo #define USER_LDFLAGS " %fuserldflags%">>config.tmp
+if (%docflags%) == (Y) echo #define USER_CFLAGS " %escusercflags%">>config.tmp
+if (%doldflags%) == (Y) echo #define USER_LDFLAGS " 
%escuserldflags%">>config.tmp
 if (%profile%) == (Y) echo #define PROFILING 1 >>config.tmp
 if not "(%HAVE_PNG%)" == "()" echo #define HAVE_PNG 1 >>config.tmp
 if not "(%HAVE_GNUTLS%)" == "()" echo #define HAVE_GNUTLS 1 >>config.tmp

=== modified file 'nt/gmake.defs'
--- a/nt/gmake.defs     2011-04-28 20:43:23 +0000
+++ b/nt/gmake.defs     2011-05-07 04:00:12 +0000
@@ -206,6 +206,7 @@
 endif
 
 CFLAGS          = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) 
$(PROFILE_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
+ESC_CFLAGS      = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) 
$(PROFILE_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS)
 EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1
 
 ifdef PROFILE

=== modified file 'nt/nmake.defs'
--- a/nt/nmake.defs     2011-01-25 04:08:28 +0000
+++ b/nt/nmake.defs     2011-05-07 04:00:12 +0000
@@ -144,6 +144,8 @@
 
 CFLAGS          = -I. $(ARCH_CFLAGS) \
                  $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(USER_CFLAGS) 
$(LOCAL_FLAGS)
+ESC_CFLAGS      = -I. $(ARCH_CFLAGS) \
+                 $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(ESC_USER_CFLAGS) 
$(LOCAL_FLAGS)
 EMACS_EXTRA_C_FLAGS =
 
 SYS_LDFLAGS    = -nologo -release -incremental:no -version:3.10 -swaprun:cd 
-swaprun:net setargv.obj

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-05-06 22:12:31 +0000
+++ b/src/ChangeLog     2011-05-07 04:00:12 +0000
@@ -1,3 +1,20 @@
+2011-05-07  Ben Key  <address@hidden>
+
+       * makefile.w32-in: The bootstrap-temacs rule now makes use of
+       one of two shell specific rules, either bootstrap-temacs-CMD or
+       bootstrap-temacs-SH.  The bootstrap-temacs-SH rule is identical
+       to the previous implementation of the bootstrap-temacs rule.
+       The bootstrap-temacs-CMD rule is similar to the previous
+       implementation of the bootstrap-temacs rule except that it
+       makes use of the ESC_CFLAGS variable instead of the CFLAGS
+       variable.
+
+       These changes, along with some changes to nt/configure.bat,
+       nt/gmake.defs, and nt/nmake.defs, are required to extend my
+       earlier fix to add support for --cflags and --ldflags options
+       that include quotes so that it works whether make uses cmd or
+       sh as the shell.
+
 2011-05-06  Michael Albinus  <address@hidden>
 
        * dbusbind.c (QCdbus_type_unix_fd): Declare static.

=== modified file 'src/makefile.w32-in'
--- a/src/makefile.w32-in       2011-05-06 15:37:11 +0000
+++ b/src/makefile.w32-in       2011-05-07 04:00:12 +0000
@@ -244,8 +244,14 @@
 #
 # WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
 #          this can break with GNU Make 3.81 and later if sh.exe is used.
+bootstrap-temacs-CMD:
+       $(MAKE) $(MFLAGS) $(XMFLAGS) temacs CFLAGS=$(ARGQUOTE)$(ESC_CFLAGS) 
-DPURESIZE=5000000$(ARGQUOTE)
+
+bootstrap-temacs-SH:
+       $(MAKE) $(MFLAGS) $(XMFLAGS) temacs CFLAGS=$(ARGQUOTE)$(CFLAGS) 
-DPURESIZE=5000000$(ARGQUOTE)
+
 bootstrap-temacs:
-       $(MAKE) $(MFLAGS) $(XMFLAGS) temacs CFLAGS=$(ARGQUOTE)$(CFLAGS) 
-DPURESIZE=5000000$(ARGQUOTE)
+       $(MAKE) $(MFLAGS) bootstrap-temacs-$(SHELLTYPE)
 
 #
 # Dump an Emacs executable named bootstrap-emacs containing the