From 345af08f9c36103ac990b73940c610cb7d6fb2ee Mon Sep 17 00:00:00 2001
From: Robin Adili <robin.adili@inria.fr>
Date: Mon, 14 Sep 2020 19:11:39 +0200
Subject: [PATCH] added sipmodule to build.bat + fixed version parsing
---
build.bat | 4 ++--
build.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.bat b/build.bat
index b912f70..855f310 100644
--- a/build.bat
+++ b/build.bat
@@ -38,7 +38,7 @@ for /F "tokens=1,2 delims=;" %%i in (reqs_win.txt) do (
tar xvf sip-4.19.3.tar.gz -C "%BUILDDIR%"
cd "%BUILDDIR%"\sip-*
-python "configure.py" -b "%SIPINSTALLDIR%" -d "%SIPINSTALLDIR%" -e "%SIPINSTALLDIR%" --pyidir="%SIPINSTALLDIR%"
+python "configure.py" -b "%SIPINSTALLDIR%" -d "%SIPINSTALLDIR%" -e "%SIPINSTALLDIR%" --pyidir="%SIPINSTALLDIR%" --sip-module="fbxsip"
nmake
nmake install
cd %CURRENTDIR%
@@ -55,4 +55,4 @@ copy "%SIPINSTALLDIR%\sip.pyd" "%FBXDIR%"
nt.Windows81SDK --remove Microsoft.VisualStudio.Workload.VCTools --remove Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --remove Microsoft.VisualStudio.Comp
onent.Windows10SDK || IF "%ERRORLEVEL%"=="3010" EXIT 0
popd
-pause
\ No newline at end of file
+pause
diff --git a/build.sh b/build.sh
index df85870..66ac237 100755
--- a/build.sh
+++ b/build.sh
@@ -33,7 +33,7 @@ patch -p0 < patch
cp "$scdir/PythonBindings.py" "$fbxpydir"
FBXSDK_ROOT="$fbxsdkdir" SIP_ROOT="$sipdir" python3 "$fbxpydir"/PythonBindings.py Python3_x64
-pyvers=$(python3 --version | cut -d' ' -f2)
+pyvers=$(python3 --version 2>&1 | cut -d' ' -f2)
pyvers=${pyvers%.*}
pyvers=${pyvers//./}
fbxdir="$scdir"/fbxsdkpy-cp${pyvers}-gnu_linux_x64
--
GitLab