This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "aesop Repository". The branch, master has been updated via a3a5c22c9ef1de98f051657fc32ce0a34c4a412e (commit) via ee239226683200ec1fc2af7b8b7514801e07d8b2 (commit) via 4343eb2dc271124e0d6d538246f66c52b9c52a70 (commit) via a5023c1a5420ee439654381c267fdf32e1b48029 (commit) from 6d276d9a5f67af975494cf30561e26720058629c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a3a5c22c9ef1de98f051657fc32ce0a34c4a412e Author: Phil Carns <[email protected]> Date: Fri Mar 30 13:32:06 2012 -0400 install the underlying haskell binary parser commit ee239226683200ec1fc2af7b8b7514801e07d8b2 Author: Phil Carns <[email protected]> Date: Fri Mar 30 13:31:02 2012 -0400 remove unused static srcdir references commit 4343eb2dc271124e0d6d538246f66c52b9c52a70 Author: Phil Carns <[email protected]> Date: Fri Mar 30 13:23:19 2012 -0400 remove deprecated dependency options commit a5023c1a5420ee439654381c267fdf32e1b48029 Author: Phil Carns <[email protected]> Date: Fri Mar 30 13:20:15 2012 -0400 locate aecc-utils and parsers at run time ----------------------------------------------------------------------- Summary of changes: Makefile.in | 1 + bin/aecc-utils.in | 37 +++++++++++++++++++------------------ bin/aecc.in | 9 +++++---- 3 files changed, 25 insertions(+), 22 deletions(-) Diff of changes: diff --git a/Makefile.in b/Makefile.in index 07a34a8..01806ef 100644 --- a/Makefile.in +++ b/Makefile.in @@ -692,6 +692,7 @@ install:: all install -d $(bindir) install -d $(libdir) install -d $(includedir) + install -m 755 parser/ae-blocking-parser $(bindir) install -m 755 bin/aecc $(bindir) install -m 755 bin/aecc-utils $(bindir) install -m 644 lib/libaesop.* $(libdir) diff --git a/bin/aecc-utils.in b/bin/aecc-utils.in index 9c708ed..8067f85 100644 --- a/bin/aecc-utils.in +++ b/bin/aecc-utils.in @@ -1,11 +1,20 @@ -SRCDIR=@SRC_RELATIVE_TOP@ -BUILDDIR=@BUILD_ABSOLUTE_TOP@ +# find the location of this aecc script +DIR="$( cd "$( dirname "$0" )" && pwd )" -AEPARSER=${BUILDDIR}/parser/ae-blocking-parser -AERPARSER=${BUILDDIR}/parser/ae-remote-parser -AESRCDIR=${SRCDIR}/src/aesop +# the parsers can be in one of two locations; either in the same directory +# as this script (if the tools have been installed) or in the ../parser +# directory (if we are building in tree) +if [ -x ${DIR}/ae-blocking-parser ]; then + AEPARSER=${DIR}/ae-blocking-parser +elif [ -x ${DIR}/../parser/ae-blocking-parser ]; then + AEPARSER=${DIR}/../parser/ae-blocking-parser +else + echo Unable to find ae-blocking-parser + exit 1 +fi + SPACES=" " optind=0 @@ -514,31 +523,23 @@ runCmd() rm ${compilerout} } -# doCPP <verbose> <compiler> <input> <output> <gendeps> <named outfile> <just cpp> [<compiler opts>] +# doCPP <verbose> <compiler> <input> <output> <named outfile> <just cpp> [<compiler opts>] doCPP() { verbose="$1" ; shift ccpath="$1" ; shift cppinput="$1" ; shift cppout="$1" ; shift - gendeps="$1" ; shift namedoutfile="$1" ; shift precompile="$1" ; shift ccopts=$@ - - depargs="" - if test "${gendeps}" = "yes"; then - depoutsrc=$(echo "${cppinput}" | sed -e "s|$|.d|") - depout=$(echo "${depoutsrc}" | sed -e "s|^${SRCDIR}|${BUILDDIR}|") - depargs="-MMD -MF ${depout} -MT ${namedoutfile}" - fi jcppopt="-E" if test "${precompile}" = "yes"; then jcppopt="-D__blocking='' -Dpbranch='' -Dpwait='' -Dpbreak=''" fi runCmd $verbose "Preprocessing step failed:" \ - "${ccpath} -DAESOP_PARSER -x c ${jcppopt} -o ${cppout} ${ccopts} ${cppinput} ${depargs}" + "${ccpath} -DAESOP_PARSER -x c ${jcppopt} -o ${cppout} ${ccopts} ${cppinput}" return $? } @@ -560,7 +561,7 @@ parseAesopSource() fi runCmd $verbose "Aesop parsing step failed: " \ - "${AEPARSER} -c ${compiler} ${popts} -r ${namedinput} -o ${output} -i ${input} -- -I${AESRCDIR} ${compileropts}" + "${AEPARSER} -c ${compiler} ${popts} -r ${namedinput} -o ${output} -i ${input} -- ${compileropts}" return $? } @@ -582,7 +583,7 @@ parseAesopHeader() fi runCmd $verbose "Aesop header parsing failed: " \ - "${AEPARSER} -c ${compiler} -j ${popts} -r ${namedinput} -o ${output} -i ${input} -- -I${AESRCDIR} ${compileropts}" + "${AEPARSER} -c ${compiler} -j ${popts} -r ${namedinput} -o ${output} -i ${input} -- ${compileropts}" return $? } @@ -627,7 +628,7 @@ parseRemoteSource() done runCmd $verbose "Aesop remote parsing failed: " \ - "${AERPARSER} ${serviceopts} ${regopts} -c ${compiler} ${popts} ${namedopt} ${outopt} ${inputopt} -- -I${AESRCDIR} ${compileropts}" + "${AERPARSER} ${serviceopts} ${regopts} -c ${compiler} ${popts} ${namedopt} ${outopt} ${inputopt} -- ${compileropts}" return $? } diff --git a/bin/aecc.in b/bin/aecc.in index 98510a0..dbbea92 100644 --- a/bin/aecc.in +++ b/bin/aecc.in @@ -1,8 +1,10 @@ #!/bin/sh -BUILDDIR=@BUILD_ABSOLUTE_TOP@ +# find the location of this aecc script +DIR="$( cd "$( dirname "$0" )" && pwd )" -. ${BUILDDIR}/bin/aecc-utils +# aecc utils should be in the same dir as aecc +. ${DIR}/aecc-utils setUsageMessage "Usage: aecc <options> <file> -- <compiler options>. Specify --help for a list of options." @@ -18,7 +20,6 @@ addOption v "show-commands" no none no empty none "Show commands run." addOption o "output-file" yes outputfile no "<output file>" none "Specifies the output file [default=a.out]." addOption i "interm-file" yes intermfile no "<interm file>" none "Specifies the intermediate file." addOption S "from-interm" no none no empty none "Start from (existing) intermediate file." -addOption M "generate-deps" no none no empty none "Generate dependency file during preprocessing step." addOption j "parse-hae" no none no empty none "Generate a C .h header from an Aesop .hae header." addOption l "pre-compile" no none no empty none "Pre-compile aesop for syntax checking." @@ -76,7 +77,7 @@ if test "${hasOpt_from_interm}" != "yes"; then fi # Step 1: first generate preprocessed file and dependency file - doCPP ${verbose} ${compiler} ${INPUTFILES} ${cppout} "${hasOpt_generate_deps}" ${outputfile} "${hasOpt_pre_compile}" ${COMPILEROPTS} + doCPP ${verbose} ${compiler} ${INPUTFILES} ${cppout} ${outputfile} "${hasOpt_pre_compile}" ${COMPILEROPTS} exitIfFailed $? # Step 2: next run parser on preprocessed file hooks/post-receive -- aesop Repository