On Feb 11, 2009, at 10:24 AM, Arek Karas wrote:

Hi all,

I just tried to build native ming32 version of OpenOCD from trunk.
Everything gone fine, only small issue is that while running openocd I
can not see svn revision - just "unknown"
I have made some investigations to fix it.
Here is a patch for this issue.

Best Regards
AK

Index: guess-rev.sh
===================================================================
--- guess-rev.sh    (revision 1368)
+++ guess-rev.sh    (working copy)
@@ -3,7 +3,7 @@

REV=unknown

-which svnversion > /dev/null 2>&1 && REV=`svnversion -n`
+REV=`svnversion -n` 2>&1

echo -n $REV


This change just removes the ability for us to put in a meaningful "unknown" when svnversion can't be found. I'd be very surprised if the removal of 'which svnversion' fixed anything.

Index: src/Makefile.am
===================================================================
--- src/Makefile.am    (revision 1368)
+++ src/Makefile.am    (working copy)
@@ -21,7 +21,7 @@
if RELEASE
openocd_CPPFLAGS += -DRELSTR=\"Release\" -DPKGBLDREV=\"\"
else
-openocd_CPPFLAGS += -DRELSTR=\"svn:\"
-DPKGBLDREV=\"`$(top_srcdir)/guess-rev.sh`\"
+openocd_CPPFLAGS += -DRELSTR=\"svn:\" -DPKGBLDREV=\"`cd $(top_srcdir)
&& guess-rev.sh`\"
endif


This is even more confusing. Why does guess-rev.sh need to be run which the current working directory being $(top_srcdir)? Every directory in the checkout from the repository should have a valid .svn directory and svnversion should work there. This seems very unnecessary.


Can you try running 'svnversion -n' in $(top_srcdir)/src? It should report a valid value. If so, then your second patch is unnecessary.

Can you try running 'which svnversion >/dev/null 2>&1 && echo Success'? If it prints Success, then your first patch is unnecessary.

# add default CPPFLAGS






_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development

--
Rick Altherr
kc8...@kc8apf.net

"He said he hadn't had a byte in three days. I had a short, so I split it with him."
 -- Unsigned



Attachment: smime.p7s
Description: S/MIME cryptographic signature

_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development

Reply via email to