summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorXuefer <xuefer@gmail.com>2014-11-08 19:07:05 +0000
committerXuefer <xuefer@gmail.com>2014-11-08 19:07:05 +0000
commita8677af6b70df5a95d4a55c7085c2fc9415f60c0 (patch)
tree6184f334d2335cb86db6e638d1982a0fa4bdd31a /devel
parent0b3e849cdb88e8138c11b56a75ad91b7fd65724b (diff)
downloadxcache-a8677af6b70df5a95d4a55c7085c2fc9415f60c0.tar.gz
xcache-a8677af6b70df5a95d4a55c7085c2fc9415f60c0.zip
clean var scope
git-svn-id: svn://svn.lighttpd.net/xcache/trunk@1553 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
Diffstat (limited to 'devel')
-rwxr-xr-xdevel/run19
1 files changed, 11 insertions, 8 deletions
diff --git a/devel/run b/devel/run
index 6f8018e..368d624 100755
--- a/devel/run
+++ b/devel/run
@@ -68,22 +68,25 @@ po2php() { # {{{1
}
updatedeps() { # {{{1
- pwd=$(readlink -f "$(pwd)")
- builddir=$(readlink -f ../trunk-php5-debug-zts)
+ local pwd=$(readlink -f "$(pwd)")
+ local builddirname=${xcachesrcdir}-${phpbasename}
+ local builddir=$(readlink -f $builddirname)
if [[ -z $builddir ]]; then
- hiecho required ../trunk-php5-debug-zts not found
+ hiecho required $builddirname not found
return 1
fi
+ local sourceFile
+ local sourceFilename
find . -iname \*.c | LANG=C sort | while read -r sourceFile; do
- sourceFile=${sourceFile#./}
+ sourceFilename=${sourceFile#./}
{
- case "$sourceFile" in
+ case "$sourceFilename" in
includes.c)
echo '$(XCACHE_INCLUDES_I)'
;;
esac
- echo ${sourceFile%.c}.lo '$(builddir)/'${sourceFile%.c}.lo:
- hiecho "Checking $sourceFile ..." >&2
+ echo ${sourceFilename%.c}.lo '$(builddir)/'${sourceFilename%.c}.lo:
+ hiecho "Checking $sourceFilename ..." >&2
for dependency in $(gcc -DHAVE_XCACHE_TEST -DHAVE_XCACHE_DPRINT -DXCACHE_DEBUG -MM $sourceFile -I$PHPSDIR/$phpbasename/include/php/{,main,Zend,TSRM} -I. -I${builddir} -MG | sed 's#.*:##g' | sed 's#\\##g'); do
dependency=$(readlink -f "$dependency")
case "$dependency" in
@@ -103,7 +106,7 @@ updatedeps() { # {{{1
;;
/*) ;;
- $sourceFile) ;;
+ $sourceFilename) ;;
xc_processor.h|\$\(builddir\)/xc_processor.h)
echo '$(XCACHE_PROC_H)'