--- a/mozilla2-staging/mobile_config.py
+++ b/mozilla2-staging/mobile_config.py
@@ -9,102 +9,102 @@ reload(buildbotcustom.env)
from buildbotcustom.env import MozillaEnvironments
OBJDIR = 'objdir'
SBOX_HOME = '/scratchbox/users/cltbld/home/cltbld'
mobile_slaves = {
'linux-gnueabi-arm': config.SLAVES['linux'],
'linux-i686': config.SLAVES['linux'],
- 'wince-arm': config.SLAVES['win32'],
+ 'winmo-arm': config.SLAVES['win32'],
}
MOBILE_BRANCHES = {
'mobile-trunk': {},
'mobile-1.9.1': {},
}
### mozilla-central
MOBILE_BRANCHES['mobile-trunk']['repo_path'] = 'mozilla-central'
MOBILE_BRANCHES['mobile-trunk']['l10n_repo_path'] = 'l10n-central'
MOBILE_BRANCHES['mobile-trunk']['mobile_repo_path'] = 'mobile-browser'
MOBILE_BRANCHES['mobile-trunk']['product_name'] = 'fennec'
MOBILE_BRANCHES['mobile-trunk']['app_name'] = 'mobile'
MOBILE_BRANCHES['mobile-trunk']['platforms'] = {
'linux-gnueabi-arm': {},
'linux-i686': {},
- 'wince-arm': {},
+ 'winmo-arm': {},
}
MOBILE_BRANCHES['mobile-trunk']['l10n_platforms'] = {}
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['mozconfig'] = 'linux/mobile-browser/nightly'
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['mozconfig'] = 'linux/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['mozconfig'] = 'wince/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['winmo-arm']['mozconfig'] = 'winmo/mobile-browser/nightly'
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_name'] = 'Maemo mozilla-central'
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['base_name'] ='Linux Fennec Desktop mozilla-central'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['base_name'] = 'WinCE mozilla-central'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['winmo-arm']['base_name'] = 'WinMo mozilla-central'
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['build_space'] = 5
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['build_space'] = 5
-MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['build_space'] = 5
+MOBILE_BRANCHES['mobile-trunk']['platforms']['winmo-arm']['build_space'] = 5
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_workdir'] = '%s/build' % SBOX_HOME
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_builddir'] = 'maemo-trunk'
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_l10n_workdir'] = '%s/l10n' % SBOX_HOME
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['base_workdir'] = 'build'
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['base_builddir'] = 'linux-i686-trunk'
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['base_l10n_workdir'] = 'l10n'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['base_workdir'] = '.'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['base_builddir'] = 'wince-trunk'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['base_l10n_workdir'] = '.'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['winmo-arm']['base_workdir'] = '.'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['winmo-arm']['base_builddir'] = 'winmo-trunk'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['winmo-arm']['base_l10n_workdir'] = '.'
MOBILE_BRANCHES['mobile-trunk']['enable_l10n'] = True
MOBILE_BRANCHES['mobile-trunk']['l10n_tree'] = 'fennec10x'
MOBILE_BRANCHES['mobile-trunk']['l10n_platforms']['linux-gnueabi-arm'] = 'linux'
MOBILE_BRANCHES['mobile-trunk']['l10n_platforms']['linux-i686'] = 'linux'
MOBILE_BRANCHES['mobile-trunk']['allLocalesFile'] = "locales/all-locales"
MOBILE_BRANCHES['mobile-trunk']['l10nUploadPath'] = \
'/home/ftp/pub/mozilla.org/firefox/nightly/latest-mobile-trunk-l10n'
MOBILE_BRANCHES['mobile-trunk']['enUS_binaryURL'] = \
config.DOWNLOAD_BASE_URL + '/nightly/latest-mobile-trunk'
MOBILE_BRANCHES['mobile-trunk']['tinderbox_tree'] = 'MozillaTest'
MOBILE_BRANCHES['mobile-trunk']['l10n_tinderbox_tree'] = 'MozillaStaging'
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['slaves'] = mobile_slaves['linux-gnueabi-arm']
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['slaves'] = mobile_slaves['linux-i686']
-MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['slaves'] = mobile_slaves['wince-arm']
+MOBILE_BRANCHES['mobile-trunk']['platforms']['winmo-arm']['slaves'] = mobile_slaves['winmo-arm']
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['env'] = {}
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['env'] = {}
-MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['env'] = MozillaEnvironments['wince-arm']
+MOBILE_BRANCHES['mobile-trunk']['platforms']['winmo-arm']['env'] = MozillaEnvironments['winmo-arm']
### mobile-1.9.1
MOBILE_BRANCHES['mobile-1.9.1']['repo_path'] = 'releases/mozilla-1.9.1'
MOBILE_BRANCHES['mobile-1.9.1']['l10n_repo_path'] = 'releases/l10n-mozilla-1.9.1'
MOBILE_BRANCHES['mobile-1.9.1']['mobile_repo_path'] = 'mobile-browser'
MOBILE_BRANCHES['mobile-1.9.1']['product_name'] = 'fennec'
MOBILE_BRANCHES['mobile-1.9.1']['app_name'] = 'mobile'
MOBILE_BRANCHES['mobile-1.9.1']['platforms'] = {
'linux-gnueabi-arm': {},
- 'wince-arm': {},
+ 'winmo-arm': {},
}
MOBILE_BRANCHES['mobile-1.9.1']['l10n_platforms'] = {}
MOBILE_BRANCHES['mobile-1.9.1']['platforms']['linux-gnueabi-arm']['mozconfig'] = 'linux/mobile-browser/nightly'
-MOBILE_BRANCHES['mobile-1.9.1']['platforms']['wince-arm']['mozconfig'] = 'wince/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-1.9.1']['platforms']['winmo-arm']['mozconfig'] = 'winmo/mobile-browser/nightly'
MOBILE_BRANCHES['mobile-1.9.1']['platforms']['linux-gnueabi-arm']['base_name'] = 'Maemo mozilla-1.9.1'
-MOBILE_BRANCHES['mobile-1.9.1']['platforms']['wince-arm']['base_name'] = 'WinCE mozilla-1.9.1'
+MOBILE_BRANCHES['mobile-1.9.1']['platforms']['winmo-arm']['base_name'] = 'WinMo mozilla-1.9.1'
MOBILE_BRANCHES['mobile-1.9.1']['platforms']['linux-gnueabi-arm']['build_space'] = 5
-MOBILE_BRANCHES['mobile-1.9.1']['platforms']['wince-arm']['build_space'] = 5
+MOBILE_BRANCHES['mobile-1.9.1']['platforms']['winmo-arm']['build_space'] = 5
MOBILE_BRANCHES['mobile-1.9.1']['platforms']['linux-gnueabi-arm']['base_workdir'] = '%s/build' % SBOX_HOME
MOBILE_BRANCHES['mobile-1.9.1']['platforms']['linux-gnueabi-arm']['base_builddir'] = 'maemo-1.9.1'
MOBILE_BRANCHES['mobile-1.9.1']['platforms']['linux-gnueabi-arm']['base_l10n_workdir'] = '%s/l10n' % SBOX_HOME
-MOBILE_BRANCHES['mobile-1.9.1']['platforms']['wince-arm']['base_workdir'] = '.'
-MOBILE_BRANCHES['mobile-1.9.1']['platforms']['wince-arm']['base_builddir'] = 'wince-1.9.1'
-MOBILE_BRANCHES['mobile-1.9.1']['platforms']['wince-arm']['base_l10n_workdir'] = '.'
+MOBILE_BRANCHES['mobile-1.9.1']['platforms']['winmo-arm']['base_workdir'] = '.'
+MOBILE_BRANCHES['mobile-1.9.1']['platforms']['winmo-arm']['base_builddir'] = 'winmo-1.9.1'
+MOBILE_BRANCHES['mobile-1.9.1']['platforms']['winmo-arm']['base_l10n_workdir'] = '.'
MOBILE_BRANCHES['mobile-1.9.1']['enable_l10n'] = False
MOBILE_BRANCHES['mobile-1.9.1']['l10n_platforms']['linux-gnueabi-arm'] = 'linux'
MOBILE_BRANCHES['mobile-1.9.1']['allLocalesFile'] = "locales/all-locales"
MOBILE_BRANCHES['mobile-1.9.1']['l10nUploadPath'] = \
'/home/ftp/pub/mozilla.org/firefox/nightly/latest-mobile-1.9.1-l10n'
MOBILE_BRANCHES['mobile-1.9.1']['enUS_binaryURL'] = \
config.DOWNLOAD_BASE_URL + '/nightly/latest-mobile-1.9.1'
MOBILE_BRANCHES['mobile-1.9.1']['tinderbox_tree'] = 'MozillaTest'
MOBILE_BRANCHES['mobile-1.9.1']['l10n_tinderbox_tree'] = 'MozillaStaging'
MOBILE_BRANCHES['mobile-1.9.1']['platforms']['linux-gnueabi-arm']['slaves'] = mobile_slaves['linux-gnueabi-arm']
-MOBILE_BRANCHES['mobile-1.9.1']['platforms']['wince-arm']['slaves'] = mobile_slaves['wince-arm']
+MOBILE_BRANCHES['mobile-1.9.1']['platforms']['winmo-arm']['slaves'] = mobile_slaves['winmo-arm']
MOBILE_BRANCHES['mobile-1.9.1']['platforms']['linux-gnueabi-arm']['env'] = {}
-MOBILE_BRANCHES['mobile-1.9.1']['platforms']['wince-arm']['env'] = MozillaEnvironments['wince-arm']
+MOBILE_BRANCHES['mobile-1.9.1']['platforms']['winmo-arm']['env'] = MozillaEnvironments['winmo-arm']
--- a/mozilla2-staging/mobile_master.py
+++ b/mozilla2-staging/mobile_master.py
@@ -15,17 +15,17 @@ from buildbot.status.tinderbox import Ti
import buildbotcustom.misc
from buildbotcustom.misc import isHgPollerTriggered
from buildbotcustom.scheduler import MozScheduler
import buildbotcustom.process.factory
from buildbotcustom.process.factory import MaemoBuildFactory, \
- WinceBuildFactory, MaemoNightlyRepackFactory,\
+ WinmoBuildFactory, MaemoNightlyRepackFactory,\
MobileDesktopBuildFactory, MobileDesktopNightlyRepackFactory
from buildbot.steps.shell import WithProperties
from buildbotcustom.l10n import NightlyL10n, Scheduler as SchedulerL10n
# most of the config is in an external file
@@ -228,17 +228,17 @@ for name in sorted(MOBILE_BRANCHES.keys(
baseUploadDir=name,
buildToolsRepoPath=BUILD_TOOLS_REPO_PATH,
clobberURL=BASE_CLOBBER_URL,
clobberTime=clobberTime,
buildSpace=buildSpace,
nightly = True
)
else:
- mobile_dep_factory=WinceBuildFactory(
+ mobile_dep_factory=WinmoBuildFactory(
hgHost=HGHOST,
repoPath=branch['repo_path'],
configRepoPath=CONFIG_REPO_PATH,
configSubDir=CONFIG_SUBDIR,
env=pf['env'],
mozconfig=pf['mozconfig'],
stageUsername=STAGE_USERNAME,
stageGroup=STAGE_GROUP,
@@ -249,17 +249,17 @@ for name in sorted(MOBILE_BRANCHES.keys(
platform=platform,
baseWorkDir=pf['base_workdir'],
baseUploadDir=name,
buildToolsRepoPath=BUILD_TOOLS_REPO_PATH,
clobberURL=BASE_CLOBBER_URL,
clobberTime=clobberTime,
buildSpace=buildSpace,
)
- mobile_nightly_factory=WinceBuildFactory(
+ mobile_nightly_factory=WinmoBuildFactory(
hgHost=HGHOST,
repoPath=branch['repo_path'],
configRepoPath=CONFIG_REPO_PATH,
configSubDir=CONFIG_SUBDIR,
env=pf['env'],
mozconfig=pf['mozconfig'],
stageUsername=STAGE_USERNAME,
stageGroup=STAGE_GROUP,
@@ -341,17 +341,17 @@ for name in sorted(MOBILE_BRANCHES.keys(
buildSpace=2,
baseWorkDir=pf['base_l10n_workdir'],
baseUploadDir='%s-l10n' % name,
clobberURL=BASE_CLOBBER_URL,
clobberTime=clobberTime,
)
else:
print 'platform %s is not linux-gnueabi-arm or linux-i686' % platform
- continue # TODO when we have WinceNightlyRepackFactory
+ continue # TODO when we have WinmoNightlyRepackFactory
mobile_l10n_nightly_builder = {
'name': l10nNightlyBuilders[nightly_builder]['l10n_builder'],
'slavenames': pf['slaves'],
'builddir': '%s-l10n-nightly' % (pf['base_builddir']),
'factory': mobile_l10n_nightly_factory,
'category': name,
}
rename from mozilla2-staging/wince/mobile-browser/nightly/mozconfig
rename to mozilla2-staging/winmo/mobile-browser/nightly/mozconfig
--- a/mozilla2-staging/wince/mobile-browser/nightly/mozconfig
+++ b/mozilla2-staging/winmo/mobile-browser/nightly/mozconfig
@@ -9,17 +9,17 @@ ac_add_options --enable-optimize
# mobile options
ac_add_app_options mobile --enable-application=mobile
ac_add_app_options mobile --with-libxul-sdk=../xulrunner/dist
# Disabling tests due to bug 454881
ac_add_options --disable-tests
-#WINCE specific options
+#WinMo specific options
ac_add_options --disable-javaxpcom
ac_add_options --disable-accessibility
ac_add_options --disable-printing
ac_add_options --disable-oji
ac_add_options --disable-vista-sdk-requirements
ac_add_options --disable-updater
ac_add_options --disable-installer
ac_add_options --disable-dbm
--- a/mozilla2/mobile_config.py
+++ b/mozilla2/mobile_config.py
@@ -9,102 +9,102 @@ reload(buildbotcustom.env)
from buildbotcustom.env import MozillaEnvironments
OBJDIR = 'objdir'
SBOX_HOME = '/scratchbox/users/cltbld/home/cltbld'
mobile_slaves = {
'linux-gnueabi-arm': config.SLAVES['linux'],
'linux-i686': config.SLAVES['linux'],
- 'wince-arm': config.SLAVES['win32'],
+ 'winmo-arm': config.SLAVES['win32'],
}
MOBILE_BRANCHES = {
'mobile-trunk': {},
'mobile-1.9.1': {},
}
### mozilla-central
MOBILE_BRANCHES['mobile-trunk']['repo_path'] = 'mozilla-central'
MOBILE_BRANCHES['mobile-trunk']['l10n_repo_path'] = 'l10n-central'
MOBILE_BRANCHES['mobile-trunk']['mobile_repo_path'] = 'mobile-browser'
MOBILE_BRANCHES['mobile-trunk']['product_name'] = 'fennec'
MOBILE_BRANCHES['mobile-trunk']['app_name'] = 'mobile'
MOBILE_BRANCHES['mobile-trunk']['platforms'] = {
'linux-gnueabi-arm': {},
'linux-i686': {},
- 'wince-arm': {},
+ 'winmo-arm': {},
}
MOBILE_BRANCHES['mobile-trunk']['l10n_platforms'] = {}
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['mozconfig'] = 'linux/mobile-browser/nightly'
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['mozconfig'] = 'linux/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['mozconfig'] = 'wince/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['winmo-arm']['mozconfig'] = 'winmo/mobile-browser/nightly'
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_name'] = 'Maemo mozilla-central'
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['base_name'] = 'Linux Fennec Desktop mozilla-central'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['base_name'] = 'WinCE mozilla-central'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['winmo-arm']['base_name'] = 'WinMo mozilla-central'
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['build_space'] = 5
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['build_space'] = 5
-MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['build_space'] = 5
+MOBILE_BRANCHES['mobile-trunk']['platforms']['winmo-arm']['build_space'] = 5
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_workdir'] = '%s/build' % SBOX_HOME
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_builddir'] = 'maemo-trunk'
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_l10n_workdir'] = '%s/l10n' % SBOX_HOME
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['base_workdir'] = 'build'
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['base_builddir'] = 'linux-i686-trunk'
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['base_l10n_workdir'] = 'l10n'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['base_workdir'] = '.'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['base_builddir'] = 'wince-trunk'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['base_l10n_workdir'] = '.'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['winmo-arm']['base_workdir'] = '.'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['winmo-arm']['base_builddir'] = 'winmo-trunk'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['winmo-arm']['base_l10n_workdir'] = '.'
MOBILE_BRANCHES['mobile-trunk']['enable_l10n'] = True
MOBILE_BRANCHES['mobile-trunk']['l10n_tree'] = 'fennec10x'
MOBILE_BRANCHES['mobile-trunk']['l10n_platforms']['linux-gnueabi-arm'] = 'linux'
MOBILE_BRANCHES['mobile-trunk']['l10n_platforms']['linux-i686'] = 'linux'
MOBILE_BRANCHES['mobile-trunk']['allLocalesFile'] = "locales/all-locales"
MOBILE_BRANCHES['mobile-trunk']['l10nUploadPath'] = \
'/home/ftp/pub/mozilla.org/firefox/nightly/latest-mobile-trunk-l10n'
MOBILE_BRANCHES['mobile-trunk']['enUS_binaryURL'] = \
config.DOWNLOAD_BASE_URL + '/nightly/latest-mobile-trunk'
MOBILE_BRANCHES['mobile-trunk']['tinderbox_tree'] = 'Mobile'
MOBILE_BRANCHES['mobile-trunk']['l10n_tinderbox_tree'] = 'Mozilla-l10n'
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['slaves'] = mobile_slaves['linux-gnueabi-arm']
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['slaves'] = mobile_slaves['linux-i686']
-MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['slaves'] = mobile_slaves['wince-arm']
+MOBILE_BRANCHES['mobile-trunk']['platforms']['winmo-arm']['slaves'] = mobile_slaves['winmo-arm']
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['env'] = {}
MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['env'] = {}
-MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['env'] = MozillaEnvironments['wince-arm']
+MOBILE_BRANCHES['mobile-trunk']['platforms']['winmo-arm']['env'] = MozillaEnvironments['winmo-arm']
### mobile-1.9.1
MOBILE_BRANCHES['mobile-1.9.1']['repo_path'] = 'releases/mozilla-1.9.1'
MOBILE_BRANCHES['mobile-1.9.1']['l10n_repo_path'] = 'releases/l10n-mozilla-1.9.1'
MOBILE_BRANCHES['mobile-1.9.1']['mobile_repo_path'] = 'mobile-browser'
MOBILE_BRANCHES['mobile-1.9.1']['product_name'] = 'fennec'
MOBILE_BRANCHES['mobile-1.9.1']['app_name'] = 'mobile'
MOBILE_BRANCHES['mobile-1.9.1']['platforms'] = {
'linux-gnueabi-arm': {},
- 'wince-arm': {},
+ 'winmo-arm': {},
}
MOBILE_BRANCHES['mobile-1.9.1']['l10n_platforms'] = {}
MOBILE_BRANCHES['mobile-1.9.1']['platforms']['linux-gnueabi-arm']['mozconfig'] = 'linux/mobile-browser/nightly'
-MOBILE_BRANCHES['mobile-1.9.1']['platforms']['wince-arm']['mozconfig'] = 'wince/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-1.9.1']['platforms']['winmo-arm']['mozconfig'] = 'winmo/mobile-browser/nightly'
MOBILE_BRANCHES['mobile-1.9.1']['platforms']['linux-gnueabi-arm']['base_name'] = 'Maemo mozilla-1.9.1'
-MOBILE_BRANCHES['mobile-1.9.1']['platforms']['wince-arm']['base_name'] = 'WinCE mozilla-1.9.1'
+MOBILE_BRANCHES['mobile-1.9.1']['platforms']['winmo-arm']['base_name'] = 'WinMo mozilla-1.9.1'
MOBILE_BRANCHES['mobile-1.9.1']['platforms']['linux-gnueabi-arm']['build_space'] = 5
-MOBILE_BRANCHES['mobile-1.9.1']['platforms']['wince-arm']['build_space'] = 5
+MOBILE_BRANCHES['mobile-1.9.1']['platforms']['winmo-arm']['build_space'] = 5
MOBILE_BRANCHES['mobile-1.9.1']['platforms']['linux-gnueabi-arm']['base_workdir'] = '%s/build' % SBOX_HOME
MOBILE_BRANCHES['mobile-1.9.1']['platforms']['linux-gnueabi-arm']['base_builddir'] = 'maemo-1.9.1'
MOBILE_BRANCHES['mobile-1.9.1']['platforms']['linux-gnueabi-arm']['base_l10n_workdir'] = '%s/l10n' % SBOX_HOME
-MOBILE_BRANCHES['mobile-1.9.1']['platforms']['wince-arm']['base_workdir'] = '.'
-MOBILE_BRANCHES['mobile-1.9.1']['platforms']['wince-arm']['base_builddir'] = 'wince-1.9.1'
-MOBILE_BRANCHES['mobile-1.9.1']['platforms']['wince-arm']['base_l10n_workdir'] = '.'
+MOBILE_BRANCHES['mobile-1.9.1']['platforms']['winmo-arm']['base_workdir'] = '.'
+MOBILE_BRANCHES['mobile-1.9.1']['platforms']['winmo-arm']['base_builddir'] = 'winmo-1.9.1'
+MOBILE_BRANCHES['mobile-1.9.1']['platforms']['winmo-arm']['base_l10n_workdir'] = '.'
MOBILE_BRANCHES['mobile-1.9.1']['enable_l10n'] = False
MOBILE_BRANCHES['mobile-1.9.1']['l10n_platforms']['linux-gnueabi-arm'] = 'linux'
MOBILE_BRANCHES['mobile-1.9.1']['allLocalesFile'] = "locales/all-locales"
MOBILE_BRANCHES['mobile-1.9.1']['l10nUploadPath'] = \
'/home/ftp/pub/mozilla.org/firefox/nightly/latest-mobile-1.9.1-l10n'
MOBILE_BRANCHES['mobile-1.9.1']['enUS_binaryURL'] = \
config.DOWNLOAD_BASE_URL + '/nightly/latest-mobile-1.9.1'
MOBILE_BRANCHES['mobile-1.9.1']['tinderbox_tree'] = 'Mobile'
MOBILE_BRANCHES['mobile-1.9.1']['l10n_tinderbox_tree'] = 'Mozilla-l10n'
MOBILE_BRANCHES['mobile-1.9.1']['platforms']['linux-gnueabi-arm']['slaves'] = mobile_slaves['linux-gnueabi-arm']
-MOBILE_BRANCHES['mobile-1.9.1']['platforms']['wince-arm']['slaves'] = mobile_slaves['wince-arm']
+MOBILE_BRANCHES['mobile-1.9.1']['platforms']['winmo-arm']['slaves'] = mobile_slaves['winmo-arm']
MOBILE_BRANCHES['mobile-1.9.1']['platforms']['linux-gnueabi-arm']['env'] = {}
-MOBILE_BRANCHES['mobile-1.9.1']['platforms']['wince-arm']['env'] = MozillaEnvironments['wince-arm']
+MOBILE_BRANCHES['mobile-1.9.1']['platforms']['winmo-arm']['env'] = MozillaEnvironments['winmo-arm']
--- a/mozilla2/mobile_master.py
+++ b/mozilla2/mobile_master.py
@@ -1,9 +1,8 @@
-# -*- python -*-
# ex: set syntax=python:
####### BUILDSLAVES
####### SCHEDULERS AND CHANGE SOURCES
import buildbotcustom.changes.hgpoller
@@ -15,17 +14,17 @@ from buildbot.status.tinderbox import Ti
import buildbotcustom.misc
from buildbotcustom.misc import isHgPollerTriggered
from buildbotcustom.scheduler import MozScheduler
import buildbotcustom.process.factory
from buildbotcustom.process.factory import MaemoBuildFactory, \
- WinceBuildFactory, MaemoNightlyRepackFactory, \
+ WinmoBuildFactory, MaemoNightlyRepackFactory, \
MobileDesktopBuildFactory, MobileDesktopNightlyRepackFactory
from buildbot.steps.shell import WithProperties
from buildbotcustom.l10n import NightlyL10n, Scheduler as SchedulerL10n
# most of the config is in an external file
@@ -228,17 +227,17 @@ for name in sorted(MOBILE_BRANCHES.keys(
baseUploadDir=name,
buildToolsRepoPath=BUILD_TOOLS_REPO_PATH,
clobberURL=BASE_CLOBBER_URL,
clobberTime=clobberTime,
buildSpace=buildSpace,
nightly = True
)
else:
- mobile_dep_factory=WinceBuildFactory(
+ mobile_dep_factory=WinmoBuildFactory(
hgHost=HGHOST,
repoPath=branch['repo_path'],
configRepoPath=CONFIG_REPO_PATH,
configSubDir=CONFIG_SUBDIR,
env=pf['env'],
mozconfig=pf['mozconfig'],
stageUsername=STAGE_USERNAME,
stageGroup=STAGE_GROUP,
@@ -249,17 +248,17 @@ for name in sorted(MOBILE_BRANCHES.keys(
platform=platform,
baseWorkDir=pf['base_workdir'],
baseUploadDir=name,
buildToolsRepoPath=BUILD_TOOLS_REPO_PATH,
clobberURL=BASE_CLOBBER_URL,
clobberTime=clobberTime,
buildSpace=buildSpace,
)
- mobile_nightly_factory=WinceBuildFactory(
+ mobile_nightly_factory=WinmoBuildFactory(
hgHost=HGHOST,
repoPath=branch['repo_path'],
configRepoPath=CONFIG_REPO_PATH,
configSubDir=CONFIG_SUBDIR,
env=pf['env'],
mozconfig=pf['mozconfig'],
stageUsername=STAGE_USERNAME,
stageGroup=STAGE_GROUP,
@@ -341,17 +340,17 @@ for name in sorted(MOBILE_BRANCHES.keys(
buildSpace=2,
baseWorkDir=pf['base_l10n_workdir'],
baseUploadDir='%s-l10n' % name,
clobberURL=BASE_CLOBBER_URL,
clobberTime=clobberTime,
)
else:
print 'platform %s is not linux-gnueabi-arm or linux-i686' % platform
- continue # TODO when we have WinceNightlyRepackFactory
+ continue # TODO when we have WinmoNightlyRepackFactory
mobile_l10n_nightly_builder = {
'name': l10nNightlyBuilders[nightly_builder]['l10n_builder'],
'slavenames': pf['slaves'],
'builddir': '%s-l10n-nightly' % (pf['base_builddir']),
'factory': mobile_l10n_nightly_factory,
'category': name,
}
rename from mozilla2/wince/mobile-browser/nightly/mozconfig
rename to mozilla2/winmo/mobile-browser/nightly/mozconfig
--- a/mozilla2/wince/mobile-browser/nightly/mozconfig
+++ b/mozilla2/winmo/mobile-browser/nightly/mozconfig
@@ -9,17 +9,17 @@ ac_add_options --enable-optimize
# mobile options
ac_add_app_options mobile --enable-application=mobile
ac_add_app_options mobile --with-libxul-sdk=../xulrunner/dist
# Disabling tests due to bug 454881
ac_add_options --disable-tests
-#WINCE specific options
+#WinMo specific options
ac_add_options --disable-javaxpcom
ac_add_options --disable-accessibility
ac_add_options --disable-printing
ac_add_options --disable-oji
ac_add_options --disable-vista-sdk-requirements
ac_add_options --disable-updater
ac_add_options --disable-installer
ac_add_options --disable-dbm
--- a/tryserver/master.cfg
+++ b/tryserver/master.cfg
@@ -22,17 +22,17 @@ reload(buildbotcustom.changes.hgpoller)
reload(buildbotcustom.process.tryserverfactory)
reload(buildbotcustom.scheduler)
reload(buildbotcustom.status.generators)
reload(buildbotcustom.status.mail)
reload(buildbotcustom.env)
from buildbotcustom.changes.hgpoller import HgPoller
from buildbotcustom.process.tryserverfactory import TryBuildFactory, \
- WinceTryBuildFactory, MaemoTryBuildFactory
+ WinmoTryBuildFactory, MaemoTryBuildFactory
from buildbotcustom.scheduler import NoMergeScheduler
from buildbotcustom.env import MozillaEnvironments
from buildbotcustom.status.generators import buildTryCompleteMessage
from buildbotcustom.status.mail import MercurialEmailLookup
import factories
reload(factories)
@@ -102,47 +102,47 @@ c['schedulers'].append(NoMergeScheduler(
c['schedulers'].append(NoMergeScheduler(name="Sendchange hg scheduler",
branch="HG_TRY",
treeStableTimer=3,
builderNames=[
"Linux try hg build",
"OS X 10.5.2 try hg build",
"WINNT 5.2 try hg build",
- "WINCE try hg build",
+ "WinMo try hg build",
"Maemo try hg build",
"Linux try hg unit test",
"OS X 10.5.2 try hg unit test",
"WINNT 5.2 try hg unit test"]))
c['schedulers'].append(NoMergeScheduler(name="Sendchange hg push scheduler",
branch="try",
treeStableTimer=3,
builderNames=[
"Linux try hg build",
"OS X 10.5.2 try hg build",
"WINNT 5.2 try hg build",
- "WINCE try hg build",
+ "WinMo try hg build",
"Maemo try hg build",
"Linux try hg unit test",
"OS X 10.5.2 try hg unit test",
"WINNT 5.2 try hg unit test"]))
c['status'].append(TinderboxMailNotifier(
fromaddr="tryserver@build.mozilla.org",
tree="MozillaTry",
extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org"],
relayhost="mail.build.mozilla.org",
builders=["Linux try cvs build",
"OS X 10.5.2 try cvs build",
"WINNT 5.2 try cvs build",
"Linux try hg build",
"OS X 10.5.2 try hg build",
"WINNT 5.2 try hg build",
- "WINCE try hg build",
+ "WinMo try hg build",
"Maemo try hg build"
],
logCompression="bzip2"))
c['status'].append(TinderboxMailNotifier(
fromaddr="tryserver@build.mozilla.org",
tree="MozillaTry",
extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org"],
@@ -163,17 +163,17 @@ c['status'].append(MailNotifier(
'/'.join([PACKAGE_URL, PACKAGE_DIR]), TINDERBOX_TREE),
subject="Try Server: %(result)s on %(builder)s",
relayhost="mail.build.mozilla.org",
extraHeaders={'In-Reply-To': WithProperties('%(identifier)s')},
builders=["Linux try hg build",
"OS X 10.5.2 try hg build",
"WINNT 5.2 try hg build",
"Maemo try hg build",
- "WINCE try hg build",
+ "WinMo try hg build",
"Linux try hg unit test",
"OS X 10.5.2 try hg unit test",
"WINNT 5.2 try hg unit test"]
))
# the 'builders' list defines the Builders. Each one is configured with a
# dictionary, using the following keys:
# name (required): the name used to describe this bilder
@@ -283,17 +283,17 @@ firefox_hg_win32_factory = TryBuildFacto
talosMasters=TALOS_TRY_MASTERS,
packageUrl=PACKAGE_URL,
packageDir=PACKAGE_DIR
)
firefox_sendchange_win32_hg_builder = {
'name': "WINNT 5.2 try hg build",
'slavenames': BuildSlaves.Win32,
- 'builddir': "sendchange-win32-hg",
+ 'builddir': "win32-hg",
'factory': firefox_hg_win32_factory,
'category': "Sendchange",
}
builders.append(firefox_sendchange_win32_hg_builder)
firefox_sendchange_linux_unittest_builder = {
'name': "Linux try hg unit test",
'slavenames': BuildSlaves.Linux,
@@ -310,49 +310,49 @@ firefox_sendchange_macosx_unittest_build
'factory': factories.firefox_hg_macosx_unittest_factory,
'category': "Sendchange"
}
builders.append(firefox_sendchange_macosx_unittest_builder)
firefox_sendchange_win32_unittest_builder = {
'name': "WINNT 5.2 try hg unit test",
'slavenames': BuildSlaves.Win32,
- 'builddir': "sendchange-win32-unittest",
+ 'builddir': "win32-unit",
'factory': factories.firefox_hg_win32_unittest_factory,
'category': "Sendchange"
}
builders.append(firefox_sendchange_win32_unittest_builder)
-fennec_hg_wince_factory = WinceTryBuildFactory(
+fennec_hg_winmo_factory = WinmoTryBuildFactory(
hgHost='hg.mozilla.org',
buildToolsRepoPath='build/tools',
repoPath='try',
mobileRepoPath='mobile-browser',
configRepoPath='build/buildbot-configs',
configSubDir = 'tryserver',
- mozconfig="tryserver/wince/mobile-browser/try",
- env=MozillaEnvironments['wince-arm'],
+ mozconfig="tryserver/winmo/mobile-browser/try",
+ env=MozillaEnvironments['winmo-arm'],
objdir=OBJDIR,
- platform='wince-arm',
+ platform='winmo-arm',
stageServer='build.mozilla.org',
stageUsername='trybld',
stageBasePath='/builds/tryserver',
scp_string=SCP_STRING,
baseWorkDir='build'
)
-fennec_sendchange_wince_builder = {
- 'name': "WINCE try hg build",
+fennec_sendchange_winmo_builder = {
+ 'name': "WinMo try hg build",
'slavenames': BuildSlaves.Win32,
- 'builddir': 'sendchange-wince-hg',
- 'factory': fennec_hg_wince_factory,
+ 'builddir': 'winmo-hg',
+ 'factory': fennec_hg_winmo_factory,
'category': 'Sendchange'
}
-builders.append(fennec_sendchange_wince_builder)
+builders.append(fennec_sendchange_winmo_builder)
fennec_hg_maemo_factory = MaemoTryBuildFactory(
hgHost='hg.mozilla.org',
buildToolsRepoPath='build/tools',
repoPath='try',
mobileRepoPath='mobile-browser',
configRepoPath='build/buildbot-configs',
configSubDir = 'tryserver',
rename from tryserver/mozconfig-wince
rename to tryserver/mozconfig-winmo
--- a/tryserver/mozconfig-wince
+++ b/tryserver/mozconfig-winmo
@@ -9,17 +9,17 @@ ac_add_options --enable-optimize
# mobile options
ac_add_app_options mobile --enable-application=mobile
ac_add_app_options mobile --with-libxul-sdk=../xulrunner/dist
# Disabling tests due to bug 454881
ac_add_options --disable-tests
-#WINCE specific options
+#WinMo specific options
ac_add_options --disable-javaxpcom
ac_add_options --disable-accessibility
ac_add_options --disable-printing
ac_add_options --disable-oji
ac_add_options --disable-vista-sdk-requirements
ac_add_options --disable-updater
ac_add_options --disable-installer
ac_add_options --disable-dbm
