more updtes to build process
|
@ -35,6 +35,7 @@ function lauchDaemon() {
|
||||||
if (subpy) {
|
if (subpy) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
console.log(`${__dirname}/dist/lbry`);
|
||||||
subpy = require('child_process').spawn(`${__dirname}/dist/lbry`, ['--no-launch', '--log-to-console'], {stdio: ['ignore', process.stdout, process.stderr]})
|
subpy = require('child_process').spawn(`${__dirname}/dist/lbry`, ['--no-launch', '--log-to-console'], {stdio: ['ignore', process.stdout, process.stderr]})
|
||||||
subpy.on('exit', () => {
|
subpy.on('exit', () => {
|
||||||
console.log('The daemon has exited. Quitting the app');
|
console.log('The daemon has exited. Quitting the app');
|
10
app/package.json
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"name": "LBRY",
|
||||||
|
"version": "0.9.0",
|
||||||
|
"main": "main.js",
|
||||||
|
"description": "LBRY is a fully decentralized, open-source protocol facilitating the discovery, access, and (sometimes) purchase of data.",
|
||||||
|
"author": "lbry.io",
|
||||||
|
"dependencies": {
|
||||||
|
"jayson": "^2.0.2"
|
||||||
|
}
|
||||||
|
}
|
14
build.sh
|
@ -5,9 +5,9 @@ set -eu
|
||||||
|
|
||||||
ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
if [ "$(uname)" == "Darwin" ]; then
|
if [ "$(uname)" == "Darwin" ]; then
|
||||||
ICON="$ROOT/package/osx/app.icns"
|
ICON="$ROOT/build/icon.icns"
|
||||||
else
|
else
|
||||||
ICON="$ROOT/package/icons/lbry48.png"
|
ICON="$ROOT/build/icons/lbry48.png"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@ fi
|
||||||
|
|
||||||
|
|
||||||
(
|
(
|
||||||
cd "$ROOT/electron"
|
cd "$ROOT/app"
|
||||||
npm install
|
npm install
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -53,15 +53,15 @@ fi
|
||||||
npm install
|
npm install
|
||||||
node_modules/.bin/node-sass --output dist/css --sourcemap=none scss/
|
node_modules/.bin/node-sass --output dist/css --sourcemap=none scss/
|
||||||
node_modules/.bin/webpack
|
node_modules/.bin/webpack
|
||||||
rm -rf "$ROOT/electron/dist"
|
rm -rf "$ROOT/app/dist"
|
||||||
cp -r dist "$ROOT/electron/dist"
|
cp -r dist "$ROOT/app/dist"
|
||||||
)
|
)
|
||||||
|
|
||||||
mv "$ROOT/lbrynet/dist/lbry" "$ROOT/electron/dist"
|
mv "$ROOT/lbrynet/dist/lbry" "$ROOT/app/dist"
|
||||||
|
|
||||||
|
|
||||||
if [ -n "${TEAMCITY_VERSION:-}" ]; then
|
if [ -n "${TEAMCITY_VERSION:-}" ]; then
|
||||||
electron-packager --electron-version=1.4.14 --overwrite "$ROOT/electron" LBRY --icon="${ICON}"
|
electron-packager --electron-version=1.4.14 --overwrite "$ROOT/app" LBRY --icon="${ICON}"
|
||||||
|
|
||||||
(
|
(
|
||||||
pushd "$ROOT/lbry"
|
pushd "$ROOT/lbry"
|
||||||
|
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 8.5 KiB |
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 7.4 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 6.1 KiB |
|
@ -1,13 +1,10 @@
|
||||||
{
|
{
|
||||||
"name": "LBRY",
|
"postinstall": "install-app-deps",
|
||||||
"version": "0.1.0",
|
|
||||||
"main": "main.js",
|
|
||||||
"description": "LBRY is a fully decentralized, open-source protocol facilitating the discovery, access, and (sometimes) purchase of data.",
|
|
||||||
"author": "lbry.io",
|
|
||||||
"dependencies": {
|
|
||||||
"jayson": "^2.0.2"
|
|
||||||
},
|
|
||||||
"build": {
|
"build": {
|
||||||
|
"asar": false,
|
||||||
|
"directories": {
|
||||||
|
"app": "app"
|
||||||
|
},
|
||||||
"appId": "io.lbry.LBRY",
|
"appId": "io.lbry.LBRY",
|
||||||
"mac": {
|
"mac": {
|
||||||
"category": "public.app-category.utilities",
|
"category": "public.app-category.utilities",
|
||||||
|
@ -31,8 +28,9 @@
|
||||||
"x": 200,
|
"x": 200,
|
||||||
"y": 200,
|
"y": 200,
|
||||||
"width": 500,
|
"width": 500,
|
||||||
"height": 320
|
"height": 300
|
||||||
}
|
},
|
||||||
|
"backgroundColor": "155B4A"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
|
@ -1,12 +0,0 @@
|
||||||
badge_icon = 'app.icns'
|
|
||||||
icon_locations = {
|
|
||||||
'LBRY.app': (115, 164),
|
|
||||||
'Applications': (387, 164)
|
|
||||||
}
|
|
||||||
background='dmg_background.png'
|
|
||||||
default_view='icon-view'
|
|
||||||
symlinks = { 'Applications': '/Applications' }
|
|
||||||
window_rect=((200, 200), (500, 320))
|
|
||||||
files = [ 'LBRY.app' ]
|
|
||||||
icon_size=128
|
|
||||||
size = '200M'
|
|