ZenBrowserMirrors/surfer
1
0
Fork 0
mirror of https://github.com/zen-browser/surfer.git synced 2025-07-08 01:10:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

bump version to 1.9.12 and simplify macOS release naming and update URL handling
Some checks are pending
CI / general (push) Waiting to run
Details

Browse source
This commit is contained in:
mr. M 2025-01-26 19:49:34 +01:00
parent 89b2c3927a
commit e91d11b419
No known key found for this signature in database
GPG key ID: CBD57A2AEDBDA1FB
4 changed files with 92 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "@zen-browser/surfer", "name": "@zen-browser/surfer",
"version": "1.9.10", "version": "1.9.12",
"description": "Simplifying building firefox forks!", "description": "Simplifying building firefox forks!",
"main": "index.js", "main": "index.js",
"bin": { "bin": {

15
src/commands/package.ts
View file

@ -36,6 +36,7 @@ export const surferPackage = async () => {
// The engine directory must have been downloaded for this to be valid // The engine directory must have been downloaded for this to be valid
// TODO: Make this a reusable function that can be used by everything // TODO: Make this a reusable function that can be used by everything
if (!process.env.JUST_MAR) {
if (!existsSync(ENGINE_DIR)) { if (!existsSync(ENGINE_DIR)) {
log.error( log.error(
`Unable to locate any source directories.\nRun |${bin_name} download| to generate the source directory.` `Unable to locate any source directories.\nRun |${bin_name} download| to generate the source directory.`
@ -59,19 +60,6 @@ export const surferPackage = async () => {
if (!process.env.SURFER_SIGNING_MODE) { if (!process.env.SURFER_SIGNING_MODE) {
await dispatch(machPath, arguments_, ENGINE_DIR, true) await dispatch(machPath, arguments_, ENGINE_DIR, true)
// Merge language packs
for (const locale of await getLocales()) {
const arguments_ = ['build', `merge-${locale}`]
log.info(
`Packaging \`${config.binaryName}\` with args ${JSON.stringify(
arguments_.slice(1, 0)
)}...`
)
await dispatch(machPath, arguments_, ENGINE_DIR, true)
}
log.info('Copying language packs') log.info('Copying language packs')
await dispatch( await dispatch(
@ -150,6 +138,7 @@ export const surferPackage = async () => {
) )
} }
} }
}
const marPath = await createMarFile( const marPath = await createMarFile(
version, version,

8
src/commands/patches/branding-patch.ts
View file

@ -422,13 +422,7 @@ pref("devtools.selfxss.count", 5);
} }
function setUpdateURLs() { function setUpdateURLs() {
let suffix = ''; const baseURL = `URL=https://@MOZ_APPUPDATE_HOST@/updates/browser/%BUILD_TARGET%/%CHANNEL%/update.xml`
if ((process as any).surferPlatform == 'darwin') {
if (compatMode == 'x86_64') {
suffix = '-generic';
}
}
const baseURL = `URL=https://@MOZ_APPUPDATE_HOST@/updates/browser/%BUILD_TARGET%/%CHANNEL%${suffix}/update.xml`
const appIni = join(ENGINE_DIR, 'build', 'application.ini.in') const appIni = join(ENGINE_DIR, 'build', 'application.ini.in')
const appIniContents = readFileSync(appIni).toString() const appIniContents = readFileSync(appIni).toString()
const updatedAppIni = appIniContents.replace(/URL=.*update.xml/g, baseURL) const updatedAppIni = appIniContents.replace(/URL=.*update.xml/g, baseURL)

15
src/commands/updates/browser.ts
View file

@ -59,12 +59,7 @@ function getReleaseMarName(releaseInfo: ReleaseInfo): string | undefined {
} }
} }
if ((process as any).surferPlatform == 'darwin') { if ((process as any).surferPlatform == 'darwin') {
if (compatMode == 'x86_64') { releaseMarName = 'macos.mar' // universal binary
releaseMarName = 'macos-x86_64.mar'
}
else if (compatMode == 'aarch64') {
releaseMarName = 'macos-aarch64.mar'
}
} }
if ((process as any).surferPlatform == 'linux') { if ((process as any).surferPlatform == 'linux') {
if (compatMode == 'x86_64') { if (compatMode == 'x86_64') {
@ -115,18 +110,12 @@ async function writeUpdateFileToDisk(
} }
} }
) { ) {
let suffix = '';
if ((process as any).surferPlatform == 'darwin') {
if (compatMode == 'x86_64') {
suffix = '-generic';
}
}
const xmlPath = join( const xmlPath = join(
DIST_DIR, DIST_DIR,
'update', 'update',
'browser', 'browser',
target, target,
channel + suffix, channel,
'update.xml' 'update.xml'
) )
const document = create(updateObject) const document = create(updateObject)