Change a few variables in gen-makefile.sh, and clean work directory

This commit is contained in:
Pierre Labastie 2012-02-29 13:12:01 +00:00
parent 6cf28686ff
commit 9d0e0eb568

View file

@ -4,8 +4,8 @@
# #
set -e set -e
# TEMPORARY VARIABLES.. development use only declare TOPDIR='..'
declare TOPDIR=$(cd ..; pwd) declare ATOPDIR=`cd $TOPDIR; pwd`
declare MKFILE=Makefile declare MKFILE=Makefile
declare PREV_PACKAGE="" declare PREV_PACKAGE=""
declare BUILD_SCRIPTS=${TOPDIR}/scripts declare BUILD_SCRIPTS=${TOPDIR}/scripts
@ -58,7 +58,7 @@ cat << EOF
--stringparam package ${pkg_name#*-?-} \\ --stringparam package ${pkg_name#*-?-} \\
-o track.tmp \\ -o track.tmp \\
${BUMP} \$(TRACKING_FILE) && \\ ${BUMP} \$(TRACKING_FILE) && \\
sed -i 's@PACKDESC@${TOPDIR}/packdesc.dtd@' track.tmp && \\ sed -i 's@PACKDESC@${ATOPDIR}/packdesc.dtd@' track.tmp && \\
xmllint --format --postvalid track.tmp > \$(TRACKING_FILE) && \\ xmllint --format --postvalid track.tmp > \$(TRACKING_FILE) && \\
rm track.tmp && \\ rm track.tmp && \\
touch \$@ && \\ touch \$@ && \\
@ -160,8 +160,11 @@ if [[ ! -d ${BUILD_SCRIPTS} ]] ; then
exit 1 exit 1
fi fi
# Let us make a clean base:
rm -rf *
generate_Makefile generate_Makefile
cp ../progress_bar.sh . cp ${TOPDIR}/progress_bar.sh .
mkdir -p logs mkdir -p logs