Bug #966
svn_version.sh not executable
100%
Description
The svn_version.sh script added in r3269 is not necessarily executable when checked out (it wasn't for me). The attached patch calls the script with $(SHELL) to ensure it gets executed.
Files
Associated revisions
History
Updated by Robin Mills over 7 years ago
- Category set to build
- Status changed from New to Resolved
- Assignee set to Robin Mills
- Target version set to 0.25
Good Catch, Michael. Thank You. Fix submitted r3272
You're 100% correct that src/Makefile has a bug. It should be ./svn_version.sh or, as $(SHELL) ./svn_version.sh I didn't catch this because I always have . on my PATH. I'm an old Windows guy and bad habits die hard. Curiously SmartSVN rejected your patch (even when I edited out the a/ b/ stuff). So I fixed it my hand. I had remembered to set the X bit on svn_version.sh. I've taken this opportunity to add add svn:sol-style LF which is essential on Cygwin.
So thank you fixing this and thank you for sharing your fix.
We're in the process of getting a Jenkins build server in place for Exiv2 and I hope it would have detected this error and saved you inconvenience. Tomorrow's always a better day! The build server will probably be on-line and operational by the end of September.
I've marked this issue as "Resolved" and it can be updated if/when we discover something else about svn_version.sh. We'll close this issue during review in our release process before shipping 0.25 which we anticipate around November 2014.
Robin
540 rmills@rmillsmbp:~/gnu/exiv2/trunk $ ls -alt src/svn_version.sh
-rwxr-xr-x@ 1 rmills staff 445 2 Jul 23:16 src/svn_version.sh
541 rmills@rmillsmbp:~/gnu/exiv2/trunk $ svn proplist src/svn_version.sh
Properties on 'src/svn_version.sh':
svn:eol-style
svn:executable
542 rmills@rmillsmbp:~/gnu/exiv2/trunk $ svn diff
Index: src/Makefile
===================================================================
--- src/Makefile (revision 3271)
+++ src/Makefile (working copy)@ -224,7 +224,7
@
- svn_version.h is only rewritten when the svn info | grep Revision has changed
svn_version.h:
- svn_version.sh
+ $(SHELL) ./svn_version.sh
version.hpp : svn_version.h
Index: src/svn_version.sh
===================================================================
--- src/svn_version.sh (revision 3271)
+++ src/svn_version.sh (working copy)
___________________________________________________________
Added: svn:eol-style
- -0,0 +1 ##
+LF
\ No newline at end of property
543 rmills@rmillsmbp:~/gnu/exiv2/trunk $ COMMIT, MAKE DISTCLEAN ; MAKE ; SUDO MAKE INSTALL etc...
563 rmills@rmillsmbp:~/gnu/exiv2/trunk $ exiv2 -v -V | grep -i -e svn -e date -e time -e compiler
compiler=Clang
date=Jul 6 2014
time=06:45:20
svn=3272
library=/usr/lib/system/libcompiler_rt.dylib
564 rmills@rmillsmbp:~/gnu/exiv2/trunk $
Issue #966. Thank You to Michael for reporting this and for his patch