try to fix Qt-Crash by platforms folder. Remove maybe unneeded patches.

TheCrazyT · Jan 13, 2018 · cec1762 · cec1762
1 parent f779d00
commit cec1762
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 34 deletions.
diff --git a/.travis_before_deploy b/.travis_before_deploy
@@ -307,6 +307,7 @@ mkdir msysDLLs
 mkdir additionalDLLs
 mkdir build
 mkdir msysDLLs/imageformats
+mkdir msysDLLs/platforms
 
 ls roboschool/cpp-household/bullet_local_install/bin/
 cp roboschool/cpp-household/bullet_local_install/bin/* additionalDLLs/
@@ -326,6 +327,9 @@ cp qt/mingw64/share/qt5/plugins/imageformats/qicns.dll msysDLLs/imageformats/
 cp qt/mingw64/share/qt5/plugins/imageformats/qico.dll msysDLLs/imageformats/
 cp qt/mingw64/share/qt5/plugins/imageformats/qjp2.dll msysDLLs/imageformats/
 cp qt/mingw64/share/qt5/plugins/imageformats/qjpeg.dll msysDLLs/imageformats/
+
+cp qt/mingw64/share/qt5/plugins/platforms/*.dll msysDLLs/platforms/
+
 cp bzip2/mingw64/bin/libbz2-1.dll msysDLLs/
 cp freetype/mingw64/bin/libfreetype-6.dll msysDLLs/
 cp glib2/mingw64/bin/libglib-2.0-0.dll msysDLLs/

diff --git a/.travis_before_install b/.travis_before_install
@@ -124,11 +124,11 @@ if [ $? != 0 ]
 then
 	exit 1
 fi
-wget -O boost_2_mvc.7z https://dl.bintray.com/thecrazyt/roboschool/boost_2_mvc.7z
-if [ $? != 0 ]
-then
-	exit 1
-fi
+#wget -O boost_2_mvc.7z https://dl.bintray.com/thecrazyt/roboschool/boost_2_mvc.7z
+#if [ $? != 0 ]
+#then
+#	exit 1
+#fi
 
 sudo sed 's/\(.include *.ansidecl.h.\)/\/\/\1/g' -i /usr/share/mingw-w64/include/ieeefp.h
 if [ $? != 0 ]

diff --git a/.travis_before_script b/.travis_before_script
@@ -28,7 +28,7 @@ then
 	exit 1
 fi
 mv mingw-w64-x86_64-boost-1.66.0-1-any.pkg.tar.xz boost/
-mv boost_2_mvc.7z boost/
+#mv boost_2_mvc.7z boost/
 if [ $? != 0 ]
 then
 	exit 1
@@ -48,7 +48,7 @@ ls mingw64
 if [ $? != 0 ]
 then
     ls -lah mingw-w64-x86_64-qt5-5.10.0-1-any.pkg.tar.xz
-    tar xf mingw-w64-x86_64-qt5-5.10.0-1-any.pkg.tar.xz mingw64/include/ mingw64/bin/ mingw64/lib/ mingw64/share/qt5/plugins/imageformats 1>/dev/null 2>/dev/null
+    tar xf mingw-w64-x86_64-qt5-5.10.0-1-any.pkg.tar.xz mingw64/include/ mingw64/bin/ mingw64/lib/ mingw64/share/qt5/plugins/imageformats mingw64/share/qt5/plugins/platforms 1>/dev/null 2>/dev/null
     if [ $? != 0 ]
     then
         exit 1
@@ -68,23 +68,23 @@ then
     fi
     rm mingw-w64-x86_64-python3-3.6.4-1-any.pkg.tar.xz
 
-    wget https://dl.bintray.com/thecrazyt/roboschool/python_include.7z
-    if [ $? != 0 ]
-    then
-        exit 1
-    fi
-    7zr x python_include.7z
-    if [ $? != 0 ]
-    then
-        exit 1
-    fi
-    rm -Rf mingw64/include/python3.6m
-    mv include mingw64/include/python3.6m
-
-    if [ $? != 0 ]
-    then
-        exit 1
-    fi
+    #wget https://dl.bintray.com/thecrazyt/roboschool/python_include.7z
+    #if [ $? != 0 ]
+    #then
+    #    exit 1
+    #fi
+    #7zr x python_include.7z
+    #if [ $? != 0 ]
+    #then
+    #    exit 1
+    #fi
+    #rm -Rf mingw64/include/python3.6m
+    #mv include mingw64/include/python3.6m
+    #
+    #if [ $? != 0 ]
+    #then
+    #    exit 1
+    #fi
 fi
 
 cd ../boost
@@ -99,16 +99,16 @@ then
     fi
     rm mingw-w64-x86_64-boost-1.66.0-1-any.pkg.tar.xz
 
-    7zr x boost_2_mvc.7z
-    if [ $? != 0 ]
-    then
-        exit 1
-    fi
-    patch -f -p3 < boost_2_mvc.patch
-    if [ $? != 0 ]
-    then
-        exit 1
-    fi
+    #7zr x boost_2_mvc.7z
+    #if [ $? != 0 ]
+    #then
+    #    exit 1
+    #fi
+    #patch -f -p3 < boost_2_mvc.patch
+    #if [ $? != 0 ]
+    #then
+    #    exit 1
+    #fi
 fi
 
 cd ../assimp