[Ehs-devel] SF.net SVN: ehs:[158] trunk

[<fe...@us...>]

Revision: 158
          http://ehs.svn.sourceforge.net/ehs/?rev=158&view=rev
Author:   felfert
Date:     2012-08-05 17:03:23 +0000 (Sun, 05 Aug 2012)
Log Message:
-----------
 - Added some cppcheck suppressions
 - Added ability to specify RPMBUILD_OPTS

Modified Paths:
--------------
    trunk/Makefile.am
    trunk/samples/wsendpoint.h

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2012-08-05 04:16:07 UTC (rev 157)
+++ trunk/Makefile.am	2012-08-05 17:03:23 UTC (rev 158)
@@ -74,9 +74,9 @@
 rpm: dist conf/$(PACKAGE).spec
 	cp $(distdir).tar.gz ~/rpmbuild/SOURCES/
 	rm -f *.rpm
-	QA_RPATHS=3 rpmbuild -ba conf/$(PACKAGE).spec 2>&1 | tee rpmbuild.log
+	QA_RPATHS=3 rpmbuild $(RPMBUILD_OPTS) -ta $(distdir).tar.gz 2>&1 | tee rpmbuild.log
 	test -n "`grep ^Wrote: rpmbuild.log`" || exit 1
-	for rpm in `grep ^Wrote: rpmbuild.log|awk '{print $$2}'` ; do ln -snf $$rpm . ; done
+	for rpm in `grep ^Wrote: rpmbuild.log|awk '{print $$2}'` ; do cp $$rpm . ; done
 	rm -f rpmbuild.log
 
 setup: all doxygen-doc

Modified: trunk/samples/wsendpoint.h
===================================================================
--- trunk/samples/wsendpoint.h	2012-08-05 04:16:07 UTC (rev 157)
+++ trunk/samples/wsendpoint.h	2012-08-05 17:03:23 UTC (rev 158)
@@ -258,6 +258,7 @@
 #ifdef HAVE_BOOST_LOCK_GUARD
                 boost::lock_guard<boost::recursive_mutex> lock(m_lock);
 #else
+                // cppcheck-suppress unusedScopedObject
                 MutexHelper((pthread_mutex_t *)&m_lock);
 #endif
 
@@ -283,6 +284,7 @@
 #ifdef HAVE_BOOST_LOCK_GUARD
                 boost::lock_guard<boost::recursive_mutex> lock(m_lock);
 #else
+                // cppcheck-suppress unusedScopedObject
                 MutexHelper((pthread_mutex_t *)&m_lock);
 #endif
 
@@ -318,6 +320,7 @@
 #ifdef HAVE_BOOST_LOCK_GUARD
                 boost::lock_guard<boost::recursive_mutex> lock(m_lock);
 #else
+                // cppcheck-suppress unusedScopedObject
                 MutexHelper((pthread_mutex_t *)&m_lock);
 #endif
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.