all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Chris Zheng <chriszheng99@gmail.com>
To: 19179@debbugs.gnu.org
Subject: bug#19179: 25.0.50; Build failure with wrong version in nt/emacs.rc
Date: Wed, 26 Nov 2014 00:02:35 +0800	[thread overview]
Message-ID: <20141126.000235.1503813762124971108.chriszheng99@gmail.com> (raw)


With MSYS2/Mingw-w64 combination, compiling the master (HEAD 88871ef)
fails with:
windres -I . -O coff -o emacs.res emacs.rc
C:\msys64\mingw64\bin\windres.exe: emacs.rc:14: syntax error
Makefile:230: recipe for target 'emacs.res' failed
make[2]: *** [emacs.res] Error 1
make[2]: Leaving directory '/home/Kel/repo/emacs/nt'

It seems that `emacs.rc' goes wrong, since the line 14 looks like:
 FILEVERSION ,0,0
but it is expected to be:
 FILEVERSION 25,0,50,0

I think the problem comes from line 1917 in configure.ac, where
`$version' is null.  Although I know little about the configure, I
suspect changing `$version' to `$PACKAGE_VERSION' is OK.  That is, the
below patch.  Am I wrong?  I'm eager to know the solution.  Thank you.

___
	Modified   configure.ac
diff --git a/configure.ac b/configure.ac
index 6b6b1c7..0d12f85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1914,7 +1914,7 @@ if test "${HAVE_W32}" = "yes"; then
     *) EMACS_MANIFEST="emacs-x86.manifest" ;;
   esac
   dnl Construct something of the form "24,4,0,0" with 4 components.
-  comma_version=`echo "$version.0.0" | sed -e 's/\./,/g' -e 's/^\([[^,]]*,[[^,]]*,[[^,]]*,[[^,]]*\).*/\1/'`
+  comma_version=`echo "$PACKAGE_VERSION.0.0" | sed -e 's/\./,/g' -e 's/^\([[^,]]*,[[^,]]*,[[^,]]*,[[^,]]*\).*/\1/'`
 
   comma_space_version=`echo "$comma_version" | sed 's/,/, /g'`
   AC_SUBST(comma_version)





             reply	other threads:[~2014-11-25 16:02 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-25 16:02 Chris Zheng [this message]
2014-11-26  2:30 ` bug#19179: 25.0.50; Build failure with wrong version in nt/emacs.rc Glenn Morris
2014-11-26  4:02   ` Chris Zheng
2014-11-26  4:38     ` Glenn Morris
2014-11-26  7:01       ` Chris Zheng

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20141126.000235.1503813762124971108.chriszheng99@gmail.com \
    --to=chriszheng99@gmail.com \
    --cc=19179@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.