Skip to content

Commit b74240b

Browse files
tomprincejankeromnes
authored andcommitted
[thunderbird] update images to use new source layout.
1 parent 1775e02 commit b74240b

4 files changed

Lines changed: 13 additions & 15 deletions

File tree

thunderbird/.mozconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Thunderbird build options.
2-
ac_add_options --enable-application=mail
2+
ac_add_options --enable-application=comm/mail
33
ac_add_options --enable-calendar
4-
ac_add_options --enable-extensions=default,inspector
54
ac_add_options --enable-linker=lld
65
ac_add_options --disable-elf-hack
76
ac_add_options --with-ccache

thunderbird/janitor.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@
2525
}
2626
},
2727
"scripts": {
28-
"Build Thunderbird": "./mozilla/mach build",
29-
"Build Lightning": "make -C obj-x86_64-pc-linux-gnu/calendar/lightning",
28+
"Build Thunderbird": "./mach build",
3029
"Run Thunderbird": {
31-
"cmd": "./mozilla/mach run",
30+
"cmd": "./mach run",
3231
"openPort": "8088"
3332
},
34-
"Clobber build": "./mozilla/mach clobber",
35-
"Update source code": "python client.py checkout"
33+
"Clobber build": "./mach clobber",
34+
"Update source code": "hg pull --update ; (hg -R comm pull --update)"
3635
}
3736
}

thunderbird/thunderbird-update.dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ RUN sudo apt-get update -q && sudo apt-get upgrade -qy
66

77
# Update and rebuild Thunderbird's source code.
88
RUN cd /home/user/thunderbird \
9-
&& python client.py checkout \
10-
&& ./mozilla/mach clobber \
11-
&& ./mozilla/mach build
9+
&& hg pull --update \
10+
&& hg -R comm pull --update \
11+
&& ./mach clobber \
12+
&& ./mach build

thunderbird/thunderbird.dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ FROM janitortechnology/ubuntu-dev
22
MAINTAINER Philipp Kewisch "mozilla@kewis.ch"
33

44
# Download Thunderbird's source code.
5-
RUN hg clone --uncompressed https://hg.mozilla.org/comm-central/ thunderbird \
6-
&& cd thunderbird \
7-
&& python client.py checkout
5+
RUN hg clone --uncompressed https://hg.mozilla.org/mozilla-central/ thunderbird \
6+
&& hg clone --uncompressed https://hg.mozilla.org/comm-central/ thunderbird/comm
87
WORKDIR thunderbird
98

109
# Add Thunderbird build configuration.
@@ -20,13 +19,13 @@ RUN sudo apt-get update \
2019

2120
# Set up Mercurial so mach doesn't complain.
2221
RUN mkdir -p /home/user/.mozbuild \
23-
&& ./mozilla/mach vcs-setup -u
22+
&& ./mach vcs-setup -u
2423

2524
# Configure the IDEs to use Thunderbird's source directory as workspace.
2625
ENV WORKSPACE /home/user/thunderbird/
2726

2827
# Build Thunderbird.
29-
RUN ./mozilla/mach build
28+
RUN ./mach build
3029

3130
# Configure Janitor for Thunderbird
3231
ADD janitor.json /home/user/

0 commit comments

Comments
 (0)