Removed optimized builds and made generics the default ones
Some checks are pending
CI / general (push) Waiting to run

This commit is contained in:
mr. m 2024-12-23 07:16:27 +00:00
parent ecd6b650f0
commit 7c9ed09733
4 changed files with 3 additions and 29 deletions

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "@zen-browser/surfer", "name": "@zen-browser/surfer",
"version": "1.4.9", "version": "1.6.4",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@zen-browser/surfer", "name": "@zen-browser/surfer",
"version": "1.4.9", "version": "1.6.4",
"license": "MPL-2.0", "license": "MPL-2.0",
"dependencies": { "dependencies": {
"@resvg/resvg-js": "^1.4.0", "@resvg/resvg-js": "^1.4.0",

View file

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

View file

@ -423,21 +423,11 @@ pref("devtools.selfxss.count", 5);
function setUpdateURLs() { function setUpdateURLs() {
let suffix = ''; let suffix = '';
if ((process as any).surferPlatform == 'win32') {
if (compatMode == 'x86_64') {
suffix = '-generic';
}
}
if ((process as any).surferPlatform == 'darwin') { if ((process as any).surferPlatform == 'darwin') {
if (compatMode == 'x86_64') { if (compatMode == 'x86_64') {
suffix = '-generic'; suffix = '-generic';
} }
} }
if ((process as any).surferPlatform == 'linux') {
if (compatMode == 'x86_64') {
suffix = '-generic';
}
}
const baseURL = `URL=https://@MOZ_APPUPDATE_HOST@/updates/browser/%BUILD_TARGET%/%CHANNEL%${suffix}/update.xml` 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()

View file

@ -51,9 +51,6 @@ function getReleaseMarName(releaseInfo: ReleaseInfo): string | undefined {
let releaseMarName; let releaseMarName;
if ((process as any).surferPlatform == 'win32') { if ((process as any).surferPlatform == 'win32') {
if (compatMode == 'x86_64') { if (compatMode == 'x86_64') {
releaseMarName = 'windows-generic.mar'
}
else if (compatMode == 'x86_64-v3') {
releaseMarName = 'windows.mar' releaseMarName = 'windows.mar'
} }
else if (compatMode == 'aarch64') { else if (compatMode == 'aarch64') {
@ -70,9 +67,6 @@ function getReleaseMarName(releaseInfo: ReleaseInfo): string | undefined {
} }
if ((process as any).surferPlatform == 'linux') { if ((process as any).surferPlatform == 'linux') {
if (compatMode == 'x86_64') { if (compatMode == 'x86_64') {
releaseMarName = 'linux-generic.mar'
}
else if (compatMode == 'x86_64-v3') {
releaseMarName = 'linux.mar' releaseMarName = 'linux.mar'
} }
else if (compatMode == 'aarch64') { else if (compatMode == 'aarch64') {
@ -121,16 +115,6 @@ async function writeUpdateFileToDisk(
} }
) { ) {
let suffix = ''; let suffix = '';
if ((process as any).surferPlatform == 'win32') {
if (compatMode == 'x86_64') {
suffix = '-generic';
}
}
if ((process as any).surferPlatform == 'linux') {
if (compatMode == 'x86_64') {
suffix = '-generic';
}
}
if ((process as any).surferPlatform == 'darwin') { if ((process as any).surferPlatform == 'darwin') {
if (compatMode == 'x86_64') { if (compatMode == 'x86_64') {
suffix = '-generic'; suffix = '-generic';