Skip to content

Commit

Permalink
'Buildbot' has only one capital 'B'
Browse files Browse the repository at this point in the history
Plus some other minor cleanup.
  • Loading branch information
djmitche committed Jul 20, 2014
1 parent b9eea1f commit c1dd5a1
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 36 deletions.
12 changes: 8 additions & 4 deletions README
@@ -1,10 +1,14 @@
BuildBot: build/test automation
Buildbot: The Continuous Integration Framework
http://buildbot.net
Brian Warner <warner-buildbot @ lothar . com>
Dustin J. Mitchell <dustin@v.igoro.us>
Dustin J. Mitchell <dustin@buildbot.net>

Buildbot consists of two separate components: the master and the slave. See
master/README and slave/README for more information.
Buildbot consists of three separate components:
* master
* slave
* www

See the README in each subdirectory for more information

Related repositories:
https://github.com/buildbot/buildbot-media - Buildbot-related media
Expand Down
10 changes: 4 additions & 6 deletions master/README
@@ -1,14 +1,12 @@

BuildBot: build/test automation
Buildbot: The Continuous Integration Framework
http://buildbot.net
Brian Warner <warner-buildbot @ lothar . com>
Dustin J. Mitchell <dustin@v.igoro.us>
Dustin J. Mitchell <dustin@buildbot.net>


Buildbot is a continuous integration system designed to automate the
build/test cycle. By automatically rebuilding and testing the tree each time
something has changed, build problems are pinpointed quickly, before other
developers are inconvenienced by the failure. Features
Buildbot is an open-source framework for automating software build, test, and
release processes.

* Buildbot is easy to set up, but very extensible and customizable. It
supports arbitrary build processes, and is not limited to common build
Expand Down
32 changes: 16 additions & 16 deletions master/buildbot/test/unit/test_changes_svnpoller.py
Expand Up @@ -57,17 +57,17 @@
"""

# this is the svn info output for a local repository, svn info --xml
# file:///home/warner/stuff/Projects/BuildBot/trees/svnpoller/_trial_temp/test_vc/repositories/SVN-Repository
# file:///home/warner/stuff/Projects/Buildbot/trees/svnpoller/_trial_temp/test_vc/repositories/SVN-Repository
prefix_output_3 = """\
<?xml version="1.0"?>
<info>
<entry
kind="dir"
path="SVN-Repository"
revision="3">
<url>file:///home/warner/stuff/Projects/BuildBot/trees/svnpoller/_trial_temp/test_vc/repositories/SVN-Repository</url>
<url>file:///home/warner/stuff/Projects/Buildbot/trees/svnpoller/_trial_temp/test_vc/repositories/SVN-Repository</url>
<repository>
<root>file:///home/warner/stuff/Projects/BuildBot/trees/svnpoller/_trial_temp/test_vc/repositories/SVN-Repository</root>
<root>file:///home/warner/stuff/Projects/Buildbot/trees/svnpoller/_trial_temp/test_vc/repositories/SVN-Repository</root>
<uuid>c0f47ff4-ba1e-0410-96b5-d44cc5c79e7f</uuid>
</repository>
<commit
Expand All @@ -79,7 +79,7 @@
</info>
"""

# % svn info --xml file:///home/warner/stuff/Projects/BuildBot/trees/svnpoller/_trial_temp/test_vc/repositories/SVN-Repository/sample/trunk
# % svn info --xml file:///home/warner/stuff/Projects/Buildbot/trees/svnpoller/_trial_temp/test_vc/repositories/SVN-Repository/sample/trunk

prefix_output_4 = """\
<?xml version="1.0"?>
Expand All @@ -88,9 +88,9 @@
kind="dir"
path="trunk"
revision="3">
<url>file:///home/warner/stuff/Projects/BuildBot/trees/svnpoller/_trial_temp/test_vc/repositories/SVN-Repository/sample/trunk</url>
<url>file:///home/warner/stuff/Projects/Buildbot/trees/svnpoller/_trial_temp/test_vc/repositories/SVN-Repository/sample/trunk</url>
<repository>
<root>file:///home/warner/stuff/Projects/BuildBot/trees/svnpoller/_trial_temp/test_vc/repositories/SVN-Repository</root>
<root>file:///home/warner/stuff/Projects/Buildbot/trees/svnpoller/_trial_temp/test_vc/repositories/SVN-Repository</root>
<uuid>c0f47ff4-ba1e-0410-96b5-d44cc5c79e7f</uuid>
</repository>
<commit
Expand All @@ -105,7 +105,7 @@

# output from svn log on .../SVN-Repository/sample
# (so it includes trunk and branches)
sample_base = ("file:///usr/home/warner/stuff/Projects/BuildBot/trees/misc/" +
sample_base = ("file:///usr/home/warner/stuff/Projects/Buildbot/trees/misc/" +
"_trial_temp/test_vc/repositories/SVN-Repository/sample")
sample_logentries = [None] * 6

Expand Down Expand Up @@ -206,9 +206,9 @@
kind="dir"
path="sample"
revision="4">
<url>file:///usr/home/warner/stuff/Projects/BuildBot/trees/misc/_trial_temp/test_vc/repositories/SVN-Repository/sample</url>
<url>file:///usr/home/warner/stuff/Projects/Buildbot/trees/misc/_trial_temp/test_vc/repositories/SVN-Repository/sample</url>
<repository>
<root>file:///usr/home/warner/stuff/Projects/BuildBot/trees/misc/_trial_temp/test_vc/repositories/SVN-Repository</root>
<root>file:///usr/home/warner/stuff/Projects/Buildbot/trees/misc/_trial_temp/test_vc/repositories/SVN-Repository</root>
<uuid>4f94adfc-c41e-0410-92d5-fbf86b7c7689</uuid>
</repository>
<commit
Expand Down Expand Up @@ -310,12 +310,12 @@ def test_get_prefix_2(self):
return self.do_test_get_prefix(base, prefix_output_2, '')

def test_get_prefix_3(self):
base = ("file:///home/warner/stuff/Projects/BuildBot/trees/" +
base = ("file:///home/warner/stuff/Projects/Buildbot/trees/" +
"svnpoller/_trial_temp/test_vc/repositories/SVN-Repository")
return self.do_test_get_prefix(base, prefix_output_3, '')

def test_get_prefix_4(self):
base = ("file:///home/warner/stuff/Projects/BuildBot/trees/" +
base = ("file:///home/warner/stuff/Projects/Buildbot/trees/" +
"svnpoller/_trial_temp/test_vc/repositories/SVN-Repository/sample/trunk")
return self.do_test_get_prefix(base, prefix_output_3, 'sample/trunk')

Expand Down Expand Up @@ -352,7 +352,7 @@ def test_get_new_logentries(self):
self.assertEqual(len(new), 0)

def test_create_changes(self):
base = ("file:///home/warner/stuff/Projects/BuildBot/trees/" +
base = ("file:///home/warner/stuff/Projects/Buildbot/trees/" +
"svnpoller/_trial_temp/test_vc/repositories/SVN-Repository/sample")
s = self.attachSVNPoller(base, split_file=split_file)
s._prefix = "sample"
Expand Down Expand Up @@ -412,7 +412,7 @@ def custom_split_file(path):
f["codebase"] = "overriden-codebase"
return f

base = ("file:///home/warner/stuff/Projects/BuildBot/trees/" +
base = ("file:///home/warner/stuff/Projects/Buildbot/trees/" +
"svnpoller/_trial_temp/test_vc/repositories/SVN-Repository/sample")
s = self.attachSVNPoller(base, split_file=custom_split_file)
s._prefix = "sample"
Expand Down Expand Up @@ -478,7 +478,7 @@ def check_third(_):
'files': [''],
'project': '',
'properties': {},
'repository': 'file:///usr/home/warner/stuff/Projects/BuildBot/trees/misc/_trial_temp/test_vc/repositories/SVN-Repository/sample',
'repository': 'file:///usr/home/warner/stuff/Projects/Buildbot/trees/misc/_trial_temp/test_vc/repositories/SVN-Repository/sample',
'revision': '2',
'revlink': '',
'src': 'svn',
Expand All @@ -503,7 +503,7 @@ def check_fourth(_):
'files': ['main.c'],
'project': '',
'properties': {},
'repository': 'file:///usr/home/warner/stuff/Projects/BuildBot/trees/misc/_trial_temp/test_vc/repositories/SVN-Repository/sample',
'repository': 'file:///usr/home/warner/stuff/Projects/Buildbot/trees/misc/_trial_temp/test_vc/repositories/SVN-Repository/sample',
'revision': '3',
'revlink': '',
'src': 'svn',
Expand All @@ -517,7 +517,7 @@ def check_fourth(_):
'files': ['version.c'],
'project': '',
'properties': {},
'repository': 'file:///usr/home/warner/stuff/Projects/BuildBot/trees/misc/_trial_temp/test_vc/repositories/SVN-Repository/sample',
'repository': 'file:///usr/home/warner/stuff/Projects/Buildbot/trees/misc/_trial_temp/test_vc/repositories/SVN-Repository/sample',
'revision': '4',
'revlink': '',
'src': 'svn',
Expand Down
6 changes: 3 additions & 3 deletions master/docs/conf.py
Expand Up @@ -186,7 +186,7 @@
# html_file_suffix = ''

# Output file base name for HTML help builder.
htmlhelp_basename = 'BuildBotdoc'
htmlhelp_basename = 'Buildbotdoc'


# -- Options for LaTeX output --------------------------------------------------
Expand All @@ -200,7 +200,7 @@
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
('index', 'BuildBot.tex', u'BuildBot Documentation',
('index', 'Buildbot.tex', u'Buildbot Documentation',
u'Brian Warner', 'manual'),
]

Expand Down Expand Up @@ -233,7 +233,7 @@
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
('index', 'buildbot', u'BuildBot Documentation',
('index', 'buildbot', u'Buildbot Documentation',
[u'Brian Warner'], 1)
]

Expand Down
4 changes: 2 additions & 2 deletions master/docs/index.rst
@@ -1,8 +1,8 @@
.. ==================================
BuildBot Documentation - |version|
Buildbot Documentation - |version|
==================================
This is the BuildBot documentation for Buildbot version |version|.
This is the Buildbot documentation for Buildbot version |version|.

If you are evaluating Buildbot and would like to get started quickly, start
with the :doc:`Tutorial <tutorial/index>`. Regular users of Buildbot should
Expand Down
2 changes: 1 addition & 1 deletion master/docs/manual/customization.rst
Expand Up @@ -479,7 +479,7 @@ workdir. Note that the value must be returned immediately - Deferreds are not
supported.

This can be useful, for example, in scenarios with multiple repositories
submitting changes to BuildBot. In this case you likely will want to have a
submitting changes to Buildbot. In this case you likely will want to have a
dedicated workdir per repository, since otherwise a sourcing step with mode =
"update" will fail as a workdir with a working copy of repository A can't be
"updated" for changes from a repository B. Here is an example how you can
Expand Down
2 changes: 1 addition & 1 deletion master/docs/manual/index.rst
@@ -1,4 +1,4 @@
This is the BuildBot manual for Buildbot version |version|.
This is the Buildbot manual for Buildbot version |version|.

Buildbot Manual
---------------
Expand Down
2 changes: 1 addition & 1 deletion master/docs/manual/introduction.rst
Expand Up @@ -3,7 +3,7 @@
Introduction
============

BuildBot is a system to automate the compile/test cycle required by most
Buildbot is a system to automate the compile/test cycle required by most
software projects to validate code changes. By automatically rebuilding and
testing the tree each time something has changed, build problems are
pinpointed quickly, before other developers are inconvenienced by the
Expand Down
4 changes: 2 additions & 2 deletions master/setup.py
Expand Up @@ -86,7 +86,7 @@ def make_release_tree(self, base_dir, files):


long_description = """
The BuildBot is a system to automate the compile/test cycle required by
The Buildbot is a system to automate the compile/test cycle required by
most software projects to validate code changes. By automatically
rebuilding and testing the tree each time something has changed, build
problems are pinpointed quickly, before other developers are
Expand All @@ -110,7 +110,7 @@ def make_release_tree(self, base_dir, files):
setup_args = {
'name': "buildbot",
'version': version,
'description': "BuildBot build automation system",
'description': "The Continuous Integration Framework",
'long_description': long_description,
'author': "Brian Warner",
'author_email': "warner-buildbot@lothar.com",
Expand Down

0 comments on commit c1dd5a1

Please sign in to comment.