# HG changeset patch
# User Edouard Tisserant <edouard.tisserant@gmail.com>
# Date 1631217273 -7200
# Node ID 3991f82369cb3157b24a659533a0ca12b2736fa6
# Parent  fd09116d3537846ecb9df6e720d896335058af52
Bundle in installer only fraction of MSYS2: Mingw32. The rest isn't needed for now.

diff -r fd09116d3537 -r 3991f82369cb install.nsi
--- a/install.nsi	Sat Sep 04 01:35:11 2021 +0200
+++ b/install.nsi	Thu Sep 09 21:54:33 2021 +0200
@@ -50,7 +50,7 @@
 Section "Shortcuts"
   SetShellVarContext all
   CreateDirectory "$SMPROGRAMS\Beremiz"
-  SetOutPath "$INSTDIR\msys32\bin"
+  SetOutPath "$INSTDIR\mingw32\bin"
   CreateShortCut "$SMPROGRAMS\Beremiz\PlcopenEditor.lnk" "${PYTHONW_EXE}" '"$INSTDIR\beremiz\plcopeneditor.py"' "$INSTDIR\beremiz\images\poe.ico"
   CreateShortCut "$SMPROGRAMS\Beremiz\Beremiz.lnk" "${PYTHONW_EXE}" '${BEREMIZ_EXE}' "$INSTDIR\beremiz\images\brz.ico"
   CreateShortCut "$SMPROGRAMS\Beremiz\Uninstall.lnk" "$INSTDIR\uninstall.exe"
diff -r fd09116d3537 -r 3991f82369cb windows_installer.mk
--- a/windows_installer.mk	Sat Sep 04 01:35:11 2021 +0200
+++ b/windows_installer.mk	Thu Sep 09 21:54:33 2021 +0200
@@ -11,10 +11,13 @@
 
 CURDIR:=$(shell pwd)
 PACMANPFX=$(CURDIR)/pacman
-msysdir=installer/msys32
+msysdir=msys32
 MSYS_ROOT=$(CURDIR)/$(msysdir)
 
-pacman/.stamp: | installer
+mingw32dir=$(msysdir)/mingw32
+mingw32finaldir=installer/mingw32
+
+pacman/.stamp:
 	rm -rf pacman pacman-6.0.0
 	$(call get_src_http,https://sources.archlinux.org/other/pacman,pacman-6.0.0.tar.xz)\
 	tar -xJf $$dld
@@ -25,17 +28,23 @@
 	touch $@
 
 define pacman_install
-LD_LIBRARY_PATH=$(PACMANPFX)/usr/lib/x86_64-linux-gnu/ fakeroot pacman/usr/bin/pacman -S $(1) --arch i686 --noconfirm -cachedir $(distfiles)
+LD_LIBRARY_PATH=$(PACMANPFX)/usr/lib/x86_64-linux-gnu/ fakeroot pacman/usr/bin/pacman -S $(1) --arch i686 --noconfirm --cachedir $(distfiles)
 endef
 
-$(msysdir)/.stamp: pacman/.stamp | installer
-	rm -rf installer/msys32
+$(msysdir)/.stamp: pacman/.stamp 
+	rm -rf $(msysdir)
 	$(call get_src_http,http://repo.msys2.org/distrib/i686,msys2-base-i686-20210705.tar.xz)\
-	tar -C installer -xJf $$dld
-	$(call pacman_install, mingw-w64-i686-gcc)
-	$(call pacman_install, make)
+	tar -xJf $$dld
 	touch $@
 
+$(mingw32dir)/.stamp: $(msysdir)/.stamp 
+	$(call pacman_install, mingw-w64-i686-gcc)
+	touch $@
+
+# this takes just a fraction of msys2, but for now only this is needed
+$(mingw32finaldir): $(mingw32dir)/.stamp | installer
+	rm -rf $(mingw32finaldir)
+	cp -a $(mingw32dir) $(mingw32finaldir)
 
 msiexec = WINEPREFIX=$(tmp) $(XVFBRUN) msiexec
 wine = WINEPREFIX=$(tmp) $(XVFBRUN) wine
@@ -68,7 +77,7 @@
         autobahn            \
         msgpack_python      \
         u-msgpack-python    \
-        zeroconf=0.20.0     \
+        zeroconf2           \
         lxml                \
         sslpsk              \
         pycountry           \
@@ -79,8 +88,6 @@
         Pyro                \
         gnosis              
 	
-	# # service identity (twisted prereq) ?
-	# # python sslpsk (to have PYROPSK)
 	# # FIXME : this uses 'some' binaries of openssl that forces us to stick to python 2.7.13
 	# # FIXME : (from here : https://www.npcglib.org/~stathis/blog/precompiled-openssl/)
 	# # FIXME : build it, and use openssl binaries from https://github.com/python/cpython-bin-deps/tree/openssl-bin-1.0.2k
@@ -124,7 +131,7 @@
 	cp $< $@ 
 
 Beremiz-build: Beremiz-$(TIMESTAMP)_build
-Beremiz-$(TIMESTAMP)_build: $(msysdir)/.stamp $(pydir)/.stamp $(matiecdir)/.stamp $(beremizdir)/.stamp ide_targets_from_dist $(ide_revisions)
+Beremiz-$(TIMESTAMP)_build: $(mingw32finaldir) $(pydir)/.stamp $(matiecdir)/.stamp $(beremizdir)/.stamp ide_targets_from_dist $(ide_revisions)
 	touch $@
 
 Beremiz-archive: Beremiz-$(TIMESTAMP).zip