final touches on unifying requirements files
This commit is contained in:
parent
e4e20f4b1b
commit
e2b65ed3ce
4 changed files with 11 additions and 16 deletions
|
@ -70,8 +70,10 @@ npm install
|
||||||
# for electron, we install lbryum and lbry using submodules
|
# for electron, we install lbryum and lbry using submodules
|
||||||
echo "../lbryum" >> requirements.txt
|
echo "../lbryum" >> requirements.txt
|
||||||
echo "../lbry" >> requirements.txt
|
echo "../lbry" >> requirements.txt
|
||||||
|
# also add pyinstaller
|
||||||
|
echo "PyInstaller==3.2.1" >> requirements.txt
|
||||||
|
|
||||||
pip install -r linux_macos.txt
|
pip install -r requirements.txt
|
||||||
pyinstaller -y daemon.onefile.spec
|
pyinstaller -y daemon.onefile.spec
|
||||||
pyinstaller -y cli.onefile.spec
|
pyinstaller -y cli.onefile.spec
|
||||||
mv dist/lbrynet-daemon dist/lbrynet-cli "$ROOT/app/dist/"
|
mv dist/lbrynet-daemon dist/lbrynet-cli "$ROOT/app/dist/"
|
||||||
|
|
|
@ -4,27 +4,25 @@ $env:Path += ";C:\Program Files (x86)\Windows Kits\10\bin\x86\"
|
||||||
gcc --version
|
gcc --version
|
||||||
mingw32-make --version
|
mingw32-make --version
|
||||||
|
|
||||||
mkdir temp
|
# build/install miniupnpc manually
|
||||||
mv miniupnpc-1.9.tar.gz temp\miniupnpc-1.9.tar.gz
|
|
||||||
cd temp
|
|
||||||
tar zxf miniupnpc-1.9.tar.gz
|
tar zxf miniupnpc-1.9.tar.gz
|
||||||
cd miniupnpc-1.9
|
cd miniupnpc-1.9
|
||||||
mingw32-make.exe -f Makefile.mingw
|
mingw32-make.exe -f Makefile.mingw
|
||||||
python.exe setupmingw32.py build --compiler=mingw32
|
python.exe setupmingw32.py build --compiler=mingw32
|
||||||
python.exe setupmingw32.py install
|
python.exe setupmingw32.py install
|
||||||
|
cd ..\
|
||||||
cd ..\..\
|
Remove-Item -Recurse -Force miniupnpc-1.9
|
||||||
Remove-Item -Recurse -Force temp
|
|
||||||
|
|
||||||
# copy requirements from lbry, but remove lbryum (we'll add it back in below) and gmpy and miniupnpc (installed manually)
|
# copy requirements from lbry, but remove lbryum (we'll add it back in below) and gmpy and miniupnpc (installed manually)
|
||||||
Get-Content ..\lbry\requirements.txt | Select-String -Pattern 'lbryum|gmpy|miniupnpc' -NotMatch | Out-File requirements.txt
|
Get-Content ..\lbry\requirements.txt | Select-String -Pattern 'lbryum|gmpy|miniupnpc' -NotMatch | Out-File requirements.txt
|
||||||
|
# add in gmpy wheel
|
||||||
|
Add-Content requirements.txt "./gmpy-1.17-cp27-none-win32.whl"
|
||||||
# for electron, we install lbryum and lbry using submodules
|
# for electron, we install lbryum and lbry using submodules
|
||||||
Add-Content requirements.txt "`n../lbryum"
|
Add-Content requirements.txt "../lbryum"
|
||||||
Add-Content requirements.txt "`n../lbry"
|
Add-Content requirements.txt "../lbry"
|
||||||
Get-Content requirements.txt
|
|
||||||
|
|
||||||
pip.exe install pyinstaller
|
pip.exe install pyinstaller
|
||||||
pip.exe install -r windows.txt
|
pip.exe install -r requirements.txt
|
||||||
|
|
||||||
pyinstaller -y daemon.onefile.spec
|
pyinstaller -y daemon.onefile.spec
|
||||||
pyinstaller -y cli.onefile.spec
|
pyinstaller -y cli.onefile.spec
|
|
@ -1,2 +0,0 @@
|
||||||
-r requirements.txt
|
|
||||||
PyInstaller==3.2.1
|
|
|
@ -1,3 +0,0 @@
|
||||||
-r requirements.txt
|
|
||||||
# miniupnpc is installed manually
|
|
||||||
./gmpy-1.17-cp27-none-win32.whl
|
|
Loading…
Add table
Reference in a new issue