use lbry-web-ui submodule
This commit is contained in:
parent
ed0f6f775d
commit
cda5730057
4 changed files with 9 additions and 13 deletions
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
[submodule "lbry-web-ui"]
|
||||||
|
path = lbry-web-ui
|
||||||
|
url = https://github.com/lbryio/lbry-web-ui.git
|
11
README.md
11
README.md
|
@ -4,16 +4,7 @@ An electron version of the LBRY application.
|
||||||
|
|
||||||
## Setup
|
## Setup
|
||||||
|
|
||||||
Need to have the lbry-web-ui and lbry repos in a folder next to
|
The lbrynet needs to be installed along with pyinstaller, and you
|
||||||
lbry-electron. For example, my directory structure looks like
|
|
||||||
|
|
||||||
```
|
|
||||||
$HOME/projects/lbryio/lbry
|
|
||||||
$HOME/projects/lbryio/lbry-web-ui
|
|
||||||
$HOME/projects/lbryio/lbry-electron
|
|
||||||
```
|
|
||||||
|
|
||||||
Additionally, lbrynet needs to be installed along with pyinstaller, and you
|
|
||||||
need everything to be able to build the lbry-web-ui
|
need everything to be able to build the lbry-web-ui
|
||||||
|
|
||||||
## Build
|
## Build
|
||||||
|
|
7
build.sh
7
build.sh
|
@ -9,10 +9,11 @@ npm install
|
||||||
cd ../lbrynet
|
cd ../lbrynet
|
||||||
pyinstaller lbry.py -y --windowed --onefile --icon=../../lbry/packaging/osx/lbry-osx-app/app.icns
|
pyinstaller lbry.py -y --windowed --onefile --icon=../../lbry/packaging/osx/lbry-osx-app/app.icns
|
||||||
|
|
||||||
cd ../../lbry-web-ui
|
cd ../lbry-web-ui
|
||||||
git checkout master
|
git fetch
|
||||||
git pull --rebase
|
git reset --hard origin/master
|
||||||
git cherry-pick 06224b1d2cf4bf1f63d95031502260dd9c3ec5c1
|
git cherry-pick 06224b1d2cf4bf1f63d95031502260dd9c3ec5c1
|
||||||
|
npm install
|
||||||
node_modules/.bin/node-sass --output dist/css --sourcemap=none scss/
|
node_modules/.bin/node-sass --output dist/css --sourcemap=none scss/
|
||||||
webpack
|
webpack
|
||||||
git reset --hard origin/master
|
git reset --hard origin/master
|
||||||
|
|
1
lbry-web-ui
Submodule
1
lbry-web-ui
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 3a8cc9e2e2e6cf81cb957689837f4f150152941e
|
Loading…
Add table
Reference in a new issue