Index: wflow-py/_version.py =================================================================== diff -u -r57db9099700af0a3cfb6aad65069b7dbe3d0a9e7 -r834be6381f328109617a1ad55baf3f1fda9a874a --- wflow-py/_version.py (.../_version.py) (revision 57db9099700af0a3cfb6aad65069b7dbe3d0a9e7) +++ wflow-py/_version.py (.../_version.py) (revision 834be6381f328109617a1ad55baf3f1fda9a874a) @@ -1,4 +1,4 @@ VERSION="1.0.master.1" MVERSION="1.0.master" NVERSION="1.0.1" -BUILD="2017-05-22 09:34:00.947000" +BUILD="2017-05-23 08:34:15.293000" Index: wflow-py/make_wflow_exe_buildserver.py =================================================================== diff -u -r287f457329514de24b8a89e064f99ad015279a15 -r834be6381f328109617a1ad55baf3f1fda9a874a --- wflow-py/make_wflow_exe_buildserver.py (.../make_wflow_exe_buildserver.py) (revision 287f457329514de24b8a89e064f99ad015279a15) +++ wflow-py/make_wflow_exe_buildserver.py (.../make_wflow_exe_buildserver.py) (revision 834be6381f328109617a1ad55baf3f1fda9a874a) @@ -105,7 +105,7 @@ return ret data_files.append('packages.txt') -os.system('conda list' + ">" + os.path.join('packages.txt')) +os.system('c:\anaconda\scripts\conda list' + ">" + os.path.join('packages.txt')) # matplolib data files @@ -120,7 +120,7 @@ # MKL files data_files.extend(mkdatatuples(MKL_files,destdir=".")) # pcraster dll's - ddir = "c:/pcraster/lib/" + #ddir = "c:/pcraster/lib/" # for teamcity ddir = "D:/BuildAgent/work/wflow_exe/pcraster-4.1.0_x86-64" data_files.extend(mkdatatuples(glob.glob(ddir + "/*.dll"),destdir='.')) @@ -137,7 +137,7 @@ nrbits = str(ctypes.sizeof(ctypes.c_voidp) * 8) #includes = ['wflow.wflow_bmi','wflow.wflow_w3ra','wflow.wflow_bmi_combined','bmi','bmi.wrapper',"pcraster","osgeo.ogr"] -thename = "Wflow"+MVERSION+'-'+target+'-'+sys.platform+'-'+nrbits +thename = "wflow-bin/Wflow"+MVERSION+'-'+target+'-'+sys.platform+'-'+nrbits packages = ["osgeo"] Index: wflow-py/make_wflow_exe_cx.py =================================================================== diff -u -rbaa752f6ca4d5e0bf4d287e2acefab7a51fe5d8a -r834be6381f328109617a1ad55baf3f1fda9a874a --- wflow-py/make_wflow_exe_cx.py (.../make_wflow_exe_cx.py) (revision baa752f6ca4d5e0bf4d287e2acefab7a51fe5d8a) +++ wflow-py/make_wflow_exe_cx.py (.../make_wflow_exe_cx.py) (revision 834be6381f328109617a1ad55baf3f1fda9a874a) @@ -137,7 +137,7 @@ nrbits = str(ctypes.sizeof(ctypes.c_voidp) * 8) #includes = ['wflow.wflow_bmi','wflow.wflow_w3ra','wflow.wflow_bmi_combined','bmi','bmi.wrapper',"pcraster","osgeo.ogr"] -thename = "Wflow"+MVERSION+'-'+target+'-'+sys.platform+'-'+nrbits +thename = "wflow-bin/Wflow"+MVERSION+'-'+target+'-'+sys.platform+'-'+nrbits packages = ["osgeo"] Index: wflow-py/wflow/__init__.py =================================================================== diff -u -r57db9099700af0a3cfb6aad65069b7dbe3d0a9e7 -r834be6381f328109617a1ad55baf3f1fda9a874a --- wflow-py/wflow/__init__.py (.../__init__.py) (revision 57db9099700af0a3cfb6aad65069b7dbe3d0a9e7) +++ wflow-py/wflow/__init__.py (.../__init__.py) (revision 834be6381f328109617a1ad55baf3f1fda9a874a) @@ -2,7 +2,7 @@ __version__="1.0.master" __release__="1.0.master.1" __versionnr__="1.0.1" -__build__="2017-05-22 09:34:00.947000" +__build__="2017-05-23 08:34:15.293000" import osgeo.gdal as gdal import os, sys