Commit 02eac6e0 authored by onny's avatar onny
Browse files

first commit

parent 5ba09172
include Makefile.config
json := org.mozilla.firefox.json
app := firefox
all: test
test: repo $(json)
flatpak-builder --force-clean --repo=repo --ccache --require-changes $(app) $(json)
flatpak build-update-repo repo
release: release-repo $(json)
if [ "x${RELEASE_GPG_KEY}" == "x" ]; then echo Must set RELEASE_GPG_KEY in Makefile.config, try \'make gpg-key\'; exit 1; fi
flatpak-builder --force-clean --repo=release-repo --ccache --gpg-homedir=gpg --gpg-sign=${RELEASE_GPG_KEY} $(app) $(json)
flatpak build-update-repo --generate-static-deltas --gpg-homedir=gpg --gpg-sign=${RELEASE_GPG_KEY} release-repo
clean:
rm -rf $(app)/*
repo:
ostree init --mode=archive-z2 --repo=repo
release-repo:
ostree init --mode=archive-z2 --repo=release-repo
gpg-key:
if [ "x${KEY_USER}" == "x" ]; then echo Must set KEY_USER in Makefile.config; exit 1; fi
mkdir -p gpg
gpg2 --homedir gpg --quick-gen-key ${KEY_USER}
echo Enter the above gpg key id as RELEASE_GPG_KEY in Makefile.config
$(app).flatpakref: $(app).flatpakref.in
sed -e 's|@URL@|${URL}|g' -e 's|@GPG@|$(shell gpg2 --homedir=gpg --export ${RELEASE_GPG_KEY} | base64 | tr -d '\n')|' $< > $@
# The key id of a gpg key in the "gpg subdirectory goes here
# You can use the "make gpg-key" helper to create that if you
# fill out KEY_USER below
RELEASE_GPG_KEY=
# This is the gpg key user id that 'make gpg-key' uses for the gpg key
# If you chose to use that to create a gpg id
KEY_USER=
# The url of your public repository which is embedded in the generated
# .flatpakref file
URL=
From 0a6605024de6b4aa01f4dcf21c723d7f5f034f4c Mon Sep 17 00:00:00 2001
From: Michal Rostecki <michal@kinvolk.io>
Date: Fri, 23 Dec 2016 12:18:23 +0100
Subject: [PATCH] Add install target
---
GNUmakefile | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/GNUmakefile b/GNUmakefile
index 38656c8..7af0bf4 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -11,4 +11,9 @@ build:
clean:
./mach clobber
-.PHONY: all build clean
+install:
+ $(MAKE) -f client.mk install $@
+ desktop-file-install --dir $(prefix)/share/applications org.mozilla.firefox.desktop
+ install -D browser/branding/official/mozicon128.png $(prefix)/share/icons/hicolor/128x128/apps/org.mozilla.firefox.png
+
+.PHONY: all build clean install
--
2.9.3
[Flatpak Ref]
Title=vlc
Name=org.mozilla.firefox.App
Branch=master
Url=@URL@
IsRuntime=False
GPGKey=@GPG@
Comment=firefox
Description=Firefox web browser
Icon=https://assets.mozilla.org/view/0002/p_218.jpg
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
<id>org.mozilla.firefox.desktop</id>
<metadata_license>GPL-2.0</metadata_license>
<summary>Browse the Web</summary>
<description>
<p>
Bringing together all kinds of awesomeness to make browsing better for you. Get to your favorite sites quickly – even if you don’t remember the URLs. Type your term into the location bar (aka the Awesome Bar) and the autocomplete function will include possible matches from your browsing history, bookmarked sites and open tabs.
</p>
</description>
<url type="homepage">https://www.mozilla.org/en-US/</url>
<screenshots>
<screenshot type="default">
<image>http://www.codeblocks.org/images/stories/imagebrowser/scr1.png</image>
</screenshot>
</screenshots>
<project_license>GPL-2.0+</project_license>
<developer_name>The Mozilla Foundation</developer_name>
<url type="bugtracker">https://bugzilla.mozilla.org/describecomponents.cgi?product=Firefox</url>
<url type="help">https://support.mozilla.org/en-US/kb/get-started-firefox-overview-main-features</url>
</component>
[Desktop Entry]
Type=Application
Name=Firefox web browser
GenericName=Web browser
Comment=Firefox web browser
Exec=firefox-wrapper %u
Icon=org.mozilla.firefox
Terminal=false
Categories=Network;WebBrowser;
{
"app-id": "org.mozilla.firefox",
"runtime": "org.gnome.Platform",
"runtime-version": "3.22",
"sdk": "org.gnome.Sdk",
"branch": "50.1.0",
"command": "firefox",
"separate-locales": false,
"finish-args": [
"--share=ipc",
"--socket=wayland",
"--socket=pulseaudio",
"--share=network",
"--filesystem=home"
],
"modules": [
{
"name": "autoconf",
"config-opts": [
"--program-suffix=2.13"
],
"sources": [
{
"type": "archive",
"url": "http://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz",
"sha256": "f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e"
}
]
},
{
"name": "gconf",
"config-opts": [
"--disable-static",
"--disable-orbit"
],
"sources": [
{
"type": "archive",
"config-opts": [
"--enable-nls",
"--with-ssl=openssl"
],
"url": "https://download.gnome.org/sources/GConf/3.2/GConf-3.2.6.tar.xz",
"sha256": "1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c"
}
]
},
{
"name": "yasm",
"sources": [
{
"type": "archive",
"url": "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz",
"sha256": "3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f"
}
]
},
{
"name": "firefox",
"no-autogen": true,
"make-install-args": [
"prefix=/app"
],
"sources": [
{
"type": "git",
"url": "https://github.com/stransky/gecko-dev"
},
{
"type": "patch",
"path": "firefox-makeinstall.patch"
},
{
"type": "patch",
"path": "packaging-fix.patch"
},
{
"type": "file",
"path": "org.mozilla.firefox.desktop"
}
]
}
]
}
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -570,17 +570,17 @@
@RESPATH@/components/InputMethod.manifest
#ifdef MOZ_B2G
@RESPATH@/components/inputmethod.xpt
#endif
@RESPATH@/components/SystemUpdate.manifest
@RESPATH@/components/SystemUpdateManager.js
-#ifdef MOZ_DEBUG
+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
@RESPATH@/components/TestInterfaceJS.js
@RESPATH@/components/TestInterfaceJS.manifest
@RESPATH@/components/TestInterfaceJSMaplike.js
#endif
; Modules
@RESPATH@/modules/*
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -543,17 +543,17 @@
@RESPATH@/components/PresentationControlService.js
@RESPATH@/components/PresentationDataChannelSessionTransport.js
@RESPATH@/components/PresentationDataChannelSessionTransport.manifest
; InputMethod API
@RESPATH@/components/MozKeyboard.js
@RESPATH@/components/InputMethod.manifest
-#ifdef MOZ_DEBUG
+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
@RESPATH@/components/TestInterfaceJS.js
@RESPATH@/components/TestInterfaceJS.manifest
@RESPATH@/components/TestInterfaceJSMaplike.js
#endif
; [Extensions]
@RESPATH@/components/extensions-toolkit.manifest
@RESPATH@/browser/components/extensions-browser.manifest
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -377,17 +377,17 @@
@BINPATH@/components/CaptivePortalDetectComponents.manifest
@BINPATH@/components/captivedetect.js
#ifdef MOZ_WEBSPEECH
@BINPATH@/components/dom_webspeechsynth.xpt
#endif
-#ifdef MOZ_DEBUG
+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
@BINPATH@/components/TestInterfaceJS.js
@BINPATH@/components/TestInterfaceJS.manifest
@BINPATH@/components/TestInterfaceJSMaplike.js
#endif
@BINPATH@/components/nsAsyncShutdown.manifest
@BINPATH@/components/nsAsyncShutdown.js
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment