Merge branch 'develop'

dev/generate_headers.py

@@ -86,7 +86,7 @@ def TO_CPP(root_dir, hashes):
         hex_string = ',\n'.join([', '.join(chunk) for chunk in chunks])
             
         # Check if hash is up to date based on using variable as key
-        if variable not in hashes or (variable in hashes and hashes[variable] != get_hash(hex_string.encode('ascii'))):
+        if not os.path.isfile(os.path.join(root_dir,'include',outfile)) or variable not in hashes or (variable in hashes and hashes[variable] != get_hash(hex_string.encode('ascii'))):
         
             # Generate the output string
             output  = '// File generated by the script dev/generate_headers.py on '+ str(datetime.now()) + '\n\n'
@@ -276,6 +276,7 @@ def generate():
     
     import shutil
     shutil.copy2(os.path.join(repo_root_path, 'externals','Catch','single_include','catch.hpp'),os.path.join(repo_root_path,'include','catch.hpp'))
+    #shutil.copy2(os.path.join(repo_root_path, 'externals','REFPROP-headers','REFPROP_lib.h'),os.path.join(repo_root_path,'include','REFPROP_lib.h'))
 
     version_to_file(root_dir = repo_root_path)
     gitrev_to_file(root_dir = repo_root_path)

dev/scripts/release.bsh

@@ -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