diff --git a/Web/coolprop/wrappers/Julia/index.rst b/Web/coolprop/wrappers/Julia/index.rst index cca09dac..6c401e70 100644 --- a/Web/coolprop/wrappers/Julia/index.rst +++ b/Web/coolprop/wrappers/Julia/index.rst @@ -20,7 +20,8 @@ Download a precompiled shared library appropriate to the computer you are using NB: For Linux users, the file libCoolProp.so must be renamed into CoolProp.so and copied into Julia's library folder (e.g. /usr/lib/x86_64-linux-gnu/julia/) -Download the module ``CoolProp.jl`` from :sfdownloads:`sourceforge ` or the development version from :sfnightly:`the nightly snapshots ` and place in the same folder as the shared library +Download the module ``CoolProp.jl`` from :sfdownloads:`sourceforge ` or the development version from :sfnightly:`the nightly snapshots ` and place in the same folder as the shared library. +The wrapper should be valid for Julia 0.4 and above. For Julia 0.3 and lower, use the one in the 0.3 folder. Usage ----- diff --git a/dev/buildbot/master/master.cfg b/dev/buildbot/master/master.cfg index 956a51ca..c2155808 100644 --- a/dev/buildbot/master/master.cfg +++ b/dev/buildbot/master/master.cfg @@ -630,10 +630,9 @@ def julia_builder(gitMode = 'incremental'): factory.addStep(RemoveDirectory(dir="build/install_root/Julia", haltOnFailure = True)) factory.addStep(MakeDirectory(dir='build/install_root/Julia', haltOnFailure = True)) factory.addStep(MakeDirectory(dir='build/install_root/Julia/0.3', haltOnFailure = True)) - factory.addStep(MakeDirectory(dir='build/install_root/Julia/0.4', haltOnFailure = True)) # Copy other files factory.addStep(ShellCommand(command=["cp", "wrappers/Julia/0.3/CoolProp.jl", "install_root/Julia/0.3"], workdir = 'build', haltOnFailure = True)) - factory.addStep(ShellCommand(command=["cp", "wrappers/Julia/0.4/CoolProp.jl", "install_root/Julia/0.4"], workdir = 'build', haltOnFailure = True)) + factory.addStep(ShellCommand(command=["cp", "wrappers/Julia/CoolProp.jl", "install_root/Julia/"], workdir = 'build', haltOnFailure = True)) # Upload the files - TODO: Is this the correct directory? factory.addStep(DirectoryUpload(slavesrc="install_root",masterdest=masterdestLocation,url="binaries",compress="bz2")) return factory diff --git a/wrappers/Julia/0.4/CoolProp.jl b/wrappers/Julia/CoolProp.jl similarity index 100% rename from wrappers/Julia/0.4/CoolProp.jl rename to wrappers/Julia/CoolProp.jl