Compare commits
102 commits
19-respect
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bdee933bb7 | ||
|
|
cd229782af | ||
|
|
cb0418a125 | ||
|
|
8f607da74f | ||
|
|
ecbc75b72c | ||
| e6d0d3a00e | |||
|
|
a09088b453 | ||
|
|
af044e3304 | ||
|
|
083f14d8c7 | ||
| f4dfbce94b | |||
| fa50ab2279 | |||
| 8e511a8753 | |||
| b737e5783f | |||
|
|
4070c5bdeb | ||
|
|
e199efddca | ||
|
|
383f413bba | ||
|
|
1f6f06e9b4 | ||
|
|
8d716372e7 | ||
| 5b6e193b9a | |||
|
|
d8abb1279e | ||
|
|
a29404f692 | ||
|
|
ab018ea341 | ||
|
|
d3385ccd8f | ||
| 9985e3de44 | |||
|
|
3aafd846ab | ||
| 7a4b5f652e | |||
|
|
06af8517f2 | ||
|
|
66b780ea0d | ||
|
|
4758ff2508 | ||
|
|
36b08ee7f0 | ||
|
|
f2d98eba7e | ||
|
|
694cbfbc08 | ||
|
|
17a622c951 | ||
|
|
aef036119c | ||
|
|
63e9a7cafa | ||
|
|
2e2408a16a | ||
|
|
a6a221cc59 | ||
|
|
829d1c8a36 | ||
|
|
18135d5494 | ||
| 004feab548 | |||
| 22acc65b52 | |||
|
|
9e9f913886 | ||
|
|
9dc9e4ecd2 | ||
|
|
8001d745da | ||
|
|
d28ed6123f | ||
|
|
5aa415ad6a | ||
|
|
dff787bde5 | ||
|
|
85949fec35 | ||
|
|
d2bc452167 | ||
|
|
0a0042c4b5 | ||
|
|
0090a46403 | ||
|
|
7e19bbd5c2 | ||
| d6f27133ea | |||
|
|
68d4756d6c | ||
|
|
71c6415b80 | ||
| 91a788d7a6 | |||
| 1ca0993791 | |||
| 55c910325c | |||
| 769135543b | |||
| 82859aba56 | |||
| fdb6bda9c2 | |||
|
|
e0e82a85ed | ||
|
|
25a0c04a71 | ||
|
|
8ea7f23fe6 | ||
|
|
09f1178eca | ||
|
|
97fa92724d | ||
|
|
90f7b46f79 | ||
|
|
15f98171a3 | ||
|
|
abb5a378f4 | ||
|
|
e300624792 | ||
|
|
807ffcb40d | ||
|
|
d1c324ebd1 | ||
|
|
f4816d64ab | ||
|
|
78364ce675 | ||
|
|
ccaa7d6cbf | ||
|
|
c62860eb6f | ||
|
|
efcc11ba56 | ||
|
|
376d4cfa8c | ||
|
|
76992abd67 | ||
|
|
3dd22413c1 | ||
|
|
77a3f04e29 | ||
| 6a1872110d | |||
| cfcc1971b9 | |||
|
|
902e758ed1 | ||
|
|
c6c9928ccc | ||
|
|
dadf10b618 | ||
|
|
0e2d879168 | ||
|
|
643e08734d | ||
|
|
8506c341d2 | ||
|
|
011359bb7a | ||
| b5ee671680 | |||
| 2a5fac9a03 | |||
| 1749acf960 | |||
|
|
0e2b04be48 | ||
| aca2ee2794 | |||
| f10c273378 | |||
|
|
0649106bde | ||
| 24765f8704 | |||
| 38d4f63c19 | |||
| 2139a5bb7a | |||
| 8e120aa02f | |||
|
|
af971cc5c5 |
18 changed files with 264 additions and 180 deletions
217
.gitlab-ci.yml
217
.gitlab-ci.yml
|
|
@ -2,36 +2,33 @@ stages:
|
|||
- images
|
||||
- build
|
||||
- release
|
||||
- deploy
|
||||
|
||||
Build Docker Images:
|
||||
# Notes; we want short labes so we can see what is what, and
|
||||
# allow image builds on all branches because don't wan to
|
||||
# deal with them on the master branch
|
||||
Images:
|
||||
stage: images
|
||||
when: manual
|
||||
only:
|
||||
- master
|
||||
image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
|
||||
# Needed because we aren't using our custom runners here
|
||||
services:
|
||||
- docker:dind
|
||||
variables:
|
||||
DOCKER_HOST: tcp://docker:2375
|
||||
tags: [autoscale]
|
||||
parallel:
|
||||
matrix:
|
||||
- DISTRO:
|
||||
- debian11
|
||||
- debian12
|
||||
- ubuntu20
|
||||
- ubuntu22
|
||||
- mint20
|
||||
- mint21
|
||||
- fedora35
|
||||
- fedora36
|
||||
- macos-x86_64
|
||||
- macos-aarch64
|
||||
- fedora37
|
||||
- fedora38
|
||||
- dind
|
||||
script:
|
||||
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
|
||||
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
|
||||
registry.gitlab.com
|
||||
- make docker-$DISTRO
|
||||
- docker push registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO:latest
|
||||
- docker push
|
||||
registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO:latest
|
||||
|
||||
Build:
|
||||
stage: build
|
||||
|
|
@ -41,14 +38,13 @@ Build:
|
|||
matrix:
|
||||
- DISTRO:
|
||||
- debian11
|
||||
- debian12
|
||||
- ubuntu20
|
||||
- ubuntu22
|
||||
- mint20
|
||||
- mint21
|
||||
- fedora35
|
||||
- fedora36
|
||||
- macos-x86_64
|
||||
- macos-aarch64
|
||||
- fedora37
|
||||
- fedora38
|
||||
image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
|
||||
tags:
|
||||
- autoscale
|
||||
|
|
@ -59,15 +55,17 @@ Build:
|
|||
- echo VERSION=$(cat version) >> variables.env
|
||||
- echo RELEASE=$(cat release) >> variables.env
|
||||
- echo SOURCE_RELEASE=$(cat source_release) >> variables.env
|
||||
- "t=$(cat version)-$(cat source_release) ; grep 1 release ; if [ ! $? ]; then t=$(cat version)-$(cat source_release)-$(cat release); fi; echo FILEVER=$t >> variables.env"
|
||||
- "t=$(cat version)-$(cat source_release) ; if ! grep 1 release; then t=$(cat version)-$(cat source_release)-$(cat release); fi; echo FILEVER=$t >> variables.env"
|
||||
artifacts:
|
||||
paths:
|
||||
- librewolf-*.deb
|
||||
- librewolf-*.deb.sha256sum
|
||||
- librewolf-*.rpm
|
||||
- librewolf-*.rpm.sha256sum
|
||||
- librewolf-*.dmg
|
||||
- librewolf-*.dmg.sha256sum
|
||||
- librewolf-*-setup.exe
|
||||
- librewolf-*-setup.exe.sha256sum
|
||||
- librewolf-*-portable.zip
|
||||
- librewolf-*-portable.zip.sha256sum
|
||||
reports:
|
||||
dotenv: variables.env
|
||||
|
||||
|
|
@ -86,18 +84,26 @@ Release:
|
|||
before_script:
|
||||
- apt-get update
|
||||
- apt-get install -y curl
|
||||
- curl -L --output /usr/local/bin/release-cli "https://release-cli-downloads.s3.amazonaws.com/latest/release-cli-linux-amd64"
|
||||
- curl -L --output /usr/local/bin/release-cli
|
||||
"https://release-cli-downloads.s3.amazonaws.com/latest/release-cli-linux-amd64"
|
||||
- chmod +x /usr/local/bin/release-cli
|
||||
script:
|
||||
- |
|
||||
codeberg_release_body=""
|
||||
|
||||
function upload_package() {
|
||||
echo "Uploading $1"
|
||||
curl \
|
||||
--header "JOB-TOKEN: $CI_JOB_TOKEN" \
|
||||
--upload-file "$1" \
|
||||
"$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/$1"
|
||||
codeberg_release_body="${codeberg_release_body}[$1]($CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/$1)\n"
|
||||
}
|
||||
|
||||
upload_package librewolf-$FILEVER.en-US.debian11.x86_64.deb
|
||||
upload_package librewolf-$FILEVER.en-US.debian11.x86_64.deb.sha256sum
|
||||
upload_package librewolf-$FILEVER.en-US.debian12.x86_64.deb
|
||||
upload_package librewolf-$FILEVER.en-US.debian12.x86_64.deb.sha256sum
|
||||
upload_package librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb
|
||||
upload_package librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb.sha256sum
|
||||
upload_package librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb
|
||||
|
|
@ -106,17 +112,73 @@ Release:
|
|||
upload_package librewolf-$FILEVER.en-US.mint20.x86_64.deb.sha256sum
|
||||
upload_package librewolf-$FILEVER.en-US.mint21.x86_64.deb
|
||||
upload_package librewolf-$FILEVER.en-US.mint21.x86_64.deb.sha256sum
|
||||
upload_package librewolf-$FILEVER.fc35.x86_64.rpm
|
||||
upload_package librewolf-$FILEVER.fc35.x86_64.rpm.sha256sum
|
||||
upload_package librewolf-$FILEVER.fc36.x86_64.rpm
|
||||
upload_package librewolf-$FILEVER.fc36.x86_64.rpm.sha256sum
|
||||
upload_package librewolf-$FILEVER.en-US.mac.x86_64.dmg
|
||||
upload_package librewolf-$FILEVER.en-US.mac.x86_64.dmg.sha256sum
|
||||
upload_package librewolf-$FILEVER.en-US.mac.aarch64.dmg
|
||||
upload_package librewolf-$FILEVER.en-US.mac.aarch64.dmg.sha256sum
|
||||
upload_package librewolf-$FILEVER.fc37.x86_64.rpm
|
||||
upload_package librewolf-$FILEVER.fc37.x86_64.rpm.sha256sum
|
||||
upload_package librewolf-$FILEVER.fc38.x86_64.rpm
|
||||
upload_package librewolf-$FILEVER.fc38.x86_64.rpm.sha256sum
|
||||
|
||||
echo "Creating Codeberg release"
|
||||
codeberg_release_body="${codeberg_release_body}\n[View on GitLab](https://gitlab.com/librewolf-community/browser/bsys5/-/releases/$FILEVER)"
|
||||
curl -X 'POST' \
|
||||
"https://codeberg.org/api/v1/repos/librewolf/bsys5/releases?token=$CODEBERG_TOKEN" \
|
||||
-H 'accept: application/json' \
|
||||
-H 'Content-Type: application/json' \
|
||||
-d "{
|
||||
\"name\": \"$FILEVER\",
|
||||
\"tag_name\": \"$FILEVER\",
|
||||
\"body\": \"$codeberg_release_body\"
|
||||
}"
|
||||
- |
|
||||
body=$(cat <<EOF
|
||||
{
|
||||
"token": "$REPO_DEPLOY_TOKEN",
|
||||
"debs": [
|
||||
{
|
||||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian11.x86_64.deb",
|
||||
"distros": ["bullseye"]
|
||||
},
|
||||
{
|
||||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian12.x86_64.deb",
|
||||
"distros": ["bookworm"]
|
||||
},
|
||||
{
|
||||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb",
|
||||
"distros": ["focal"]
|
||||
},
|
||||
{
|
||||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb",
|
||||
"distros": ["jammy"]
|
||||
},
|
||||
{
|
||||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint20.x86_64.deb",
|
||||
"distros": ["uma", "una"]
|
||||
},
|
||||
{
|
||||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint21.x86_64.deb",
|
||||
"distros": ["vanessa", "vera"]
|
||||
}
|
||||
],
|
||||
"rpms": [
|
||||
{
|
||||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc37.x86_64.rpm"
|
||||
},
|
||||
{
|
||||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc38.x86_64.rpm"
|
||||
}
|
||||
]
|
||||
}
|
||||
EOF
|
||||
)
|
||||
|
||||
id=$(curl "https://updaterepos.librewolf.net/job" --request POST --data "$body")
|
||||
|
||||
echo "Submitted update request to LibreWolf Software Repository (https://updaterepos.librewolf.net/job?id=$id)"
|
||||
release:
|
||||
tag_name: "$FILEVER"
|
||||
description: "## LibreWolf bsys5 Release v$FILEVER\n\n- \n\n(Built on GitLab by pipeline [$CI_PIPELINE_ID](https://gitlab.com/librewolf-community/browser/bsys5/-/pipelines/$CI_PIPELINE_ID))"
|
||||
description:
|
||||
"## LibreWolf bsys5 Release v$FILEVER\n\n- \n\n(Built on GitLab by
|
||||
pipeline
|
||||
[$CI_PIPELINE_ID](https://gitlab.com/librewolf-community/browser/bsys5/-/pipelines/$CI_PIPELINE_ID))"
|
||||
assets:
|
||||
links:
|
||||
- name: Debian 11 (deb)
|
||||
|
|
@ -125,6 +187,12 @@ Release:
|
|||
- name: Debian 11 (sha256sum)
|
||||
link_type: other
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian11.x86_64.deb.sha256sum
|
||||
- name: Debian 12 (deb)
|
||||
link_type: package
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian12.x86_64.deb
|
||||
- name: Debian 12 (sha256sum)
|
||||
link_type: other
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian12.x86_64.deb.sha256sum
|
||||
- name: Ubuntu 20 (deb)
|
||||
link_type: package
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb
|
||||
|
|
@ -149,84 +217,15 @@ Release:
|
|||
- name: Linux Mint 21 (sha256sum)
|
||||
link_type: other
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint21.x86_64.deb.sha256sum
|
||||
- name: Fedora 35 (rpm)
|
||||
- name: Fedora 37 (rpm)
|
||||
link_type: package
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc35.x86_64.rpm
|
||||
- name: Fedora 35 (sha256sum)
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc37.x86_64.rpm
|
||||
- name: Fedora 37 (sha256sum)
|
||||
link_type: other
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc35.x86_64.rpm.sha256sum
|
||||
- name: Fedora 36 (rpm)
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc37.x86_64.rpm.sha256sum
|
||||
- name: Fedora 38 (rpm)
|
||||
link_type: package
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm
|
||||
- name: Fedora 36 (sha256sum)
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc38.x86_64.rpm
|
||||
- name: Fedora 38 (sha256sum)
|
||||
link_type: other
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm.sha256sum
|
||||
- name: macOS x86_64 (dmg)
|
||||
link_type: package
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.x86_64.dmg
|
||||
- name: macOS x86_64 (sha256sum)
|
||||
link_type: other
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.x86_64.dmg.sha256sum
|
||||
- name: macOS aarch64 (dmg)
|
||||
link_type: package
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.aarch64.dmg
|
||||
- name: macOS aarch64 (sha256sum)
|
||||
link_type: other
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.aarch64.dmg.sha256sum
|
||||
|
||||
Update Repositories:
|
||||
stage: deploy
|
||||
only:
|
||||
- master
|
||||
except:
|
||||
- merge_requests
|
||||
image: curlimages/curl
|
||||
script:
|
||||
- |
|
||||
#
|
||||
FILEVER=$(cat version)-$(cat source_release) ; grep -q 1 release ; if [ ! $? ]; then FILEVER=$(cat version)-$(cat source_release)-$(cat release); fi
|
||||
|
||||
curl "https://shorsh.de/update_lw_repos.php?version=$FILEVER&log=false&token=$REPO_DEPLOY_TOKEN"
|
||||
|
||||
echo "Submitted update request to live LibreWolf repositories"
|
||||
|
||||
body=$(cat <<EOF
|
||||
{
|
||||
"token": "$REPO_DEPLOY_TOKEN",
|
||||
"debs": [
|
||||
{
|
||||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian11.x86_64.deb",
|
||||
"distros": ["bullseye"]
|
||||
},
|
||||
{
|
||||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb",
|
||||
"distros": ["focal"]
|
||||
},
|
||||
{
|
||||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb",
|
||||
"distros": ["jammy"]
|
||||
},
|
||||
{
|
||||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint20.x86_64.deb",
|
||||
"distros": ["uma", "una"]
|
||||
},
|
||||
{
|
||||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint21.x86_64.deb",
|
||||
"distros": ["vanessa"]
|
||||
}
|
||||
],
|
||||
"rpms": [
|
||||
{
|
||||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc35.x86_64.rpm"
|
||||
},
|
||||
{
|
||||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm"
|
||||
}
|
||||
]
|
||||
}
|
||||
EOF
|
||||
)
|
||||
|
||||
id=$(curl "https://staging.updaterepos.librewolf.net/job" --request POST --data "$body")
|
||||
|
||||
echo "Submitted update request to staging LibreWolf Software Repository (https://staging.updaterepos.librewolf.net/job?id=$id)"
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc38.x86_64.rpm.sha256sum
|
||||
|
|
|
|||
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
[submodule "submodules/windows"]
|
||||
path = submodules/windows
|
||||
url = https://gitlab.com/librewolf-community/browser/windows.git
|
||||
73
Makefile
73
Makefile
|
|
@ -1,4 +1,4 @@
|
|||
.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-mint21 mint21 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-ubuntu22 ubuntu22 docker-fedora34 fedora34 docker-fedora35 fedora35 docker-fedora36 fedora36 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind
|
||||
.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-mint21 mint21 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-ubuntu22 ubuntu22 docker-fedora37 fedora37 docker-fedora38 fedora38 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind windows
|
||||
|
||||
version:=$(shell cat version)
|
||||
release:=$(shell cat release)
|
||||
|
|
@ -13,19 +13,21 @@ help :
|
|||
@echo " [update] [prune] - misc."
|
||||
@echo ""
|
||||
@echo "docker targets:"
|
||||
@echo " [docker-debian11], [docker-mint20], [docker-mint21]"
|
||||
@echo " [docker-debian11], [docker-debian12],[docker-mint20], [docker-mint21]"
|
||||
@echo " [docker-ubuntu20], [docker-ubuntu21], [docker-ubuntu22]"
|
||||
@echo " [docker-fedora34], [docker-fedora35], [docker-fedora36]"
|
||||
@echo " [docker-fedora37], [docker-fedora38]"
|
||||
@echo " [docker-macos-x86_64], [docker-macos-aarch64]"
|
||||
@echo " [docker-tumbleweed]"
|
||||
@echo " [docker-dind]"
|
||||
@echo " [docker-windows]"
|
||||
@echo ""
|
||||
@echo "build targets:"
|
||||
@echo " [debian11], [mint20], [mint21], [ubuntu20], [ubuntu21]"
|
||||
@echo " [debian11], [debian12], [mint20], [mint21], [ubuntu20], [ubuntu21]"
|
||||
@echo " [ubuntu22]"
|
||||
@echo " [fedora34], [fedora35], [fedora36]"
|
||||
@echo " [fedora37], [fedora38]"
|
||||
@echo " [macos-x64_64], [macos-aarch64]"
|
||||
@echo " [tumbleweed]"
|
||||
@echo " [windows]"
|
||||
@echo " [tarball]"
|
||||
@echo ""
|
||||
|
||||
|
|
@ -42,12 +44,14 @@ veryclean : clean
|
|||
prune :
|
||||
docker system prune --all --force
|
||||
|
||||
docker : docker-debian11 docker-mint20 docker-mint21 docker-ubuntu20 docker-ubuntu21 docker-ubuntu22 docker-fedora34 docker-fedora35 docker-fedora36 docker-tumbleweed docker-macos-x86_64 docker-macos-aarch64 docker-dind
|
||||
docker : docker-debian11 docker-debian12 docker-mint20 docker-mint21 docker-ubuntu20 docker-ubuntu21 docker-ubuntu22 docker-fedora34 docker-fedora37 docker-fedora38 docker-tumbleweed docker-macos-x86_64 docker-macos-aarch64 docker-dind
|
||||
|
||||
build :
|
||||
${MAKE} clean
|
||||
${MAKE} debian11
|
||||
${MAKE} clean
|
||||
${MAKE} debian12
|
||||
${MAKE} clean
|
||||
${MAKE} mint20
|
||||
${MAKE} clean
|
||||
${MAKE} mint21
|
||||
|
|
@ -60,9 +64,9 @@ build :
|
|||
${MAKE} clean
|
||||
${MAKE} fedora34
|
||||
${MAKE} clean
|
||||
${MAKE} fedora35
|
||||
${MAKE} fedora37
|
||||
${MAKE} clean
|
||||
${MAKE} fedora36
|
||||
${MAKE} fedora38
|
||||
${MAKE} clean
|
||||
${MAKE} tumbleweed
|
||||
${MAKE} clean
|
||||
|
|
@ -70,17 +74,20 @@ build :
|
|||
${MAKE} clean
|
||||
${MAKE} macos-aarch64
|
||||
${MAKE} clean
|
||||
${MAKE} windows
|
||||
${MAKE} clean
|
||||
|
||||
push :
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/debian11
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/debian12
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/mint20
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/mint21
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu20
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu21
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora34
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora35
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora36
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora37
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora38
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/tumbleweed
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos-x86_64
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos-aarch64
|
||||
|
|
@ -88,14 +95,15 @@ push :
|
|||
|
||||
rmi :
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/debian11
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/debian12
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/mint20
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/mint21
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu20
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu21
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora34
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora35
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora36
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora37
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora38
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/tumbleweed
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos-x86_64
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos-aarch64
|
||||
|
|
@ -138,6 +146,12 @@ docker-debian11 :
|
|||
debian11 :
|
||||
${MAKE} -f assets/linux.mk distro=debian11 build
|
||||
${MAKE} -f assets/linux.artifacts.mk distro=debian11 artifacts-deb
|
||||
## debian12
|
||||
docker-debian12 :
|
||||
${MAKE} -f assets/linux.mk distro=debian12 "distro_image=debian:bookworm" docker
|
||||
debian12 :
|
||||
${MAKE} -f assets/linux.mk distro=debian12 build
|
||||
${MAKE} -f assets/linux.artifacts.mk distro=debian12 artifacts-deb
|
||||
## mint20
|
||||
docker-mint20 :
|
||||
${MAKE} -f assets/linux.mk distro=mint20 "distro_image=linuxmintd/mint20.2-amd64" docker
|
||||
|
|
@ -168,24 +182,18 @@ docker-ubuntu22 :
|
|||
ubuntu22 :
|
||||
${MAKE} -f assets/linux.mk distro=ubuntu22 build
|
||||
${MAKE} -f assets/linux.artifacts.mk distro=ubuntu22 artifacts-deb
|
||||
## fedora34
|
||||
docker-fedora34 :
|
||||
${MAKE} -f assets/linux.mk distro=fedora34 "distro_image=fedora:34" docker
|
||||
fedora34 :
|
||||
${MAKE} -f assets/linux.mk distro=fedora34 build
|
||||
${MAKE} -f assets/linux.artifacts.mk fc=fc34 distro=fedora34 artifacts-rpm
|
||||
## fedora35
|
||||
docker-fedora35 :
|
||||
${MAKE} -f assets/linux.mk distro=fedora35 "distro_image=fedora:35" docker
|
||||
fedora35 :
|
||||
${MAKE} -f assets/linux.mk distro=fedora35 build
|
||||
${MAKE} -f assets/linux.artifacts.mk fc=fc35 distro=fedora35 artifacts-rpm
|
||||
## fedora36
|
||||
docker-fedora36 :
|
||||
${MAKE} -f assets/linux.mk distro=fedora36 "distro_image=fedora:36" docker
|
||||
fedora36 :
|
||||
${MAKE} -f assets/linux.mk distro=fedora36 build
|
||||
${MAKE} -f assets/linux.artifacts.mk fc=fc36 distro=fedora36 artifacts-rpm
|
||||
## fedora37
|
||||
docker-fedora37 :
|
||||
${MAKE} -f assets/linux.mk distro=fedora37 "distro_image=fedora:37" docker
|
||||
fedora37 :
|
||||
${MAKE} -f assets/linux.mk distro=fedora37 build
|
||||
${MAKE} -f assets/linux.artifacts.mk fc=fc37 distro=fedora37 artifacts-rpm
|
||||
## fedora38
|
||||
docker-fedora38 :
|
||||
${MAKE} -f assets/linux.mk distro=fedora38 "distro_image=fedora:38" docker
|
||||
fedora38 :
|
||||
${MAKE} -f assets/linux.mk distro=fedora38 build
|
||||
${MAKE} -f assets/linux.artifacts.mk fc=fc38 distro=fedora38 artifacts-rpm
|
||||
## opensuse tumbleweed
|
||||
docker-tumbleweed :
|
||||
${MAKE} -f assets/linux.mk distro=tumbleweed "distro_image=opensuse/tumbleweed" docker
|
||||
|
|
@ -216,6 +224,11 @@ docker-macos-aarch64 :
|
|||
macos-aarch64 :
|
||||
${MAKE} -f assets/macos.mk arch=aarch64 build
|
||||
|
||||
## windows
|
||||
docker-windows :
|
||||
${MAKE} -f assets/windows.mk docker
|
||||
windows :
|
||||
${MAKE} -f assets/windows.mk build
|
||||
|
||||
#
|
||||
# Docker in Docker (for GitLab CI)
|
||||
|
|
|
|||
20
README.md
20
README.md
|
|
@ -9,16 +9,16 @@ scripts.
|
|||
|
||||
## <a id="targets"></a> Supported Targets
|
||||
|
||||
| Platform | x86_64 | aarch64 |
|
||||
| ----------------- | ----------------------- | ------------------ |
|
||||
| Linux | | |
|
||||
| └─ Debian (deb) | ✅ (debian11) | - |
|
||||
| └─ Ubuntu (deb) | ✅ (ubuntu20, ubuntu22) | - |
|
||||
| └─ Mint (deb) | ✅ (mint20, mint21) | - |
|
||||
| └─ Fedora (rpm) | ✅ (fedora35, fedora36) | - |
|
||||
| └─ openSUSE (rpm) | ✅ (tumbleweed) | - |
|
||||
| MacOS (dmg) | ✅ (macos-x64_64) | ✅ (macos-aarch64) |
|
||||
| Windows | _WIP_ | - |
|
||||
| Platform | x86_64 | aarch64 |
|
||||
| ------------------------ | ----------------------- | ------------------ |
|
||||
| Linux | | |
|
||||
| └─ Debian (deb) | ✅ (debian11,debian12) | - |
|
||||
| └─ Ubuntu (deb) | ✅ (ubuntu20, ubuntu22) | - |
|
||||
| └─ Mint (deb) | ✅ (mint20, mint21) | - |
|
||||
| └─ Fedora (rpm) | ✅ (fedora38, fedora37) | - |
|
||||
| └─ openSUSE (rpm) | ✅ (tumbleweed) | - |
|
||||
| MacOS (dmg) | ✅ (macos-x64_64) | ✅ (macos-aarch64) |
|
||||
| Windows (setup,portable) | ✅ (windows) | - |
|
||||
|
||||
## Running bsys5 Locally
|
||||
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@ ENV TZ=Europe/Amsterdam
|
|||
|
||||
|
||||
# dependencies needed to run ./mach bootstrap
|
||||
RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install python3 python3-dev python3-pip wget dpkg-sig ; true)
|
||||
RUN ( dnf -y upgrade && dnf -y install python3 python3-devel wget rpm-build rpm-sign ; true)
|
||||
RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install python3 python3-dev python3-pip wget ; apt-get -y install dpkg-sig; true)
|
||||
RUN ( dnf -y upgrade && dnf -y install python3 python3-devel gcc wget rpm-build rpm-sign ; true)
|
||||
RUN ( zypper -n in mercurial python3 python3-pip python3-devel wget rpm-build ; true)
|
||||
|
||||
# run the bootstrap
|
||||
RUN cd /tmp &&\
|
||||
wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build &&\
|
||||
wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$version-$source_release/librewolf-$version-$source_release.source.tar.gz &&\
|
||||
tar xf librewolf-$version-$source_release.source.tar.gz &&\
|
||||
cd librewolf-$version-$source_release &&\
|
||||
MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser &&\
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ librewolf-$(full_version).en-US.$(distro).x86_64.deb : $(infile)
|
|||
(cd work && tar xf ../$<)
|
||||
cp -v assets/linux.build-deb.sh work/
|
||||
[ "$(SIGNING_KEY)" != "" ] && cp -v $(SIGNING_KEY) work/pk.asc ; true
|
||||
(cd work && sed "s/MYDIR/\/usr\/share\/librewolf/g" < ../assets/linux.librewolf.desktop.in > start-librewolf.desktop)
|
||||
(cd work && sed "s/MYDIR/\/usr\/share\/librewolf/g" < ../assets/linux.librewolf.desktop.in > librewolf.desktop)
|
||||
ifeq ($(use_docker),false)
|
||||
(cd work && bash linux.build-deb.sh $(full_version))
|
||||
else
|
||||
|
|
@ -46,7 +46,7 @@ librewolf-$(full_version).$(fc).x86_64.rpm : $(infile)
|
|||
cp -v release work
|
||||
cp -v source_release work
|
||||
cp -v assets/linux.librewolf.spec work/librewolf.spec
|
||||
cp -v assets/linux.librewolf.desktop.in work/librewolf/start-librewolf.desktop.in
|
||||
cp -v assets/linux.librewolf.desktop.in work/librewolf/librewolf.desktop.in
|
||||
cp -v assets/linux.librewolf.ico work/librewolf/librewolf.ico
|
||||
[ "$(SIGNING_KEY)" != "" ] && cp -v $(SIGNING_KEY) work/pk.asc ; true
|
||||
rm -f work/librewolf/browser/features/proxy-failover@mozilla.com.xpi
|
||||
|
|
@ -66,4 +66,3 @@ endif
|
|||
artifacts-rpm : $(infile) $(infile).sha256sum
|
||||
sha256sum -c $(infile).sha256sum
|
||||
${MAKE} -f assets/linux.artifacts.mk fc=$(fc) distro=$(distro) librewolf-$(full_version).$(fc).x86_64.rpm
|
||||
|
||||
|
|
|
|||
|
|
@ -34,15 +34,21 @@ cd ../..
|
|||
|
||||
# add the application icon
|
||||
mkdir -p usr/share/applications
|
||||
mkdir -p usr/share/icons
|
||||
cp -v usr/share/librewolf/browser/chrome/icons/default/default64.png usr/share/icons/librewolf.png
|
||||
cp -v ../start-librewolf.desktop usr/share/applications/start-librewolf.desktop
|
||||
mkdir -p usr/share/icons/hicolor/16x16/apps
|
||||
mkdir -p usr/share/icons/hicolor/32x32/apps
|
||||
mkdir -p usr/share/icons/hicolor/64x64/apps
|
||||
mkdir -p usr/share/icons/hicolor/128x128/apps
|
||||
cp -v usr/share/librewolf/browser/chrome/icons/default/default16.png usr/share/icons/hicolor/16x16/apps/librewolf.png
|
||||
cp -v usr/share/librewolf/browser/chrome/icons/default/default32.png usr/share/icons/hicolor/32x32/apps/librewolf.png
|
||||
cp -v usr/share/librewolf/browser/chrome/icons/default/default64.png usr/share/icons/hicolor/64x64/apps/librewolf.png
|
||||
cp -v usr/share/librewolf/browser/chrome/icons/default/default128.png usr/share/icons/hicolor/128x128/apps/librewolf.png
|
||||
cp -v ../librewolf.desktop usr/share/applications/librewolf.desktop
|
||||
|
||||
cd ..
|
||||
dpkg-deb --build librewolf
|
||||
|
||||
# Sign the deb file if private key is provided
|
||||
if [[ -f pk.asc ]]; then
|
||||
# Sign the deb file if private key is provided and we have dpkg-sig available
|
||||
if [[ -f pk.asc ]] && command -v dpkg-sig &>/dev/null; then
|
||||
gpg --import pk.asc
|
||||
dpkg-sig --sign builder librewolf.deb
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -43,6 +43,9 @@ rm -rf /usr/src && ln -sv /WORK /usr/src # Required for openSUSE
|
|||
sed "s/__VERSION__/$version/g" </work/librewolf.spec >/work/tmp.spec
|
||||
sed "s/__RELEASE__/$full_release/g" </work/tmp.spec >rpmbuild/SPECS/librewolf.spec
|
||||
|
||||
# fix: remove some tool binaries we don't want
|
||||
rm -f /work/librewolf/{glxtest,vaapitest}
|
||||
|
||||
# copy in the librewolf assets
|
||||
cp -rv /work/librewolf rpmbuild/SOURCES
|
||||
|
||||
|
|
@ -59,9 +62,15 @@ cd ../../..
|
|||
|
||||
# Application icon
|
||||
mkdir -p librewolf-$version/usr/share/applications
|
||||
mkdir -p librewolf-$version/usr/share/icons
|
||||
cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default64.png librewolf-$version/usr/share/icons/librewolf.png
|
||||
sed "s/MYDIR/\/usr\/share\/librewolf/g" </work/librewolf/start-librewolf.desktop.in >librewolf-$version/usr/share/applications/librewolf.desktop
|
||||
mkdir -p librewolf-$version/usr/share/icons/hicolor/16x16/apps
|
||||
mkdir -p librewolf-$version/usr/share/icons/hicolor/32x32/apps
|
||||
mkdir -p librewolf-$version/usr/share/icons/hicolor/64x64/apps
|
||||
mkdir -p librewolf-$version/usr/share/icons/hicolor/128x128/apps
|
||||
cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default16.png librewolf-$version/usr/share/icons/hicolor/16x16/apps/librewolf.png
|
||||
cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default32.png librewolf-$version/usr/share/icons/hicolor/32x32/apps/librewolf.png
|
||||
cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default64.png librewolf-$version/usr/share/icons/hicolor/64x64/apps/librewolf.png
|
||||
cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default128.png librewolf-$version/usr/share/icons/hicolor/128x128/apps/librewolf.png
|
||||
sed "s/MYDIR/\/usr\/share\/librewolf/g" </work/librewolf/librewolf.desktop.in >librewolf-$version/usr/share/applications/librewolf.desktop
|
||||
|
||||
tar cvfz lw.tar.gz librewolf-$version
|
||||
# todo perhaps: rm -rf librwolf-$version
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ Comment=LibreWolf Browser
|
|||
Categories=Network;WebBrowser;Security;
|
||||
StartupWMClass=librewolf-default
|
||||
Exec=MYDIR/librewolf %u
|
||||
Icon=MYDIR/browser/chrome/icons/default/default64.png
|
||||
Icon=librewolf
|
||||
|
||||
Actions=new-window;new-private-window;safe-mode;preferences;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,10 @@ cp -rv * "$RPM_BUILD_ROOT"
|
|||
%files
|
||||
/usr/bin/librewolf
|
||||
/usr/share/applications/librewolf.desktop
|
||||
/usr/share/icons/librewolf.png
|
||||
/usr/share/icons/hicolor/16x16/apps/librewolf.png
|
||||
/usr/share/icons/hicolor/32x32/apps/librewolf.png
|
||||
/usr/share/icons/hicolor/64x64/apps/librewolf.png
|
||||
/usr/share/icons/hicolor/128x128/apps/librewolf.png
|
||||
/usr/share/librewolf/application.ini
|
||||
/usr/share/librewolf/browser/chrome/icons/default/default128.png
|
||||
/usr/share/librewolf/browser/chrome/icons/default/default16.png
|
||||
|
|
@ -58,6 +61,7 @@ cp -rv * "$RPM_BUILD_ROOT"
|
|||
/usr/share/librewolf/librewolf
|
||||
/usr/share/librewolf/librewolf-bin
|
||||
/usr/share/librewolf/librewolf.cfg
|
||||
/usr/share/librewolf/librewolf.desktop.in
|
||||
/usr/share/librewolf/librewolf.ico
|
||||
/usr/share/librewolf/libsmime3.so
|
||||
/usr/share/librewolf/libsoftokn3.so
|
||||
|
|
@ -66,5 +70,3 @@ cp -rv * "$RPM_BUILD_ROOT"
|
|||
/usr/share/librewolf/omni.ja
|
||||
/usr/share/librewolf/platform.ini
|
||||
/usr/share/librewolf/plugin-container
|
||||
/usr/share/librewolf/start-librewolf.desktop.in
|
||||
|
||||
|
|
|
|||
|
|
@ -16,20 +16,21 @@ ENV wasi_mainversion 14
|
|||
# dependencies needed to run ./mach bootstrap
|
||||
RUN apt-get -y update && apt-get -y upgrade && apt-get -y install mercurial python3 python3-dev python3-pip wget build-essential libpython3-dev m4 unzip uuid zip libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdbus-glib-1-dev libdrm-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb rsync
|
||||
|
||||
# setup osx sdk
|
||||
RUN mkdir -p /osx-cross/MacOSX-SDKs &&\
|
||||
cd /osx-cross/MacOSX-SDKs &&\
|
||||
wget -q "https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX11.3.sdk.tar.xz" &&\
|
||||
tar xf MacOSX11.3.sdk.tar.xz &&\
|
||||
rm -f MacOSX11.3.sdk.tar.xz
|
||||
|
||||
#
|
||||
# Setup MacOSX SDK v13.0
|
||||
RUN mkdir -p /osx-cross/MacOSX-SDKs && cd /osx-cross/MacOSX-SDKs && wget https://files.stanzabird.nl/MacOSX13.0.sdk.zip && unzip MacOSX13.0.sdk.zip && rm MacOSX13.0.sdk.zip
|
||||
|
||||
|
||||
# run the bootstrap
|
||||
RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build
|
||||
RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$version-$source_release/librewolf-$version-$source_release.source.tar.gz
|
||||
RUN tar xf librewolf-$version-$source_release.source.tar.gz
|
||||
WORKDIR librewolf-$version-$source_release
|
||||
|
||||
RUN echo ac_add_options --target=$arch-apple-darwin > mozconfig
|
||||
RUN echo ac_add_options --enable-bootstrap >> mozconfig
|
||||
RUN echo ac_add_options --with-macos-sdk=/osx-cross/MacOSX-SDKs/MacOSX11.3.sdk >> mozconfig
|
||||
RUN echo ac_add_options --with-macos-sdk=/osx-cross/MacOSX-SDKs/MacOSX13.0.sdk >> mozconfig
|
||||
|
||||
RUN MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser
|
||||
RUN ./mach artifact toolchain --from-build linux64-libdmg
|
||||
RUN ./mach artifact toolchain --from-build linux64-cctools-port
|
||||
|
|
@ -44,7 +45,7 @@ RUN cp -r cctools /root/.mozbuild
|
|||
RUN cp -r sysroot-wasm32-wasi /root/.mozbuild
|
||||
## RUN cp -r clang /root/.mozbuild
|
||||
RUN cp -r dmg /root/.mozbuild
|
||||
RUN cp -r hfsplus-tools /root/.mozbuild
|
||||
# RUN cp -r hfsplus-tools /root/.mozbuild
|
||||
RUN pip install testresources pycairo
|
||||
WORKDIR ..
|
||||
RUN rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ ac_add_options --enable-application=browser
|
|||
|
||||
# for crosscompiling...
|
||||
ac_add_options --target=_ARCH_-apple-darwin
|
||||
ac_add_options --with-macos-sdk=/osx-cross/MacOSX-SDKs/MacOSX11.3.sdk
|
||||
ac_add_options --with-macos-sdk=/osx-cross/MacOSX-SDKs/MacOSX13.0.sdk
|
||||
|
||||
CROSS_BUILD=1
|
||||
export CROSS=/root/.mozbuild
|
||||
|
|
@ -22,7 +22,7 @@ export HOST_CC="$CROSS/clang/bin/clang"
|
|||
export HOST_CXX="$CROSS/clang/bin/clang++"
|
||||
|
||||
# These are needed for packaging.
|
||||
export MKFSHFS="$CROSS/hfsplus-tools/newfs_hfs"
|
||||
# export MKFSHFS="$CROSS/hfsplus-tools/newfs_hfs"
|
||||
export DMG_TOOL="$CROSS/dmg/dmg"
|
||||
export HFS_TOOL="$CROSS/dmg/hfsplus"
|
||||
|
||||
|
|
|
|||
8
assets/windows.Dockerfile
Normal file
8
assets/windows.Dockerfile
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
FROM ubuntu:latest
|
||||
RUN apt-get -y update && apt-get -y upgrade && apt-get -y install bash git wget build-essential zip
|
||||
RUN dpkg --add-architecture i386 && apt-get -y update && apt-get -y install wine32
|
||||
|
||||
RUN tmpdir=$(mktemp -d) && cd $tmpdir && git clone https://gitlab.com/librewolf-community/browser/windows.git && cd windows/linux && make setup-debian && make fetch && make bootstrap && cd /root && rm -rf $tmpdir
|
||||
|
||||
WORKDIR /work
|
||||
VOLUME ["/work"]
|
||||
42
assets/windows.mk
Normal file
42
assets/windows.mk
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
# windows.mk - this one is quite a bit different from the others,
|
||||
# but we can fix that later.
|
||||
|
||||
.PHONY : docker build
|
||||
|
||||
version:=$(shell cat version)
|
||||
release:=$(shell cat release)
|
||||
source_release:=$(shell cat source_release)
|
||||
full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)")
|
||||
|
||||
outfile-exe=librewolf-$(full_version).en-US.win64-setup.exe
|
||||
outfile-zip=librewolf-$(full_version).en-US.win64-portable.zip
|
||||
outfiles=$(outfile-exe) $(outfile-zip)
|
||||
|
||||
distro=windows
|
||||
image=registry.gitlab.com/librewolf-community/browser/bsys5/$(distro):latest
|
||||
|
||||
docker :
|
||||
|
||||
docker build -t $(image) - < assets/windows.Dockerfile
|
||||
|
||||
build :
|
||||
|
||||
pwd
|
||||
rm -rf windows
|
||||
git clone https://gitlab.com/librewolf-community/browser/windows.git
|
||||
|
||||
( cd windows/linux && pwd && ${MAKE} fetch )
|
||||
|
||||
ifeq ($(use_docker),false)
|
||||
( cd windows/linux && ${MAKE} )
|
||||
else
|
||||
docker run --rm -v $(shell pwd)/windows/linux:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/$(distro) sh -c "${MAKE} all"
|
||||
endif
|
||||
|
||||
cp -v windows/linux/$(outfiles) .
|
||||
|
||||
sha256sum $(outfile-exe) > $(outfile-exe).sha256sum
|
||||
cat $(outfile-exe).sha256sum
|
||||
sha256sum $(outfile-zip) > $(outfile-zip).sha256sum
|
||||
cat $(outfile-zip).sha256sum
|
||||
|
||||
|
|
@ -1 +1 @@
|
|||
2
|
||||
1
|
||||
|
|
|
|||
1
submodules/windows
Submodule
1
submodules/windows
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 70b155aca44a159c3a93430f283efd2df2381547
|
||||
2
version
2
version
|
|
@ -1 +1 @@
|
|||
107.0.1
|
||||
116.0.2
|
||||
|
|
|
|||
1
windows
Submodule
1
windows
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit b3b007f1710ccfe2c9b6442f5f836a16af8b5acb
|
||||
Loading…
Add table
Reference in a new issue