Fixed the header handling, closes #362 and partly covers the issues named in #354.

This commit is contained in:
Jorrit Wronski
2014-12-19 11:31:21 +01:00
parent 2e4341c6d9
commit ae36828ea1
3 changed files with 31 additions and 17 deletions

View File

@@ -12,6 +12,7 @@ fi
CPVERSION="$1"
BASEDIR="$HOME/buildbot/server-master/public_html"
REPODIR="$HOME/src/CoolPropFull.git"
TMPSDIR="$HOME/src/CoolProp.sources"
BINFOLDER="binaries"
DOCFOLDER="sphinx"
SRCFOLDER="$BASEDIR/$BINFOLDER/source"
@@ -54,9 +55,21 @@ if [ "$DRYRUN" != "false" ]; then
echo "Dry run; skipping folder date"
RSYNC_DRY_RUN=--dry-run
else
printMessage "Updating sources"
pushd "$REPODIR"
git pull
python dev/scripts/git-archive-all $SRCFOLDER/CoolProp_sources.zip
#python dev/scripts/git-archive-all $SRCFOLDER/CoolProp_sources.zip
popd
printMessage "Generating headers"
rsync -a --delete "$REPODIR/" "$TMPSDIR"
pushd "$TMPSDIR"
git reset --hard HEAD
python "dev/generate_headers.py"
rm -rf .git*
cd ..
rm $SRCFOLDER/CoolProp_sources.zip
zip -r $SRCFOLDER/CoolProp_sources.zip $(basename $TMPSDIR)
cd $(basename $TMPSDIR)
popd
rm -f "$BINFOLDER/README.rst.txt"
if [ "$CPVERSION" = "nightly" ]; then