librewolf-bot/windows
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixes

Browse source
This commit is contained in:
Bert van der Weerd 2021-09-29 22:49:02 +02:00
parent 738f87ceef
commit 2424b0c7f2
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
16 changed files with 67 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -2,10 +2,12 @@
BUILD=python3 build.py ${OPTS} BUILD=python3 build.py ${OPTS}
all : all :
$(BUILD) all $(BUILD) all
clean : clean :
$(BUILD) clean $(BUILD) clean
veryclean : veryclean :
$(BUILD) veryclean $(BUILD) veryclean
@ -33,6 +35,8 @@ git_init :
reset : reset :
$(BUILD) reset $(BUILD) reset
# Building docker files.. # Building docker files..
.phony : docker-all docker-clean .phony : docker-all docker-clean
docker-all : docker-all :

9
build.py
View file

@ -26,6 +26,7 @@ parser.add_option('-t', '--distro', dest='distro', default='aut
parser.add_option('-T', '--token', dest='token', default='') parser.add_option('-T', '--token', dest='token', default='')
parser.add_option('-3', '--i386', dest='i386', default=False, action="store_true") parser.add_option('-3', '--i386', dest='i386', default=False, action="store_true")
parser.add_option('-P', '--no-settings-pane', dest='settings_pane', default=True, action="store_false") parser.add_option('-P', '--no-settings-pane', dest='settings_pane', default=True, action="store_false")
parser.add_option('-v', '--version', dest='version', action="store", type="string")
options, remainder = parser.parse_args() options, remainder = parser.parse_args()
@ -41,8 +42,14 @@ if options.distro == 'autodetect':
if options.version != None:
print('[debug] options.version = ')
print(options.version)
if options.src != 'release':
print('error: cant use --version and --src at the same time')
sys.exit(1)
pkgver=options.version

17
docker/Makefile
View file

@ -1,15 +1,24 @@
all : all :
cp version release && cp version librewolf cp version release && cp version librewolf && cp version fetched-image
make -C buildenv make -C buildenv
make -C nightly make -C fetched-image
make -C release make -C built-image
make -C librewolf make -C librewolf
clean : clean :
rm -f librewolf/version release/version rm -f librewolf/version release/version fetched-image/version
make -C librewolf clean make -C librewolf clean
make -C release clean make -C release clean
prune : prune :
sudo docker system prune --all --force sudo docker system prune --all --force
mozilla :
cp version release && cp version librewolf && cp version fetched-image
make -C buildenv
make -C fetched-image
make -C nightly
make -C release

16
docker/built-image/Dockerfile Normal file
View file

@ -0,0 +1,16 @@
from librewolf/fetched-image
# dependencies
run apt-get install -y git
workdir /
run git clone --recursive https://gitlab.com/librewolf-community/browser/windows.git
workdir windows
run ln -s /firefox-$(cat /version)
run ls -l
run pwd
run ls -l /
run python3 build.py --version $(cat /version) fetch
run python3 build.py lw_do_patches
run python3 build.py build
run python3 build.py lw_post_build
run python3 build.py package

2
docker/built-image/Makefile Normal file
View file

@ -0,0 +1,2 @@
all :
sudo docker build -t librewolf/built-image .

9
docker/fetched-image/Dockerfile Normal file
View file

@ -0,0 +1,9 @@
from mozilla/buildenv-debian
run rm -rf mozilla-unified
# Build it..
copy version /
run wget -q https://archive.mozilla.org/pub/firefox/releases/$(cat /version)/source/firefox-$(cat /version).source.tar.xz
run tar xf firefox-$(cat /version).source.tar.xz
run ln -s firefox-$(cat /version) work
workdir work

2
docker/fetched-image/Makefile Normal file
View file

@ -0,0 +1,2 @@
all :
sudo docker build -t librewolf/fetched-image .

16
docker/librewolf/debian/Dockerfile
View file

@ -1,14 +1,2 @@
FROM mozilla/buildenv-debian from librewolf/built-image
RUN rm -rf mozilla-unified run python3 build.py lw_artifacts
# Build it..
copy version /
run wget -q https://archive.mozilla.org/pub/firefox/releases/$(cat /version)/source/firefox-$(cat /version).source.tar.xz
run tar xf firefox-$(cat /version).source.tar.xz
run ln -s firefox-$(cat /version) work
workdir work
run ./mach build
run ./mach package

2
docker/librewolf/debian/Makefile
View file

@ -1,2 +1,2 @@
all : all :
sudo docker build -t mozilla/release-debian . sudo docker build -t librewolf/release-debian .

16
docker/librewolf/fedora/Dockerfile
View file

@ -1,14 +1,2 @@
FROM mozilla/buildenv-fedora from librewolf/built-image
RUN rm -rf mozilla-unified run python3 build.py lw_artifacts
# Build it..
copy version /
run wget -q https://archive.mozilla.org/pub/firefox/releases/$(cat /version)/source/firefox-$(cat /version).source.tar.xz
run tar xf firefox-$(cat /version).source.tar.xz
run ln -s firefox-$(cat /version) work
workdir work
run ./mach build
run ./mach package

2
docker/librewolf/fedora/Makefile
View file

@ -1,2 +1,2 @@
all : all :
sudo docker build -t mozilla/release-fedora . sudo docker build -t librewolf/release-fedora .

16
docker/librewolf/mint/Dockerfile
View file

@ -1,14 +1,2 @@
FROM mozilla/buildenv-mint from librewolf/built-image
RUN rm -rf mozilla-unified run python3 build.py lw_artifacts
# Build it..
copy version /
run wget -q https://archive.mozilla.org/pub/firefox/releases/$(cat /version)/source/firefox-$(cat /version).source.tar.xz
run tar xf firefox-$(cat /version).source.tar.xz
run ln -s firefox-$(cat /version) work
workdir work
run ./mach build
run ./mach package

2
docker/librewolf/mint/Makefile
View file

@ -1,2 +1,2 @@
all : all :
sudo docker build -t mozilla/release-mint . sudo docker build -t librewolf/release-mint .

16
docker/librewolf/ubuntu/Dockerfile
View file

@ -1,14 +1,2 @@
FROM mozilla/buildenv-ubuntu from librewolf/built-image
RUN rm -rf mozilla-unified run python3 build.py lw_artifacts
# Build it..
copy version /
run wget -q https://archive.mozilla.org/pub/firefox/releases/$(cat /version)/source/firefox-$(cat /version).source.tar.xz
run tar xf firefox-$(cat /version).source.tar.xz
run ln -s firefox-$(cat /version) work
workdir work
run ./mach build
run ./mach package

2
docker/librewolf/ubuntu/Makefile
View file

@ -1,2 +1,2 @@
all : all :
sudo docker build -t mozilla/release-ubuntu . sudo docker build -t librewolf/release-ubuntu .

12
docker/release/debian/Dockerfile
View file

@ -1,14 +1,4 @@
FROM mozilla/buildenv-debian from librewolf/fetched-image
RUN rm -rf mozilla-unified
# Build it..
copy version /
run wget -q https://archive.mozilla.org/pub/firefox/releases/$(cat /version)/source/firefox-$(cat /version).source.tar.xz
run tar xf firefox-$(cat /version).source.tar.xz
run ln -s firefox-$(cat /version) work
workdir work
run ./mach build run ./mach build
run ./mach package run ./mach package