final touches on unifying requirements files

build/build.sh

@@ -70,8 +70,10 @@ npm install
   # for electron, we install lbryum and lbry using submodules
   echo "../lbryum" >> 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 cli.onefile.spec
   mv dist/lbrynet-daemon dist/lbrynet-cli "$ROOT/app/dist/"

daemon/build.ps1

@@ -4,27 +4,25 @@ $env:Path += ";C:\Program Files (x86)\Windows Kits\10\bin\x86\"
 gcc --version
 mingw32-make --version
 
-mkdir temp
-mv miniupnpc-1.9.tar.gz temp\miniupnpc-1.9.tar.gz
-cd temp
+# build/install miniupnpc manually
 tar zxf miniupnpc-1.9.tar.gz
 cd miniupnpc-1.9
 mingw32-make.exe -f Makefile.mingw
 python.exe setupmingw32.py build --compiler=mingw32
 python.exe setupmingw32.py install
-
-cd ..\..\
-Remove-Item -Recurse -Force temp
+cd ..\
+Remove-Item -Recurse -Force miniupnpc-1.9
 
 # 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
+# add in gmpy wheel
+Add-Content requirements.txt "./gmpy-1.17-cp27-none-win32.whl"
 # for electron, we install lbryum and lbry using submodules
-Add-Content requirements.txt "`n../lbryum"
-Add-Content requirements.txt "`n../lbry"
-Get-Content requirements.txt
+Add-Content requirements.txt "../lbryum"
+Add-Content requirements.txt "../lbry"
 
 pip.exe install pyinstaller
-pip.exe install -r windows.txt
+pip.exe install -r requirements.txt
 
 pyinstaller -y daemon.onefile.spec
 pyinstaller -y cli.onefile.spec

daemon/linux_macos.txt

@@ -1,2 +0,0 @@
--r requirements.txt
-PyInstaller==3.2.1

daemon/windows.txt

@@ -1,3 +0,0 @@
--r requirements.txt
-# miniupnpc is installed manually
-./gmpy-1.17-cp27-none-win32.whl