nt/msysconfig.sh

nt/msysconfig.sh

[Dani Moncayo]

Hi Eli,

I've noticed that the configure script for MS-Windows, i.e., the file
`nt/msysconfig.sh' is just a call to the main configure script, but
setting a special value to the `CONFIG_SITE' environment variable.

So, I wonder if that setting could be done inside the main configure
script (conditioned to the MSYS environment, obviously), so that we
could get rid of `nt/msysconfig.sh' and thereby make the procedure for
building Emacs on MS-Windows more similar to the GNU/Linux case.

-- 
Dani Moncayo

Re: nt/msysconfig.sh

[Glenn Morris]

Dani Moncayo wrote:

> I've noticed that the configure script for MS-Windows, i.e., the file
> `nt/msysconfig.sh' is just a call to the main configure script, but
> setting a special value to the `CONFIG_SITE' environment variable.
>
> So, I wonder if that setting could be done inside the main configure
> script (conditioned to the MSYS environment, obviously), so that we
> could get rid of `nt/msysconfig.sh' and thereby make the procedure for
> building Emacs on MS-Windows more similar to the GNU/Linux case.

Sounds like it would be better, if it works.

CONFIG_SITE needs to be set before configure runs, so you can't just set
it in configure.ac. Looks like what you would have to do is take the
contents of nt/mingw-cfg.site and insert them in configure.ac just after
the AC_INIT statement.

But it needs to be behind a test for mingw.
You can't use $opsys, because it isn't defined till later.

Maybe that test "$MSYSTEM" = "MINGW32" thing will work, though I don't
know what MSYSTEM is...

If you find something that looks like it should work, test it out with
and without configuring caching turned on, and see if work for you.

Re: nt/msysconfig.sh

[Glenn Morris]

Glenn Morris wrote:

> it in configure.ac. Looks like what you would have to do is take the
> contents of nt/mingw-cfg.site and insert them in configure.ac just after
> the AC_INIT statement.

Or you could just ". $srcdir/nt/mingw-cfg.site" at that point.

Re: nt/msysconfig.sh

[Dani Moncayo]

>> it in configure.ac. Looks like what you would have to do is take the
>> contents of nt/mingw-cfg.site and insert them in configure.ac just after
>> the AC_INIT statement.
>
> Or you could just ". $srcdir/nt/mingw-cfg.site" at that point.

That seems to work.

This is what I've done:
1. Remove the file "nt/msysconfig.sh"
2. Apply the below patch.
3. In the source directory (~/emacs/repo), run "./autogen.sh".
4. In an empty build directory (~/emacs/build), run
"CPPFLAGS='-DGLYPH_DEBUG=1' CFLAGS='-O0 -g3' ../repo/configure
--enable-checking".
5. In the build directory, run "make -j2"

The resulting binary (~/emacs/build/src/emacs) seems to work just fine.

diff --git a/configure.ac b/configure.ac
index a8fb34b..2a2efa8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,8 @@ dnl  along with GNU Emacs.  If not, see
<http://www.gnu.org/licenses/>.
 AC_PREREQ(2.65)
 AC_INIT(emacs, 24.3.50)

+test "$MSYSTEM" = "MINGW32" && source $srcdir/nt/mingw-cfg.site
+
 dnl Set emacs_config_options to the options of 'configure', quoted
for the shell,
 dnl and then quoted again for a C string.  Separate options with spaces.
 dnl Add some environment variables, if they were passed via the environment


-- 
Dani Moncayo

Re: nt/msysconfig.sh

[Glenn Morris]

Dani Moncayo wrote:

> 4. In an empty build directory (~/emacs/build), run
> "CPPFLAGS='-DGLYPH_DEBUG=1' CFLAGS='-O0 -g3' ../repo/configure
> --enable-checking".

Please also test with caching (-C) enabled, since AFAICS the only
difference to the current situation is that the relevant settings are
now applied after any cache is read.

> +test "$MSYSTEM" = "MINGW32" && source $srcdir/nt/mingw-cfg.site

This should be "." rather than "source", since that is what configure
uses to read CONFIG_SITE (IIRC it's more portable).

Can you also supply the necessary doc patches (mainly nt/INSTALL)?

Re: nt/msysconfig.sh

[Dani Moncayo]

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

>> 4. In an empty build directory (~/emacs/build), run
>> "CPPFLAGS='-DGLYPH_DEBUG=1' CFLAGS='-O0 -g3' ../repo/configure
>> --enable-checking".
>
> Please also test with caching (-C) enabled, since AFAICS the only
> difference to the current situation is that the relevant settings are
> now applied after any cache is read.

It works also with -C (I've just tried it).

>> +test "$MSYSTEM" = "MINGW32" && source $srcdir/nt/mingw-cfg.site
>
> This should be "." rather than "source", since that is what configure
> uses to read CONFIG_SITE (IIRC it's more portable).

Ok.

> Can you also supply the necessary doc patches (mainly nt/INSTALL)?

See the attached patch.  (the change to 'nt/mingw-cfg.site' needs
refilling; I've not done it to make my change more clear)

The changelog entries could be something like this (feel free to make
your own adjustments):

For the root ChangeLog:

2013-11-08  Dani Moncayo  <dmoncayo@gmail.com>

	* configure.ac [MINGW32]: Add call to 'nt/mingw-cfg.site'.
	* make-dist: Don't make link to 'nt/msysconfig.sh'

For 'nt/ChangeLog':

2013-11-08  Dani Moncayo <dmoncayo@gmail.com>
	
	* msysconfig.sh: remove.
	* INSTALL:
	* mingw-cfg.site: The MSYS-specific configure script no longer exists.
	Instead, use the standard (POSIX) configure script.


-- 
Dani Moncayo

[-- Attachment #2: tmp.zip --]
[-- Type: application/zip, Size: 3116 bytes --]

Re: nt/msysconfig.sh

[Glenn Morris]

Sounds good to me.
I suggest you create a Savannah account and request membership of the
emacs project, so that you can apply things directly.
WDYT?

Re: nt/msysconfig.sh

[Dani Moncayo]

> Sounds good to me.
> I suggest you create a Savannah account and request membership of the
> emacs project, so that you can apply things directly.
> WDYT?

OK, I've just requested membership, but for now, please I'd like some
of you apply my patches, because I'm trying to become familiar with
git, and I'd prefer not having to use another VCS (like bzr).

Thank you.

-- 
Dani Moncayo

Re: nt/msysconfig.sh

[Glenn Morris]

Dani Moncayo wrote:

>> Sounds good to me.
>> I suggest you create a Savannah account and request membership of the
>> emacs project, so that you can apply things directly.
>> WDYT?
>
> OK, I've just requested membership, but for now, please I'd like some
> of you apply my patches, because I'm trying to become familiar with
> git, and I'd prefer not having to use another VCS (like bzr).

Oh, well then joining the emacs project was a bit pointless...

I'd encourage you to become one of the pragmatic people who simply use
whatever VCS the project they want to contribute to uses. They are all
pretty similar, moreso if you use the Emacs VC interface to hide the
implementation details. After all, you won't find anyone more motivated
to apply your patches than you yourself.

Yours-hoping-not-to-start-yet-another-vcs-derail-ly,

Re: nt/msysconfig.sh

[Glenn Morris]

cant-test-this-but-it-makes-sense-to-me-and-no-one-objected-so-applied