From f8f81a9e1a47a58372520bccb85ed71d15ddc033 Mon Sep 17 00:00:00 2001 From: coolprop Date: Fri, 12 Sep 2014 02:36:05 -0700 Subject: [PATCH 1/2] Buildbot builder for Excel functional --- dev/buildbot/master/master.cfg | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dev/buildbot/master/master.cfg b/dev/buildbot/master/master.cfg index 169bed5b..79466a96 100644 --- a/dev/buildbot/master/master.cfg +++ b/dev/buildbot/master/master.cfg @@ -176,20 +176,21 @@ def excel_slave(git_mode = 'incremental'): factory.addStep(MakeDirectory(dir=working_folder+'/64bitDLL', haltOnFailure = True)) factory.addStep(RemoveDirectory(dir="build/install_root", haltOnFailure = True)) # Make 32-bit __stdcall DLL - factory.addStep(ShellCommand(command=["cmake", "..", "-DCOOLPROP_32BIT_STDCALL_SHARED_LIBRARY=ON","-G", "Visual Studio 10"], + factory.addStep(ShellCommand(command=["cmake", "../..", "-DCOOLPROP_32BIT_STDCALL_SHARED_LIBRARY=ON","-G", "Visual Studio 10"], workdir= working_folder+'/32bitDLL', haltOnFailure = True)) factory.addStep(ShellCommand(command=["cmake", "--build", ".", "--target", "install"], workdir = working_folder+'/32bitDLL', haltOnFailure = True)) # Make 64-bit DLL - factory.addStep(ShellCommand(command=["cmake", "..", "-DCOOLPROP_64BIT_SHARED_LIBRARY=ON","-G", "Visual Studio 10 Win64"], + factory.addStep(ShellCommand(command=["cmake", "../..", "-DCOOLPROP_64BIT_SHARED_LIBRARY=ON","-G", "Visual Studio 10 Win64"], workdir= working_folder+'/64bitDLL', haltOnFailure = True)) factory.addStep(ShellCommand(command=["cmake", "--build", ".", "--target", "install"], workdir = working_folder+'/64bitDLL', haltOnFailure = True)) factory.addStep(MakeDirectory(dir=working_folder+'/MicrosoftExcel', haltOnFailure = True)) # Copy the created DLL - factory.addStep(ShellCommand(command=["copy", "install_root\shared_library\Windows\32bit__stdcall_calling_convention\*.dll", "MicrosoftExcel"], workdir = 'build', haltOnFailure = True)) - factory.addStep(ShellCommand(command=["copy", "install_root\shared_library\Windows\64bit\*.dll", "MicrosoftExcel\CoolProp_x64.dll"], workdir = 'build', haltOnFailure = True)) + factory.addStep(ShellCommand(command=' '.join(["copy", "/Y", "install_root\shared_library\Windows\\32bit__stdcall_calling_convention\*.dll", "MicrosoftExcel"]), workdir = 'build', haltOnFailure = True)) + factory.addStep(ShellCommand(command=' '.join(["move", "CoolProp.dll", "CoolProp_x64.dll"]), workdir = 'build/install_root/shared_library/Windows/64bit', haltOnFailure = True)) + factory.addStep(ShellCommand(command=' '.join(["copy", "install_root\\shared_library\\Windows\\64bit\\*.dll", "MicrosoftExcel"]), workdir = 'build', haltOnFailure = True)) # Copy other files factory.addStep(ShellCommand(command=["copy", "wrappers\Excel\CoolProp.xlam", "MicrosoftExcel"], workdir = 'build', haltOnFailure = True)) factory.addStep(ShellCommand(command=["copy", "wrappers\Excel\CoolProp.xla", "MicrosoftExcel"], workdir = 'build', haltOnFailure = True)) @@ -249,6 +250,13 @@ c['builders'].append( factory = deb_slave() ) ) + +c['builders'].append( + BuilderConfig(name="Excel", + slavenames=["windows-slave"], + factory = excel_slave() ) ) + + c['builders'].append( BuilderConfig(name="Sphinx docs", slavenames=["linux-slave"], From b9c005cea9f0ac74b2858d00e8a6da2392e4536d Mon Sep 17 00:00:00 2001 From: coolprop Date: Fri, 12 Sep 2014 03:30:30 -0700 Subject: [PATCH 2/2] Fixed excel buildbot --- dev/buildbot/master/master.cfg | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dev/buildbot/master/master.cfg b/dev/buildbot/master/master.cfg index 79466a96..6627a844 100644 --- a/dev/buildbot/master/master.cfg +++ b/dev/buildbot/master/master.cfg @@ -186,17 +186,17 @@ def excel_slave(git_mode = 'incremental'): haltOnFailure = True)) factory.addStep(ShellCommand(command=["cmake", "--build", ".", "--target", "install"], workdir = working_folder+'/64bitDLL', haltOnFailure = True)) - factory.addStep(MakeDirectory(dir=working_folder+'/MicrosoftExcel', haltOnFailure = True)) + factory.addStep(MakeDirectory(dir='build\\bin\\MicrosoftExcel', haltOnFailure = True)) # Copy the created DLL - factory.addStep(ShellCommand(command=' '.join(["copy", "/Y", "install_root\shared_library\Windows\\32bit__stdcall_calling_convention\*.dll", "MicrosoftExcel"]), workdir = 'build', haltOnFailure = True)) + factory.addStep(ShellCommand(command=' '.join(["copy", "/Y", "install_root\\shared_library\\Windows\\32bit__stdcall_calling_convention\\*.dll", "bin\\MicrosoftExcel"]), workdir = 'build', haltOnFailure = True)) factory.addStep(ShellCommand(command=' '.join(["move", "CoolProp.dll", "CoolProp_x64.dll"]), workdir = 'build/install_root/shared_library/Windows/64bit', haltOnFailure = True)) - factory.addStep(ShellCommand(command=' '.join(["copy", "install_root\\shared_library\\Windows\\64bit\\*.dll", "MicrosoftExcel"]), workdir = 'build', haltOnFailure = True)) + factory.addStep(ShellCommand(command=' '.join(["copy", "/Y", "install_root\\shared_library\\Windows\\64bit\\*.dll", "bin\\MicrosoftExcel"]), workdir = 'build', haltOnFailure = True)) # Copy other files - factory.addStep(ShellCommand(command=["copy", "wrappers\Excel\CoolProp.xlam", "MicrosoftExcel"], workdir = 'build', haltOnFailure = True)) - factory.addStep(ShellCommand(command=["copy", "wrappers\Excel\CoolProp.xla", "MicrosoftExcel"], workdir = 'build', haltOnFailure = True)) - factory.addStep(ShellCommand(command=["copy", "wrappers\Excel\TestExcel.xlsx", "MicrosoftExcel"], workdir = 'build', haltOnFailure = True)) + factory.addStep(ShellCommand(command=["copy", "wrappers\Excel\CoolProp.xlam", "bin\MicrosoftExcel"], workdir = 'build', haltOnFailure = True)) + factory.addStep(ShellCommand(command=["copy", "wrappers\Excel\CoolProp.xla", "bin\MicrosoftExcel"], workdir = 'build', haltOnFailure = True)) + factory.addStep(ShellCommand(command=["copy", "wrappers\Excel\TestExcel.xlsx", "bin\MicrosoftExcel"], workdir = 'build', haltOnFailure = True)) # Upload the files - factory.addStep(DirectoryUpload(slavesrc="MicrosoftExcel",masterdest="public_html/MicrosoftExcel",url="MicrosoftExcel",compress="bz2")) + factory.addStep(DirectoryUpload(slavesrc="bin",masterdest="public_html/binaries",url="MicrosoftExcel",compress="bz2")) return factory def cmake_slave(mod_name, platform, git_mode = 'incremental', install = True, cmake_args = [], build_args = [], ctest_args = [], cmake_env={}, test = True):