You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
This repository was archived by the owner on Nov 9, 2017. It is now read-only.
Repository navigation
This repository was archived by the owner on Nov 9, 2017. It is now read-only.
Please copy & paste the exact error message here, and comment on whether you're using GCC or MSVC to compile (we are aware that the latter is currently broken with respect to adding the version information to the RC file; patches welcome).
@mcknz no. Something else is going on on your side. MAJOR, MINOR and PATCH are expected to be replaced by the make process. You need to dig much deeper, probably using "make V=1".
I'm a newbie, sorry if this is not very relevant. @patthoyts If -DPATCH=11, the build works. If -DPATCH=11-rc0, the build fails.
I guess PATCH wants an integer?
I just tested here and the GIT_VERSION is '1.7.11.rc0.6836.gdf573d9' as for you, which $(wordlist ...) should interpret as the (1/7/11) triplet that windres needs.
How did your GIT_VERSION become '1.7.11-rc0' (note the dash)?
Hi--I don't know how the '-rc0' got into the GIT_VERSION. All I did was
download the package from google code, run it, and it took off doing its
own bootstrap thing. The build failed at windres and that's when I
contacted you. I will be back at my desk later and can look into it
further. --Matt
On 5/31/2012 2:40 AM, dscho wrote:
Actually, I take that back... ;-)
I just tested here and the GIT_VERSION is '1.7.11.rc0.6836.gdf573d9' as for you, which $(wordlist ...) should interpret as the (1/7/11) triplet that windres needs.
How did your GIT_VERSION become '1.7.11-rc0' (note the dash)?
Reply to this email directly or view it on GitHub: #14 (comment)
Activity
sschuberth commentedon May 30, 2012
Please copy & paste the exact error message here, and comment on whether you're using GCC or MSVC to compile (we are aware that the latter is currently broken with respect to adding the version information to the RC file; patches welcome).
mcknz commentedon May 30, 2012
I'm getting the following when running msysGit-netinstall-1.7.10-preview20120409:
When I remove these lines from git.rc and run msys.bat, the build completes:
I can submit a patch with those lines removed but not sure if that completely solves the problem. Are those just MSVC artifacts?
dscho commentedon May 30, 2012
@mcknz no. Something else is going on on your side. MAJOR, MINOR and PATCH are expected to be replaced by the make process. You need to dig much deeper, probably using "make V=1".
mcknz commentedon May 30, 2012
thanks -- will dig.
patthoyts commentedon May 30, 2012
Try
$ rm -f git.res && make V=1 git.res
windres -O coff
-DMAJOR=1 -DMINOR=7 -DPATCH=11
-DGIT_VERSION="\"1.7.11.rc0.6836.gdf573d9\"" git.rc -o git.res
dscho commentedon May 30, 2012
@mcknz Thanks, very very much appreciated!
postiffm commentedon May 31, 2012
I'm a newbie, sorry if this is not very relevant.
@patthoyts If -DPATCH=11, the build works. If -DPATCH=11-rc0, the build fails.
I guess PATCH wants an integer?
$ make V=1 git.res
windres -O coff
-DMAJOR=1 -DMINOR=7 -DPATCH=11-rc0
-DGIT_VERSION="\"1.7.11-rc0\"" git.rc -o git.res
C:\msysgit\mingw\bin\windres.exe: git.rc:2: syntax error
make: *** [git.res] Error 1
(I downloaded msysGit-netinstall-1.7.10-preview20120409.exe earlier today; building on Windows 7).
dscho commentedon May 31, 2012
@postiffm I think you identified the problem, alright. Could you replace the line in the Makefile
with this and test again?
Thanks!
dscho commentedon May 31, 2012
Actually, I take that back... ;-)
I just tested here and the GIT_VERSION is '1.7.11.rc0.6836.gdf573d9' as for you, which $(wordlist ...) should interpret as the (1/7/11) triplet that windres needs.
How did your GIT_VERSION become '1.7.11-rc0' (note the dash)?
postiffm commentedon May 31, 2012
Hi--I don't know how the '-rc0' got into the GIT_VERSION. All I did was
download the package from google code, run it, and it took off doing its
own bootstrap thing. The build failed at windres and that's when I
contacted you. I will be back at my desk later and can look into it
further. --Matt
On 5/31/2012 2:40 AM, dscho wrote:
Windows resource: handle dashes in the Git version gracefully
dscho commentedon May 31, 2012
@postiffm it should be fixed in this commit: e6ada76
Thanks for reporting and working with us to fix the bug!
postiffm commentedon May 31, 2012
@dscho Thanks. I tested by doing another from-scratch install and it worked.
I noticed during the build process:
Building and Installing Git
GIT_VERSION = 1.7.11-rc0
* new build flags or prefix
CC credential-store.o
* new link flags
CC abspath.o
...
during the build, my GIT-VERSION-FILE has
GIT_VERSION = 1.7.11-rc0
but after the build, it has
$ cat GIT-VERSION-FILE
GIT_VERSION = 1.7.11.rc0.6837.ge6ada76
and
$ git --version
git version 1.7.11-rc0
So is the bug /really/ fixed?
dscho commentedon May 31, 2012
@postiffm yep, I think this is due to Git not being installed yet when the initial build is running.
10 remaining items
Windows resource: handle dashes in the Git version gracefully
Merge pull request #14 from dscho/readme
Merge pull request #14 from dscho/readme
Merge pull request #14 from dscho/readme
Merge pull request #14 from dscho/readme