Revision: 6490
http://ipcop.svn.sourceforge.net/ipcop/?rev=6490&view=rev
Author: gespinasse
Date: 2012-03-18 11:14:38 +0000 (Sun, 18 Mar 2012)
Log Message:
-----------
Explain a little bit more where implicit rules come
While there, prefer some long lines and simplier than if else construction
Nothing should change
Modified Paths:
--------------
ipcop/trunk/make.sh
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2012-03-18 08:54:20 UTC (rev 6489)
+++ ipcop/trunk/make.sh 2012-03-18 11:14:38 UTC (rev 6490)
@@ -1398,11 +1398,11 @@
# so we catch for sure error in PREPLOGFILE
unset LOGFILE
- # Warn if somehow an accident happen
+ # Warn if somehow an accident happen inside our own source tree
[ -f ${BASEDIR}/lfs/${1} ] || exiterror "Script: ${BASEDIR}/lfs/${1}
missing"
[ -r ${BASEDIR}/lfs/${1} ] || exiterror "Script: ${BASEDIR}/lfs/${1}
not readable"
- # 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
+ # If the file is found empty, you should check if an implicit make rule
did not broke the lfs file.
+ # Look for make -p | grep SUFFIXES, if one of 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"
@@ -1417,18 +1417,12 @@
# make: Nothing to be done for `install'
echo -e "`date -u '+%b %e %T'`: Building $*" >> ${PREPLOGFILE}
- # -r as implicit rules are never used for download and md5,
that should be faster, -s is less verbose for rebuild
- cd ${BASEDIR}/lfs && make -srf $* MACHINE=${MACHINE}
LFS_BASEDIR=${BASEDIR} MESSAGE="${1}\t " \
- download >> ${PREPLOGFILE} 2>&1
- if [ ${?} -ne 0 ]; then
- exiterror "Download error in ${1}"
- fi
+ # -r as implicit make rules are never used for download and
md5, that should be faster, -s is less verbose for rebuild
+ cd ${BASEDIR}/lfs && make -srf $* MACHINE=${MACHINE}
LFS_BASEDIR=${BASEDIR} MESSAGE="${1}\t " download >> ${PREPLOGFILE} 2>&1
+ [ ${?} -ne 0 ] && exiterror "Download error in ${1}"
- cd ${BASEDIR}/lfs && make -srf $* MACHINE=${MACHINE}
LFS_BASEDIR=${BASEDIR} MESSAGE="${1}\t md5sum" \
- md5 >> ${PREPLOGFILE} 2>&1
- if [ ${?} -ne 0 ]; then
- exiterror "md5sum error in ${1}, check file in cache or
signature"
- fi
+ cd ${BASEDIR}/lfs && make -srf $* MACHINE=${MACHINE}
LFS_BASEDIR=${BASEDIR} MESSAGE="${1}\t md5sum" md5 >> ${PREPLOGFILE} 2>&1
+ [ ${?} -ne 0 ] && exiterror "md5sum error in ${1}, check file
in cache or signature"
# Split log per package
LOGFILE="${BASEDIR}/log_${MACHINE}/${STAGE_ORDER}_${STAGE}/${1}-${PKG_VER}"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
