Mercurial > archived > louis > epitech > mq > rathaxes
changeset 56:37d5953fc236
start to update the buildbot configuration
| author | Louis Opter <louis@lse.epitech.net> |
|---|---|
| date | Thu, 02 Feb 2012 12:26:48 +0100 |
| parents | b2fe898b6957 |
| children | de2840b08d0b |
| files | maintainers_add_fullbuild_factory_in_buildbot.patch maintainers_dont_log_en_in_buildbot.patch maintainers_refactor_the_build_system_to_allow_standalone_rathaxes_projects_with_cmake.patch series |
| diffstat | 4 files changed, 83 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/maintainers_add_fullbuild_factory_in_buildbot.patch Thu Feb 02 12:26:48 2012 +0100 @@ -0,0 +1,54 @@ +# HG changeset patch +# Parent 087806bea06be2b7bdee624d1544788df5d4693d +maintainers: rename the buildbot fullbuild_factory to incbuild_factory and add a real fullbuild_factory + +diff --git a/maintainers/buildbot/master/master-dotcloud.cfg b/maintainers/buildbot/master/master-dotcloud.cfg +--- a/maintainers/buildbot/master/master-dotcloud.cfg ++++ b/maintainers/buildbot/master/master-dotcloud.cfg +@@ -50,7 +50,8 @@ + name="all", + change_filter=filter.ChangeFilter(branch='default'), + treeStableTimer=None, +- builderNames=["fullbuild"])) ++ builderNames=["incbuild"])) ++c['schedulers'].append( + + ####### BUILDERS + +@@ -62,10 +63,18 @@ + from buildbot.steps.source.mercurial import Mercurial + from buildbot.steps.shell import ShellCommand, Configure, Compile, Test + ++incbuild_factory = BuildFactory() ++incbuild_factory.addStep(Mercurial(repourl='https://code.google.com/p/rathaxes', method='clean', branchType='inrepo', logEnviron=False)) ++incbuild_factory.addStep(ShellCommand(command=['cmake', '-E', 'make_directory', 'build'], lazylogfiles=True, logEnviron=False)) ++# The default is already build/ thus build/build ++incbuild_factory.addStep(Configure(command=['cmake', '-DCMAKE_BUILD_TYPE=RELEASE', '..'], workdir='build/build', logEnviron=False)) ++incbuild_factory.addStep(Compile(workdir='build/build', logEnviron=False)) ++incbuild_factory.addStep(Test(workdir='build/build', logEnviron=False)) ++ + fullbuild_factory = BuildFactory() +-fullbuild_factory.addStep(Mercurial(repourl='https://code.google.com/p/rathaxes', method='clean', branchType='inrepo', logEnviron=False)) ++fullbuild_factory.addStep(Mercurial(repourl='https://code.google.com/p/rathaxes', method='fresh', branchType='inrepo', logEnviron=False)) ++fullbuild_factory.addStep(ShellCommand(command=['cmake', '-E', 'remove_directory', 'build'], lazylogfiles=True, logEnviron=False)) + fullbuild_factory.addStep(ShellCommand(command=['cmake', '-E', 'make_directory', 'build'], lazylogfiles=True, logEnviron=False)) +-# The default is already build/ thus build/build + fullbuild_factory.addStep(Configure(command=['cmake', '-DCMAKE_BUILD_TYPE=RELEASE', '..'], workdir='build/build', logEnviron=False)) + fullbuild_factory.addStep(Compile(workdir='build/build', logEnviron=False)) + fullbuild_factory.addStep(Test(workdir='build/build', logEnviron=False)) +@@ -74,9 +83,13 @@ + + c['builders'] = [] + c['builders'].append( ++ BuilderConfig(name="incbuild", ++ slavenames=["ubuntu_lucid_x86_64"], ++ factory=incbuild_factory)) ++c['builders'].append( + BuilderConfig(name="fullbuild", +- slavenames=["ubuntu_lucid_x86_64"], +- factory=fullbuild_factory)) ++ slavenames=["ubuntu_lucid_x86_64"], ++ factory=fullbuild_factory)) + + ####### STATUS TARGETS +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/maintainers_dont_log_en_in_buildbot.patch Thu Feb 02 12:26:48 2012 +0100 @@ -0,0 +1,25 @@ +# HG changeset patch +# Parent 1b0d553645e08fae7b919bfc162d8929aa7dbf63 +maintainers: don't log the environment variables on buildbot (it holds credentials on DotCloud) + +diff --git a/maintainers/buildbot/master/master-dotcloud.cfg b/maintainers/buildbot/master/master-dotcloud.cfg +--- a/maintainers/buildbot/master/master-dotcloud.cfg ++++ b/maintainers/buildbot/master/master-dotcloud.cfg +@@ -63,12 +63,12 @@ + from buildbot.steps.shell import ShellCommand, Configure, Compile, Test + + fullbuild_factory = BuildFactory() +-fullbuild_factory.addStep(Mercurial(repourl='https://code.google.com/p/rathaxes', method='clean', branchType='inrepo')) +-fullbuild_factory.addStep(ShellCommand(command=['cmake', '-E', 'make_directory', 'build'], lazylogfiles=True)) ++fullbuild_factory.addStep(Mercurial(repourl='https://code.google.com/p/rathaxes', method='clean', branchType='inrepo', logEnviron=False)) ++fullbuild_factory.addStep(ShellCommand(command=['cmake', '-E', 'make_directory', 'build'], lazylogfiles=True, logEnviron=False)) + # The default is already build/ thus build/build +-fullbuild_factory.addStep(Configure(command=['cmake', '-DCMAKE_BUILD_TYPE=RELEASE', '..'], workdir='build/build')) +-fullbuild_factory.addStep(Compile(workdir='build/build')) +-fullbuild_factory.addStep(Test(workdir='build/build')) ++fullbuild_factory.addStep(Configure(command=['cmake', '-DCMAKE_BUILD_TYPE=RELEASE', '..'], workdir='build/build', logEnviron=False)) ++fullbuild_factory.addStep(Compile(workdir='build/build', logEnviron=False)) ++fullbuild_factory.addStep(Test(workdir='build/build', logEnviron=False)) + + from buildbot.config import BuilderConfig +
--- a/maintainers_refactor_the_build_system_to_allow_standalone_rathaxes_projects_with_cmake.patch Fri Jan 27 20:12:21 2012 +0100 +++ b/maintainers_refactor_the_build_system_to_allow_standalone_rathaxes_projects_with_cmake.patch Thu Feb 02 12:26:48 2012 +0100 @@ -82,13 +82,14 @@ SET(CPACK_SOURCE_PACKAGE_FILE_NAME ${PACKAGE_SOURCE_FILE_NAME}) SET(CPACK_SOURCE_IGNORE_FILES ${IGNORE_PATTERNS}) -@@ -125,9 +116,11 @@ +@@ -125,9 +116,12 @@ ENDIF (UNIX) IF (WIN32) - SET(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '\$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Rathaxes.lnk' '%comspec%' '/k bin\\\\rathaxesvars.bat'") SET(CPACK_GENERATOR "NSIS") SET(CPACK_SOURCE_GENERATOR "ZIP") ++ # Add a page in the installer wizard that ask to put rathaxes in the PATH: + SET(CPACK_NSIS_MODIFY_PATH ON) ENDIF (WIN32)