Skip to content

Commit 8e34dbd

Browse files
dot-mikedot-mike
authored
Merge pull request #4 from dot-mike/upgrade
Upgrade browser version to 2025-10-08
2 parents 105dd94 + 56ea6c9 commit 8e34dbd

File tree

330 files changed

+85292
-83706
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

330 files changed

+85292
-83706
lines changed

‎.gitattributes‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,17 @@
1-
* -text
1+
* -text
2+
3+
# Prefer local Flashpoint branding during merges
4+
basilisk/branding/flashpoint/** merge=ours
5+
6+
# Keep local app identifiers and license overrides
7+
basilisk/app/application.ini merge=ours
8+
basilisk/app/module.ver merge=ours
9+
basilisk/base/content/aboutDialog.xul merge=ours
10+
basilisk/base/content/overrides/app-license.html merge=ours
11+
12+
# Preserve Flashpoint-specific config settings
13+
basilisk/confvars.sh merge=ours
14+
15+
# Keep Flashpoint installer customizations
16+
basilisk/installer/windows/nsis/defines.nsi.in merge=ours
17+
basilisk/installer/windows/nsis/shared.nsh merge=ours

‎.github/workflows/build-fpnavigator-linux-i686.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: Build fpnavigator Linux i686
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- master
8+
- release
9+
10+
jobs:
11+
build-fpnavigator:
12+
if: false
13+
name: Build fpnavigator Linux ${{ matrix.config.name }}
14+
runs-on: ubuntu-latest
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
config:
19+
- name: GTK3 i686
20+
gtk: gtk3
21+
arch: i686
22+
- name: GTK2 i686
23+
gtk: gtk2
24+
arch: i686
25+
steps:
26+
- name: Free Disk Space
27+
run: |
28+
sudo apt-get update
29+
sudo apt-get remove -y *dotnet* *google-cloud* *aws* *php* google-chrome-stable firefox powershell mono-devel
30+
sudo apt-get autoremove -y
31+
32+
- uses: actions/checkout@v4
33+
with:
34+
submodules: recursive
35+
36+
- name: Copy mozconfig
37+
run: cp mozconfigs/linux/${{ matrix.config.arch }}/${{ matrix.config.gtk }}_unofficial_branding.mozconfig .mozconfig
38+
39+
# Restore ccache cache
40+
- name: Restore CCache Cache
41+
uses: actions/cache@v4
42+
continue-on-error: true
43+
with:
44+
path: ~/.ccache
45+
key: ${{ runner.os }}-ccache-${{ github.ref }}-${{ matrix.config.gtk }}-${{ matrix.config.arch }}-${{ github.run_id }}
46+
restore-keys: ${{ runner.os }}-ccache-${{ github.ref }}-${{ matrix.config.gtk }}-${{ matrix.config.arch }}
47+
48+
- name: Build fpnavigator
49+
run: ./build-scripts/linux/build_fpnavigator.sh
50+
51+
- uses: actions/upload-artifact@v4
52+
with:
53+
name: fpnavigator-linux-${{ matrix.config.arch }}-${{ matrix.config.gtk }}
54+
path: obj-${{ matrix.config.arch }}-unknown-linux-gnu/dist/fpnavigator-*
55+
56+
# Save ccache cache
57+
- name: Save CCache Cache
58+
if: always() # Ensures the cache step runs even if the build fails
59+
uses: actions/cache@v4
60+
with:
61+
path: ~/.ccache
62+
key: ${{ runner.os }}-ccache-${{ github.ref }}-${{ matrix.config.gtk }}-${{ matrix.config.arch }}-${{ github.run_id }}
63+
restore-keys: ${{ runner.os }}-ccache-${{ github.ref }}-${{ matrix.config.gtk }}-${{ matrix.config.arch }}
64+
continue-on-error: true

‎.github/workflows/build-fpnavigator-linux-x86_64.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: Build fpnavigator Linux x86_64
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- master
8+
- release
9+
10+
jobs:
11+
build-fpnavigator:
12+
if: false
13+
name: Build fpnavigator Linux ${{ matrix.config.name }}
14+
runs-on: ubuntu-latest
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
config:
19+
- name: GTK3 x86_64
20+
gtk: gtk3
21+
arch: x86_64
22+
- name: GTK2 x86_64
23+
gtk: gtk2
24+
arch: x86_64
25+
steps:
26+
- name: Free Disk Space
27+
run: |
28+
sudo apt-get update
29+
sudo apt-get remove -y *dotnet* *google-cloud* *aws* *php* google-chrome-stable firefox powershell mono-devel
30+
sudo apt-get autoremove -y
31+
32+
- uses: actions/checkout@v4
33+
with:
34+
submodules: recursive
35+
36+
- name: Copy mozconfig
37+
run: cp mozconfigs/linux/${{ matrix.config.arch }}/${{ matrix.config.gtk }}_unofficial_branding.mozconfig .mozconfig
38+
39+
# Restore ccache cache
40+
- name: Restore CCache Cache
41+
uses: actions/cache@v4
42+
continue-on-error: true
43+
with:
44+
path: ~/.ccache
45+
key: ${{ runner.os }}-ccache-${{ github.ref }}-${{ matrix.config.gtk }}-${{ matrix.config.arch }}-${{ github.run_id }}
46+
restore-keys: ${{ runner.os }}-ccache-${{ github.ref }}-${{ matrix.config.gtk }}-${{ matrix.config.arch }}
47+
48+
- name: Build fpnavigator
49+
run: ./build-scripts/linux/build_fpnavigator.sh
50+
51+
- uses: actions/upload-artifact@v4
52+
with:
53+
name: fpnavigator-linux-${{ matrix.config.arch }}-${{ matrix.config.gtk }}
54+
path: obj-${{ matrix.config.arch }}-pc-linux-gnu/dist/fpnavigator-*
55+
56+
# Save ccache cache
57+
- name: Save CCache Cache
58+
if: always() # Ensures the cache step runs even if the build fails
59+
uses: actions/cache@v4
60+
with:
61+
path: ~/.ccache
62+
key: ${{ runner.os }}-ccache-${{ github.ref }}-${{ matrix.config.gtk }}-${{ matrix.config.arch }}-${{ github.run_id }}
63+
restore-keys: ${{ runner.os }}-ccache-${{ github.ref }}-${{ matrix.config.gtk }}-${{ matrix.config.arch }}
64+
continue-on-error: true

‎.github/workflows/build-fpnavigator-macos.yml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: Build fpnavigator MacOS
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- master
8+
- release
9+
10+
jobs:
11+
build-fpnavigator:
12+
if: false
13+
name: Build fpnavigator MacOS - ${{ matrix.config.name }}
14+
runs-on: macos-latest
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
config:
19+
- name: intel64
20+
arch: intel64
21+
compiler-arch: x86_64
22+
- name: arm64
23+
arch: arm64
24+
compiler-arch: aarch64
25+
steps:
26+
- uses: maxim-lobanov/setup-xcode@v1
27+
with:
28+
xcode-version: 16.0
29+
30+
- uses: actions/checkout@v4
31+
with:
32+
submodules: recursive
33+
34+
- name: Setup MacOS 11.3 SDK
35+
run: |
36+
mkdir -p /Applications/Xcode_16.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs
37+
wget https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX11.3.sdk.tar.xz -P /Applications/Xcode_16.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs
38+
tar xf /Applications/Xcode_16.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk.tar.xz -C /Applications/Xcode_16.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs
39+
rm -rf /Applications/Xcode_16.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk.tar.xz
40+
41+
- name: Install Dependencies
42+
run: |
43+
brew install yasm pyenv
44+
45+
# Setup Python 2 with pyenv
46+
pyenv install 2.7.18
47+
pyenv global 2.7.18
48+
49+
- name: Copy mozconfig
50+
run: cp mozconfigs/macos/${{ matrix.config.arch }}/macos-${{ matrix.config.arch }}-mozconfig .mozconfig
51+
52+
- name: Build fpnavigator
53+
run: |
54+
# Use Python 2 we installed earler
55+
export PATH="$(pyenv root)/shims:${PATH}"
56+
57+
./mach configure
58+
./mach build
59+
./mach package
60+
61+
- uses: actions/upload-artifact@v4
62+
with:
63+
name: fpnavigator-macos-${{ matrix.config.arch }}
64+
path: |
65+
obj-${{ matrix.config.compiler-arch }}-apple-darwin/dist/*.app
66+
obj-${{ matrix.config.compiler-arch }}-apple-darwin/dist/fpnavigator-*

‎.github/workflows/build-fpnavigator-windows.yml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: Build fpnavigator Windows
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- master
8+
9+
jobs:
10+
build-fpnavigator-windows:
11+
name: Build fpnavigator ${{ matrix.config.name }}
12+
runs-on: windows-2022
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
config:
17+
- name: Windows-Win32
18+
win: win32
19+
arch: i686
20+
21+
steps:
22+
- name: List available VC Redist folders (for debugging)
23+
run: tree /f "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\redist"
24+
25+
- name: Install MozillaBuild
26+
run: |
27+
Invoke-WebRequest -Uri https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-3.4.exe -OutFile MozillaBuildSetup-3.4.exe
28+
.\MozillaBuildSetup-3.4.exe /S /v/qn | Write-Output
29+
del .\MozillaBuildSetup-3.4.exe
30+
shell: pwsh
31+
32+
- uses: ChristopheLav/windows-sdk-install@v1
33+
with:
34+
version-sdk: ${{ matrix.config.arch == 'x86_64' && '26100' || '22621' }}
35+
features: 'OptionId.DesktopCPPx64,OptionId.DesktopCPPx86'
36+
37+
- uses: actions/checkout@v4
38+
with:
39+
submodules: recursive
40+
41+
- name: Copy mozconfig
42+
run: Copy-Item .github\workflows\build-fpnavigator-windows\mozconfig-${{ matrix.config.win }} -Destination .\.mozconfig
43+
shell: pwsh
44+
45+
- name: debug dirs
46+
run: |
47+
C:\mozilla-build\start-shell.bat echo '/c'
48+
C:\mozilla-build\start-shell.bat ls /c
49+
C:\mozilla-build\start-shell.bat echo '/c/a'
50+
C:\mozilla-build\start-shell.bat ls /c/a
51+
C:\mozilla-build\start-shell.bat echo '/d'
52+
C:\mozilla-build\start-shell.bat ls /d
53+
C:\mozilla-build\start-shell.bat echo '/d/a'
54+
C:\mozilla-build\start-shell.bat ls /d/a
55+
56+
- name: mach configure
57+
run: |
58+
C:\mozilla-build\start-shell.bat /d/a/${{ github.event.repository.name }}/${{ github.event.repository.name }}/.github/workflows/build-fpnavigator-windows/mach-passthrough-windows.sh /d/a/${{ github.event.repository.name }}/${{ github.event.repository.name }} configure
59+
shell: pwsh
60+
61+
- name: mach build
62+
run: |
63+
C:\mozilla-build\start-shell.bat /d/a/${{ github.event.repository.name }}/${{ github.event.repository.name }}/.github/workflows/build-fpnavigator-windows/mach-passthrough-windows.sh /d/a/${{ github.event.repository.name }}/${{ github.event.repository.name }} build
64+
shell: pwsh
65+
66+
- name: mach package
67+
run: |
68+
C:\mozilla-build\start-shell.bat /d/a/${{ github.event.repository.name }}/${{ github.event.repository.name }}/.github/workflows/build-fpnavigator-windows/mach-passthrough-windows.sh /d/a/${{ github.event.repository.name }}/${{ github.event.repository.name }} package
69+
shell: pwsh
70+
71+
- uses: actions/upload-artifact@v4
72+
with:
73+
name: flashpointnavigator-windows-${{ matrix.config.win }}
74+
path: obj-${{ matrix.config.arch }}-pc-mingw32/dist/flashpointnavigator-*

‎.github/workflows/build-fpnavigator-windows/mach-passthrough-windows.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
fpnavigator_DIR=$1
3+
MACH_ARG=$2
4+
5+
cd $fpnavigator_DIR
6+
./mach $MACH_ARG

‎.github/workflows/build-fpnavigator-windows/mozconfig-win32‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Tell the build system if we're building 64-bit.
2+
# Set this to `BUILD_64=1` for 64-bit, leave as-is for 32-bit
3+
BUILD_64=
4+
5+
# Processor architecture specific build options
6+
if [ -n "$BUILD_64" ]; then
7+
BUILD_ARCH=x64
8+
ac_add_options --target=x86_64-pc-mingw32
9+
ac_add_options --host=x86_64-pc-mingw32
10+
else
11+
BUILD_ARCH=x86
12+
fi
13+
14+
# Automatically clobber if CLOBBER was touched
15+
mk_add_options AUTOCLOBBER=1
16+
17+
# Set Flashpoint Navigator version to date timestamp
18+
export BASILISK_VERSION=1
19+
20+
export MOZILLA_OFFICIAL=1
21+
22+
ac_add_options --with-branding=basilisk/branding/flashpoint
23+
24+
# Standard build options
25+
ac_add_options --enable-application=basilisk
26+
ac_add_options --enable-optimize="-O2 -GTs -GS- -Qspectre -utf-8"
27+
ac_add_options --enable-jemalloc
28+
ac_add_options --enable-strip
29+
ac_add_options --enable-devtools
30+
ac_add_options --enable-av1
31+
ac_add_options --enable-jxl
32+
ac_add_options --enable-webrtc
33+
ac_add_options --enable-gamepad
34+
ac_add_options --disable-tests
35+
ac_add_options --disable-debug
36+
ac_add_options --disable-official-branding
37+
ac_add_options --disable-updater
38+
ac_add_options --disable-precompiled-startupcache
39+
40+
WIN32_REDIST_DIR="C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/redist/MSVC/14.44.35112/$BUILD_ARCH/Microsoft.VC143.CRT"
41+
WIN_UCRT_REDIST_DIR="C:/Program Files (x86)/Windows Kits/10/Redist/10.0.22621.0/ucrt/DLLs/$BUILD_ARCH"

‎.github/workflows/build-fpnavigator-windows/mozconfig-win64‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Tell the build system if we're building 64-bit.
2+
# Set this to `BUILD_64=1` for 64-bit, leave as-is for 32-bit
3+
BUILD_64=1
4+
5+
# Processor architecture specific build options
6+
if [ -n "$BUILD_64" ]; then
7+
BUILD_ARCH=x64
8+
ac_add_options --target=x86_64-pc-mingw32
9+
ac_add_options --host=x86_64-pc-mingw32
10+
else
11+
BUILD_ARCH=x86
12+
fi
13+
14+
# Automatically clobber if CLOBBER was touched
15+
mk_add_options AUTOCLOBBER=1
16+
17+
# Set Flashpoint Navigator version to date timestamp
18+
export BASILISK_VERSION=1
19+
20+
export MOZILLA_OFFICIAL=1
21+
22+
ac_add_options --with-branding=basilisk/branding/flashpoint
23+
24+
# Standard build options
25+
ac_add_options --enable-application=basilisk
26+
ac_add_options --enable-optimize="-O2 -GTs -GS- -Qspectre -utf-8"
27+
ac_add_options --enable-jemalloc
28+
ac_add_options --enable-strip
29+
ac_add_options --enable-devtools
30+
ac_add_options --enable-av1
31+
ac_add_options --enable-jxl
32+
ac_add_options --enable-webrtc
33+
ac_add_options --enable-gamepad
34+
ac_add_options --disable-tests
35+
ac_add_options --disable-debug
36+
ac_add_options --disable-official-branding
37+
ac_add_options --disable-updater
38+
ac_add_options --disable-precompiled-startupcache
39+
40+
WIN32_REDIST_DIR="C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/redist/MSVC/14.44.35112/$BUILD_ARCH/Microsoft.VC143.CRT"
41+
WIN_UCRT_REDIST_DIR="C:/Program Files (x86)/Windows Kits/10/Redist/10.0.26100.0/ucrt/DLLs/$BUILD_ARCH"

0 commit comments

Comments
 (0)