Revision: 6166
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6166&view=rev
Author:   gespinasse
Date:     2011-12-17 16:16:02 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
Add the last needed check on our Makefiles.
This happen sometime to me to put the roofiles in place of lfs file.
This is very disturbing as that error is silently ignored and only fail in case 
a later file depend on that package.

When there is no HOST_ARCH setting inside a file, make.sh think the file is for 
another arch.
Additionnaly, check for 'check' and 'download' target that every of our 
Makefile have. 

Replace a >/dev/null by qrep -q option.

Modified Paths:
--------------
    ipcop/trunk/make.sh

Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2011-12-17 15:53:05 UTC (rev 6165)
+++ ipcop/trunk/make.sh 2011-12-17 16:16:02 UTC (rev 6166)
@@ -1398,8 +1398,10 @@
        # If the file is found empty, you should check if an implicit rules did 
not broke the lfs file.
        # Look for make -p | grep SUFFIXES, if one the suffix added to lfs name 
did not match DL_FILE or another object
        [ -s ${BASEDIR}/lfs/${1} ] || exiterror "Script: ${BASEDIR}/lfs/${1} 
empty"
+       # If we replace by mistake lfs by config/rootfiles, avoid silently 
doing nothing
+       cd ${BASEDIR}/lfs && (grep -q '^check' ${1} && grep -q '^download' 
${1}) || exiterror "Script: ${BASEDIR}/lfs/${1} doesn't look our Makefile"
 
-       if grep -E "^HOST_ARCH.*${MACHINE}|^HOST_ARCH.*all" ${BASEDIR}/lfs/${1} 
>/dev/null; then
+       if grep -q -E "^HOST_ARCH.*${MACHINE}|^HOST_ARCH.*all" 
${BASEDIR}/lfs/${1}; then
                get_pkg_ver ${BASEDIR}/lfs/${1}
 
                beautify make_pkg "${PKG_VER_SHORT} $*"

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


------------------------------------------------------------------------------
Learn Windows Azure Live!  Tuesday, Dec 13, 2011
Microsoft is holding a special Learn Windows Azure training event for 
developers. It will provide a great way to learn Windows Azure and what it 
provides. You can attend the event by watching it streamed LIVE online.  
Learn more at http://p.sf.net/sfu/ms-windowsazure
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn

Reply via email to