Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b=470715

Browse Source 
r=armenzg
- update client.mk before other modules


git-svn-id: svn://10.0.0.236/trunk@255626 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ccooper%deadsquid.com
2008-12-23 19:40:09 +00:00
parent bb58b3b667
commit 84ca97562f
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/tools/buildbot-configs/automation/production-1.9/master.cfg
View File

@@ -333,10 +333,8 @@ L10nNightlyFactory.addStep(ShellCommand,
workdir=".",
haltOnFailure = True)
L10nNightlyFactory.addStep(ShellCommand(
command=["cvs", "-q", "-z3", "-d", cvsroot, "co", "mozilla/client.mk",
"mozilla/nsprpub",
# We need this for windows
"mozilla/other-licenses/7zstub/firefox"],
command=["sh", "-c",
"cvs -q -z3 -d "+cvsroot+" co mozilla/client.mk && cvs -q -z3 -d "+cvsroot+" co mozilla/nsprpub mozilla/other-licenses/7zstub/firefox"],
descriptionDone="client.mk checked out",
workdir=".",
haltOnFailure = True

25
mozilla/tools/buildbot-configs/automation/staging-1.9/master.cfg
View File

@@ -6,6 +6,15 @@
# Use shorter alias to save typing.
c = BuildmasterConfig = {}
# Declarations
cvsroot = ":ext:stgbld@cvs.mozilla.org:/cvsroot"
cvsl10nroot = 'staging-1.9-master:/builds/cvsmirror/l10n'
cvsmodule = "mozilla/tools/release"
ftpserver = "fx-linux-1.9-slave1"
automation_tag = "HEAD"
uploadPath = "/home/ftp/pub/mozilla.org/firefox/nightly/latest-mozilla1.9.0-l10n/"
enUS_binaryURL = 'http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.9.0'
####### Reload imported modules
# l10n logic
import buildbotcustom.l10n.scheduler
@@ -100,7 +109,7 @@ l10n_nightly_scheduler = NightlyL10n(
'macosx_l10n_nightly',
],
repoType='cvs',
cvsRoot=':ext:stgbld@cvs.mozilla.org:/cvsroot',
cvsRoot=cvsroot,
# You can specify your own list of locales
# locales=['af','en-GB','de']
)
@@ -168,14 +177,6 @@ c['change_source'].append(PBChangeSource())
####### BUILDERS
cvsroot = ":ext:stgbld@cvs.mozilla.org:/cvsroot"
cvsl10nroot = 'staging-1.9-master:/builds/cvsmirror/l10n'
cvsmodule = "mozilla/tools/release"
ftpserver = "fx-linux-1.9-slave1"
automation_tag = "HEAD"
uploadPath = "/home/ftp/pub/mozilla.org/firefox/nightly/latest-mozilla1.9.0-l10n/"
enUS_binaryURL = 'http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.9.0'
c['builders'] = []
from buildbot.process import factory
@@ -348,10 +349,8 @@ L10nNightlyFactory.addStep(ShellCommand,
workdir=".",
haltOnFailure = True)
L10nNightlyFactory.addStep(ShellCommand(
command=["cvs", "-q", "-z3", "-d", cvsroot, "co", "mozilla/client.mk",
"mozilla/nsprpub",
# We need this for windows
"mozilla/other-licenses/7zstub/firefox"],
command=["sh", "-c",
"cvs -q -z3 -d "+cvsroot+" co mozilla/client.mk && cvs -q -z3 -d "+cvsroot+" co mozilla/nsprpub mozilla/other-licenses/7zstub/firefox"],
descriptionDone="client.mk checked out",
workdir=".",
haltOnFailure = True