Automated builds for Windows

Makefile

@@ -1,3 +1,5 @@
+include environment
+
 devapk:
 	make -C sbapp devapk
 
@@ -43,10 +45,43 @@ preparewheel:
 compile_wheel:
 	python3 setup.py bdist_wheel
 
-build_wheel: remove_symlinks compile_wheel create_symlinks
+compile_sourcepkg:
+	python3 setup.py sdist
 
-build_win_exe:
-	python -m PyInstaller sideband.spec --noconfirm
+update_share:
+	$(MAKE) -C sbapp fetchshare
+
+build_wheel: remove_symlinks update_share compile_wheel create_symlinks
+
+build_spkg: remove_symlinks update_share compile_sourcepkg create_symlinks
+
+prepare_win_pkg: clean build_spkg
+	-rm -r build/winpkg
+	mkdir -p build/winpkg
+	LC_ALL=C $(MAKE) -C ../Reticulum clean build_spkg
+	cp ../Reticulum/dist/rns-*.*.*.tar.gz build/winpkg
+	cd build/winpkg; tar -zxf rns-*.*.*.tar.gz
+	mv build/winpkg/rns-*.*.*/RNS build/winpkg; rm -r build/winpkg/rns-*.*.*
+	LC_ALL=C $(MAKE) -C ../LXMF clean build_spkg
+	cp ../LXMF/dist/lxmf-*.*.*.tar.gz build/winpkg
+	cd build/winpkg; tar -zxf lxmf-*.*.*.tar.gz
+	mv build/winpkg/lxmf-*.*.*/LXMF build/winpkg; rm -r build/winpkg/lxmf-*.*.*
+	LC_ALL=C $(MAKE) -C ../LXST clean build_spkg
+	cp ../LXST/dist/lxst-*.*.*.tar.gz build/winpkg
+	cd build/winpkg; tar -zxf lxst-*.*.*.tar.gz
+	mv build/winpkg/lxst-*.*.*/LXST build/winpkg; rm -r build/winpkg/lxst-*.*.*
+	rm build/winpkg/LXST/filterlib*.so
+	cp dist/sbapp-*.*.*.tar.gz build/winpkg
+	cd build/winpkg; tar -zxf sbapp-*.*.*.tar.gz
+	mv build/winpkg/sbapp-*.*.*/* build/winpkg; rm -r build/winpkg/sbapp-*.*.*
+	rm build/winpkg/LXST/Codecs/libs/pyogg/libs/macos -r
+	cp winbuild.bat winbuild.ps1 build/
+	mv build/winpkg build/sideband_sources
+	cd build; zip -r winbuild.zip sideband_sources winbuild.bat winbuild.ps1
+	mv build/winbuild.zip dist/winbuild.zip
+
+build_winexe: prepare_win_pkg
+	cp dist/winbuild.zip $(WINDOWS_BUILD_TARGET)
 
 release: build_wheel apk fetchapk
 
@@ -54,4 +89,4 @@ upload:
 	@echo Ready to publish release, hit enter to continue
 	@read VOID
 	@echo Uploading to PyPi...
-	twine upload dist/sbapp-*
+	twine upload dist/sbapp-*

sbapp/Makefile

@@ -69,18 +69,18 @@ endif
 fetchshare:
 	-(rm ./share/pkg/*)
 	-(rm ./share/mirrors/* -r)
-	cp ../../dist_archive/rns-1.0.3-py3-none-any.whl ./share/pkg/
-	cp ../../dist_archive/rnspure-1.0.3-py3-none-any.whl ./share/pkg/
+	cp ../../dist_archive/rns-1.0.4-py3-none-any.whl ./share/pkg/
+	cp ../../dist_archive/rnspure-1.0.4-py3-none-any.whl ./share/pkg/
 	cp ../../dist_archive/lxmf-0.9.3-py3-none-any.whl ./share/pkg/
 	cp ../../dist_archive/nomadnet-0.9.1-py3-none-any.whl ./share/pkg/
 	cp ../../dist_archive/rnsh-0.1.7-py3-none-any.whl ./share/pkg/
 	cp ../../dist_archive/RNode_Firmware_*_Source.zip ./share/pkg/
 	zip --junk-paths ./share/pkg/example_plugins.zip ../docs/example_plugins/*.py
 	cp -r ../../dist_archive/reticulum.network ./share/mirrors/
-	cp -r ../../dist_archive/unsigned.io ./share/mirrors/
 	cp ../../dist_archive/Reticulum\ Manual.pdf ./share/mirrors/Reticulum_Manual.pdf
 	cp ../../dist_archive/Reticulum\ Manual.epub ./share/mirrors/Reticulum_Manual.epub
-	cp -r ../../rnode-flasher ./share/mirrors/
+	mkdir ./share/mirrors/rnode-flasher
+	cp ../../rnode-flasher/RNode_Flasher.html ./share/mirrors/rnode-flasher
 	-(rm ./share/mirrors/rnode-flasher/.git -rf)
 
 release:

sbapp/share/guides.html

@@ -13,7 +13,6 @@
 Welcome to the <b>Guide Section</b>!<br/><br/>From here, you can browse or download various included manuals, documentation, references and guides.
 
 <ul>
-  <li><a href="./mirrors/unsigned.io/guides.html">Browse a local copy of the Guides from unsigned.io</a></li>
   <li><a href="./mirrors/reticulum.network/manual/index.html">Browse the Reticulum Manual</a></li>
   <li><a href="./mirrors/Reticulum_Manual.pdf">Download the Reticulum Manual in PDF format</a></li>
   <li><a href="./mirrors/Reticulum_Manual.epub">Download the Reticulum Manual in EPUB format</a></li>

winbuild.bat

@@ -0,0 +1,16 @@
+@echo off
+cd sideband_sources\sbapp
+for /f "delims=" %%v in ('powershell.exe -Command "python gv.py"') do set version=%%v
+cd ..\..
+echo Compiling Sideband %version%
+
+cd sideband_sources
+python -m PyInstaller sideband.spec --noconfirm
+cd ..
+
+set "source_dir=Sideband_%version%"
+set "zip_file=Sideband_%version%.zip"
+move sideband_sources\dist\main %source_dir%
+powershell.exe -Command "Compress-Archive -Path '%source_dir%' -DestinationPath '%zip_file%' -Force"
+
+echo Build completed