me/omegafox
1
0
Fork 0
mirror of https://forge.fsky.io/oneflux/omegafox.git synced 2026-02-10 22:42:04 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Packaging & macos exec fixes

Browse source 
- Use "open -a" to launch Camoufox.app
- Fix fonts not copying correctly
- Find & move asset files to dist/ correctly
This commit is contained in:
daijro 2024-08-14 05:22:01 -05:00
parent 40bcdc6def
commit 80a657268e
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
launcher/exec.go
View file

@ -74,6 +74,12 @@ func runCamoufox(execName string, args []string, addonsList []string) {
debugPortInt = getDebugPort(&args) debugPortInt = getDebugPort(&args)
} }
// For macOS, use "open" command to launch the app
if normalizeOS(runtime.GOOS) == "macos" {
args = append([]string{"-a", execName}, args...)
execName = "open"
}
// Print args // Print args
cmd := exec.Command(execName, args...) cmd := exec.Command(execName, args...)

3
multibuild.py
View file

@ -64,7 +64,7 @@ class BSYS:
@property @property
def assets(self) -> List[str]: def assets(self) -> List[str]:
"""Get the list of assets""" """Get the list of assets"""
package_pattern = 'camoufox-*.en-US.*.zip' package_pattern = f'camoufox-*-{self.target[:3]}.{self.arch}.zip'
return glob.glob(package_pattern) return glob.glob(package_pattern)
@staticmethod @staticmethod
@ -84,6 +84,7 @@ def run_build(target, arch):
# Run package # Run package
builder.package() builder.package()
# Move assets to dist # Move assets to dist
print('Assets:', ', '.join(builder.assets))
for asset in builder.assets: for asset in builder.assets:
os.rename(asset, f'dist/{asset}') os.rename(asset, f'dist/{asset}')

9
scripts/package.py
View file

@ -37,10 +37,10 @@ def add_includes_to_package(package_file, includes, fonts, new_file, target):
) )
if target == 'macos': if target == 'macos':
# Move Nightly/Nightly.app -> Camoufox.app # Move Camoufox/Camoufox.app -> Camoufox.app
nightly_dir = os.path.join(temp_dir, 'Nightly') nightly_dir = os.path.join(temp_dir, 'Camoufox')
shutil.move( shutil.move(
os.path.join(nightly_dir, 'Nightly.app'), os.path.join(temp_dir, 'Camoufox.app') os.path.join(nightly_dir, 'Camoufox.app'), os.path.join(temp_dir, 'Camoufox.app')
) )
# Remove old app dir and all content in it # Remove old app dir and all content in it
shutil.rmtree(nightly_dir) shutil.rmtree(nightly_dir)
@ -85,9 +85,10 @@ def add_includes_to_package(package_file, includes, fonts, new_file, target):
# Non-linux systems cannot read fonts within subfolders. # Non-linux systems cannot read fonts within subfolders.
# Instead, we walk the fonts/ directory and copy all files. # Instead, we walk the fonts/ directory and copy all files.
else: else:
os.makedirs(fonts_dir, exist_ok=True)
for font in fonts or []: for font in fonts or []:
for file in list_files(root_dir=os.path.join('bundle', 'fonts', font), suffix='*'): for file in list_files(root_dir=os.path.join('bundle', 'fonts', font), suffix='*'):
shutil.copy2(file, fonts_dir) shutil.copy2(file, os.path.join(fonts_dir, os.path.basename(file)))
# Add launcher from launcher/dist/launch to temp_dir # Add launcher from launcher/dist/launch to temp_dir
launch_file = 'launch' + ('.exe' if target == 'windows' else '') launch_file = 'launch' + ('.exe' if target == 'windows' else '')