More buildbot fun, command lists should be joined before passing them to buildbot.

This commit is contained in:
Jorrit Wronski
2014-11-26 12:09:10 +01:00
parent 866a7a74d9
commit c0967bd9f8

View File

@@ -254,19 +254,19 @@ def websiteFactory(platform, gitMode='incremental', fullBuild=False):
# Create the factory to add the actions to
factory = getBaseFactory(gitMode=gitMode)
# Install the latest CoolProp system-wide - Migh cause errors if not run in virtual environment
factory.addStep(ShellCommand(command=[activate_cmd, "python", "setup.py", "install"], workdir= 'build/wrappers/Python', haltOnFailure = True))
factory.addStep(ShellCommand(command=' '.join([activate_cmd, "python", "setup.py", "install"]), workdir= 'build/wrappers/Python', haltOnFailure = True))
# Test the compiled CoolProp
factory.addStep(ShellCommand(command=[activate_cmd, "python", "-c", "\"import CoolProp; print(CoolProp.__gitrevision__)\""], workdir= 'build/wrappers/Python', haltOnFailure = True))
factory.addStep(ShellCommand(command=' '.join([activate_cmd, "python", "-c", "\"import CoolProp; print(CoolProp.__gitrevision__)\""]), workdir= 'build/wrappers/Python', haltOnFailure = True))
# Create plots and fluid tables
factory.addStep(ShellCommand(command=[activate_cmd, fullBuildCommand], workdir= 'build/Web/scripts', haltOnFailure = True))
factory.addStep(ShellCommand(command=' '.join([activate_cmd, fullBuildCommand]), workdir= 'build/Web/scripts', haltOnFailure = True))
# Run doxygen build
factory.addStep(ShellCommand(command=[activate_cmd, "doxygen", "--version", "&&", "doxygen", "Doxyfile"], workdir= 'build', haltOnFailure = True))
factory.addStep(ShellCommand(command=' '.join([activate_cmd, "doxygen", "--version", "&&", "doxygen", "Doxyfile"]), workdir= 'build', haltOnFailure = True))
# Run sphinx apidoc
#factory.addStep(ShellCommand(command=["sphinx-apidoc","-T","-f","-o","apidoc","../CoolProp"],workdir= 'build/Web', haltOnFailure = True))
# Run sphinx website builder
factory.addStep(ShellCommand(command=[activate_cmd, "make", "html"], workdir= 'build/Web', haltOnFailure = True))
factory.addStep(ShellCommand(command=' '.join([activate_cmd, "make", "html"]), workdir= 'build/Web', haltOnFailure = True))
# Upload the generated files
factory.addStep(ShellCommand(command=[activate_cmd, 'rsync', '-a', '--stats', '{0}/ {1}'.format(local_build_dir,server_target_dir)], haltOnFailure = True))
factory.addStep(ShellCommand(command=' '.join([activate_cmd, 'rsync', '-a', '--stats', '{0}/ {1}'.format(local_build_dir,server_target_dir)]), haltOnFailure = True))
return factory