Fix upload and copying paths for SMath

This commit is contained in:
Ian Bell
2015-02-18 23:41:35 -05:00
parent dda85e1aa5
commit 09ce52203d

View File

@@ -581,7 +581,7 @@ def smath_builder(gitMode = 'incremental'):
# Create the factory to add the actions to
factory = getBaseFactory(gitMode=gitMode)
#
factory.addStep(MakeDirectory(dir='build/bin/MicrosoftExcel', haltOnFailure = True))
factory.addStep(MakeDirectory(dir='build/bin/SMath', haltOnFailure = True))
factory.addStep(MakeDirectory(dir=working_folder+'/32bitDLL', haltOnFailure = True))
factory.addStep(MakeDirectory(dir=working_folder+'/64bitDLL', haltOnFailure = True))
factory.addStep(RemoveDirectory(dir="build/install_root", haltOnFailure = True))
@@ -614,7 +614,7 @@ def smath_builder(gitMode = 'incremental'):
# Copy other files to a temporary directory
factory.addStep(ShellCommand(command=["build_zip"], workdir = 'build\\wrappers\\SMath\\coolprop_wrapper', haltOnFailure = True))
factory.addStep(ShellCommand(command=["copy", "/Y", "coolprop_wrapper.7z", "bin\\SMath"], workdir = 'build\\wrappers\\SMath\\coolprop_wrapper', haltOnFailure = True))
factory.addStep(ShellCommand(command=["copy", "/Y", "wrappers\\SMath\\coolprop_wrapper\\coolprop_wrapper.7z", "bin\\SMath"], workdir = 'build', haltOnFailure = True))
# Upload the files
factory.addStep(DirectoryUpload(slavesrc="bin",masterdest=masterdestLocation,url="SMath",compress="bz2"))
return factory