# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1595521772 14400
# Node ID dace3d3721900915e2dbbf50665fc068f106cc9a
# Parent  f04816d4888f7290f39df0293e270cfca3c1beb1
Use msys2 python3

* src/msys2-mpdecimal.mk, src/msys2-python.mk, src/src-msys2-mpdecimal.mk,
  src/src-msys2-python.mk: new files

* dist-files.mk: added ref to new files

* index.html: add ref to new packages

* installer-files/octave-firsttime.vbs, installer-files/octave.bat,
  installer-files/octave.vbs: remove python path add

* src/python-embedded.mk: add note on not used

* src/python-mpmath.mk, src/python-sympy.mk: update dependancy for msys2-python

diff -r f04816d4888f -r dace3d372190 dist-files.mk
--- a/dist-files.mk	Thu Jul 23 07:17:24 2020 -0400
+++ b/dist-files.mk	Thu Jul 23 12:29:32 2020 -0400
@@ -938,12 +938,14 @@
   msys2-libxml2.mk \
   msys2-make.mk \
   msys2-mintty.mk \
+  msys2-mpdecimal.mk \
   msys2-mpfr.mk \
   msys2-ncurses.mk \
   msys2-pacman-mirrors.mk \
   msys2-pacman.mk \
   msys2-patch.mk \
   msys2-perl.mk \
+  msys2-python.mk \
   msys2-runtime.mk \
   msys2-sed.mk \
   msys2-tar.mk \
@@ -1003,12 +1005,14 @@
   src-msys2-libxml2.mk \
   src-msys2-make.mk \
   src-msys2-mintty.mk \
+  src-msys2-mpdecimal.mk \
   src-msys2-mpfr.mk \
   src-msys2-ncurses.mk \
   src-msys2-pacman-mirrors.mk \
   src-msys2-pacman.mk \
   src-msys2-patch.mk \
   src-msys2-perl.mk \
+  src-msys2-python.mk \
   src-msys2-runtime.mk \
   src-msys2-sed.mk \
   src-msys2-tar.mk \
diff -r f04816d4888f -r dace3d372190 index.html
--- a/index.html	Thu Jul 23 07:17:24 2020 -0400
+++ b/index.html	Thu Jul 23 12:29:32 2020 -0400
@@ -2074,6 +2074,10 @@
         <td class="website"><a href="https://www.msys2.org/">MSYS2 mintty</a></td>
     </tr>
     <tr>
+        <td class="package">msys2-mpdecimal</td>
+        <td class="website"><a href="https://www.msys2.org/">MSYS2 mpdecimal</a></td>
+    </tr>
+    <tr>
         <td class="package">msys2-mpfr</td>
         <td class="website"><a href="https://www.msys2.org/">MSYS2 mpfr</a></td>
     </tr>
@@ -2098,6 +2102,10 @@
         <td class="website"><a href="https://www.msys2.org/">MSYS2 perl</a></td>
     </tr>
     <tr>
+        <td class="package">msys2-python</td>
+        <td class="website"><a href="https://www.msys2.org/">MSYS2 python</a></td>
+    </tr>
+    <tr>
         <td class="package">msys2-runtime</td>
         <td class="website"><a href="https://www.msys2.org/">MSYS2 runtime</a></td>
     </tr>
diff -r f04816d4888f -r dace3d372190 installer-files/octave-firsttime.vbs
--- a/installer-files/octave-firsttime.vbs	Thu Jul 23 07:17:24 2020 -0400
+++ b/installer-files/octave-firsttime.vbs	Thu Jul 23 12:29:32 2020 -0400
@@ -28,7 +28,6 @@
 
 ' set up path to ensure octave bin comes first
 Set wshSystemEnv = wshShell.Environment( "PROCESS" )
-wshSystemEnv("PATH") = OctavePath & "\python;" & wshSystemEnv("PATH")
 if OctavePath <> MSysPath Then
   wshSystemEnv("PATH") = MSysPath  & "\bin;" & wshSystemEnv("PATH")
 End If
diff -r f04816d4888f -r dace3d372190 installer-files/octave.bat
--- a/installer-files/octave.bat	Thu Jul 23 07:17:24 2020 -0400
+++ b/installer-files/octave.bat	Thu Jul 23 12:29:32 2020 -0400
@@ -26,7 +26,7 @@
  
 Rem   Set up PATH.  Make sure the octave bin dir comes first.
 
-set PATH=%OCT_HOME%qt5\bin;%OCT_HOME%bin;%MSYSPATH%bin;%OCT_HOME%python;%PATH%
+set PATH=%OCT_HOME%qt5\bin;%OCT_HOME%bin;%MSYSPATH%bin;%PATH%
 
 Rem   Set up any environment vars we may need.
 
diff -r f04816d4888f -r dace3d372190 installer-files/octave.vbs
--- a/installer-files/octave.vbs	Thu Jul 23 07:17:24 2020 -0400
+++ b/installer-files/octave.vbs	Thu Jul 23 12:29:32 2020 -0400
@@ -28,7 +28,6 @@
 
 ' set up path to ensure octave bin comes first
 Set wshSystemEnv = wshShell.Environment( "PROCESS" )
-wshSystemEnv("PATH") = OctavePath & "\python;" & wshSystemEnv("PATH")
 if OctavePath <> MSysPath Then
   wshSystemEnv("PATH") = MSysPath  & "\bin;" & wshSystemEnv("PATH")
 End If
diff -r f04816d4888f -r dace3d372190 src/msys2-mpdecimal.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/msys2-mpdecimal.mk	Thu Jul 23 12:29:32 2020 -0400
@@ -0,0 +1,24 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := msys2-mpdecimal
+$(PKG)_NAME     := mpdecimal
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.4.2-2
+$(PKG)_x86_64_CS := d9458d2f42ac8141cae4396cdf4d5c012d335d48
+$(PKG)_i686_CS  := e50bc964c77e2c1e8e38da7bacd1e56c1bfa6278
+$(PKG)_CS       := $($(PKG)_$(MSYS2_ARCH)_CS)
+$(PKG)_CHECKSUM := $($(PKG)_CS)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz
+$(PKG)_URL      := $(MSYS2_URL)/$($(PKG)_FILE)
+
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(MSYS2_PKG_UPDATE)
+endef
+
+define $(PKG)_BUILD
+    $(MSYS2_PKG_BUILD)
+endef
diff -r f04816d4888f -r dace3d372190 src/msys2-python.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/msys2-python.mk	Thu Jul 23 12:29:32 2020 -0400
@@ -0,0 +1,24 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := msys2-python
+$(PKG)_NAME     := python
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 3.8.2-1
+$(PKG)_x86_64_CS := 338c9877b879a00b39d661a7513f62897413791d
+$(PKG)_i686_CS  := 551ce598052dc6bd1f8116f667c4856426545268
+$(PKG)_CS       := $($(PKG)_$(MSYS2_ARCH)_CS)
+$(PKG)_CHECKSUM := $($(PKG)_CS)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz
+$(PKG)_URL      := $(MSYS2_URL)/$($(PKG)_FILE)
+
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(MSYS2_PKG_UPDATE)
+endef
+
+define $(PKG)_BUILD
+    $(MSYS2_PKG_BUILD)
+endef
diff -r f04816d4888f -r dace3d372190 src/python-embedded.mk
--- a/src/python-embedded.mk	Thu Jul 23 07:17:24 2020 -0400
+++ b/src/python-embedded.mk	Thu Jul 23 12:29:32 2020 -0400
@@ -1,5 +1,7 @@
 # This file is part of MXE.
 # See index.html for further information.
+#
+# NOTE: this is currently depreciated from the mxe build in favor of msys2-python
 
 PKG             := python-embedded
 $(PKG)_VERSION  := 3.8.1
diff -r f04816d4888f -r dace3d372190 src/python-mpmath.mk
--- a/src/python-mpmath.mk	Thu Jul 23 07:17:24 2020 -0400
+++ b/src/python-mpmath.mk	Thu Jul 23 12:29:32 2020 -0400
@@ -7,14 +7,21 @@
 $(PKG)_SUBDIR   := 
 $(PKG)_FILE     := mpmath-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://files.pythonhosted.org/packages/ca/63/3384ebb3b51af9610086b23ea976e6d27d6d97bf140a76a365bd77a3eb32/$($(PKG)_FILE)
-$(PKG)_DEPS += python-embedded
+$(PKG)_DEPS     :=
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+ $(PKG)_DEPS += msys2-python
+ $(PKG)_PYTHON_PKG_DIR := $(MSYS2_DIR)/usr/lib/python$(call SHORT_PKG_VERSION,msys2-python)/site-packages/
+else
+ $(PKG)_PYTHON_PKG_DIR := $(3)$(HOST_PREFIX)/python
+endif
 
 define $(PKG)_UPDATE
     echo $($(PKG)_VERSION)
 endef
 
 define $(PKG)_BUILD
-    mkdir -p '$(3)$(HOST_PREFIX)/python'
-    cd '$(1)/mpmath-$($(PKG)_VERSION)' && tar cf - mpmath | ( cd '$(3)$(HOST_PREFIX)/python'; tar xpf - )
-    cd '$(1)' && tar cf - --exclude=mpmath-$($(PKG)_VERSION)/mpmath . | ( cd '$(3)$(HOST_PREFIX)/python'; tar xpf - )
+    mkdir -p '$($(PKG)_PYTHON_PKG_DIR)'
+    cd '$(1)/mpmath-$($(PKG)_VERSION)' && tar cf - mpmath | ( cd '$($(PKG)_PYTHON_PKG_DIR)'; tar xpf - )
+    cd '$(1)' && tar cf - --exclude=mpmath-$($(PKG)_VERSION)/mpmath . | ( cd '$($(PKG)_PYTHON_PKG_DIR)'; tar xpf - )
 endef
diff -r f04816d4888f -r dace3d372190 src/python-sympy.mk
--- a/src/python-sympy.mk	Thu Jul 23 07:17:24 2020 -0400
+++ b/src/python-sympy.mk	Thu Jul 23 12:29:32 2020 -0400
@@ -7,16 +7,24 @@
 $(PKG)_SUBDIR   := 
 $(PKG)_FILE     := sympy-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/sympy/sympy/releases/download/sympy-$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS += python-embedded python-mpmath
+
+$(PKG)_DEPS     := python-mpmath
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+ $(PKG)_DEPS += msys2-python
+ $(PKG)_PYTHON_PKG_DIR := $(MSYS2_DIR)/usr/lib/python$(call SHORT_PKG_VERSION,msys2-python)/site-packages/
+else
+ $(PKG)_PYTHON_PKG_DIR := $(3)$(HOST_PREFIX)/python
+endif
 
 define $(PKG)_UPDATE
     echo $($(PKG)_VERSION)
 endef
 
 define $(PKG)_BUILD
-    rm -rf '$(HOST_PREFIX)/python/sympy*'
+    rm -rf '$($(PKG)_PYTHON_PKG_DIR)/sympy*'
 
-    mkdir -p '$(3)$(HOST_PREFIX)/python'
-    cd '$(1)/sympy-$($(PKG)_VERSION)' && tar cf - sympy | ( cd '$(3)$(HOST_PREFIX)/python'; tar xpf - )
-    cd '$(1)' && tar cf - --exclude=sympy-$($(PKG)_VERSION)/sympy . | ( cd '$(3)$(HOST_PREFIX)/python'; tar xpf - )
+    mkdir -p '$($(PKG)_PYTHON_PKG_DIR)'
+    cd '$(1)/sympy-$($(PKG)_VERSION)' && tar cf - sympy | ( cd '$($(PKG)_PYTHON_PKG_DIR)'; tar xpf - )
+    cd '$(1)' && tar cf - --exclude=sympy-$($(PKG)_VERSION)/sympy . | ( cd '$($(PKG)_PYTHON_PKG_DIR)'; tar xpf - )
 endef
diff -r f04816d4888f -r dace3d372190 src/src-msys2-mpdecimal.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys2-mpdecimal.mk	Thu Jul 23 12:29:32 2020 -0400
@@ -0,0 +1,22 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys2-mpdecimal
+$(PKG)_NAME     := mpdecimal
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.4.2-2
+$(PKG)_CHECKSUM := baf2f04d1502ce51bff4d88a6756bf5bc942f5db
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz
+$(PKG)_URL      := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
+
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS2_BASE_URL)/' | \
+    $(SED) -n 's,.*title="$($(PKG)_NAME)-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
diff -r f04816d4888f -r dace3d372190 src/src-msys2-python.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys2-python.mk	Thu Jul 23 12:29:32 2020 -0400
@@ -0,0 +1,22 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys2-python
+$(PKG)_NAME     := python
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 3.8.4-1
+$(PKG)_CHECKSUM := 2318102220163c823e9f7f2e8d4a5ee75f094b9b
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz
+$(PKG)_URL      := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
+
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS2_BASE_URL)/' | \
+    $(SED) -n 's,.*title="$($(PKG)_NAME)-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef