use lbry-web-ui submodule

This commit is contained in:
Job Evers-Meltzer 2017-01-16 14:36:31 -05:00
parent ed0f6f775d
commit cda5730057
4 changed files with 9 additions and 13 deletions

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "lbry-web-ui"]
path = lbry-web-ui
url = https://github.com/lbryio/lbry-web-ui.git

View file

@ -4,16 +4,7 @@ An electron version of the LBRY application.
## Setup
Need to have the lbry-web-ui and lbry repos in a folder next to
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
The lbrynet needs to be installed along with pyinstaller, and you
need everything to be able to build the lbry-web-ui
## Build

View file

@ -9,10 +9,11 @@ npm install
cd ../lbrynet
pyinstaller lbry.py -y --windowed --onefile --icon=../../lbry/packaging/osx/lbry-osx-app/app.icns
cd ../../lbry-web-ui
git checkout master
git pull --rebase
cd ../lbry-web-ui
git fetch
git reset --hard origin/master
git cherry-pick 06224b1d2cf4bf1f63d95031502260dd9c3ec5c1
npm install
node_modules/.bin/node-sass --output dist/css --sourcemap=none scss/
webpack
git reset --hard origin/master

1
lbry-web-ui Submodule

@ -0,0 +1 @@
Subproject commit 3a8cc9e2e2e6cf81cb957689837f4f150152941e