LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

make sure to reset each submodule

Browse source
This commit is contained in:
Job Evers-Meltzer 2017-01-17 00:58:31 -06:00
parent 2d19d3db95
commit 42e3681a8d
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.sh
View file

@ -12,6 +12,7 @@ git reset --hard origin/master
git cherry-pick bd75e88ebebb67897c62a1ee1d3228fd269677dc git cherry-pick bd75e88ebebb67897c62a1ee1d3228fd269677dc
pip install -r requirements.txt pip install -r requirements.txt
pip install . pip install .
git reset --hard origin/master
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
@ -23,6 +24,7 @@ git cherry-pick 06224b1d2cf4bf1f63d95031502260dd9c3ec5c1
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/
webpack webpack
git reset --hard origin/master
cd .. cd ..
cp -R lbry-web-ui/dist electron/ cp -R lbry-web-ui/dist electron/

2
lbry

@ -1 +1 @@
Subproject commit e889bf55a78d645795870ee9c4956a514a8dd60a Subproject commit 8a026071eb1734d83c457e092b0676030026d9cd

2
lbry-web-ui

@ -1 +1 @@
Subproject commit 52a4dd1cc9ab70b683c092946325235778be4887 Subproject commit b78b644826d0077417bfa3b35dcd17db4b1faedc