Merge pull request #22 from QuasarApp/version_1_0

fix scrypt builds
QuasarApp · Sep 22, 2018 · efbb41e · efbb41e
2 parents 6449ca4 + 893fcb6
commit efbb41e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -52,3 +52,5 @@ snap/\.snapcraft/
 \.buildconfig
 
 sharedQt/
+
+staticQt/
diff --git a/CQtDeployer/deploy.cpp b/CQtDeployer/deploy.cpp
@@ -94,7 +94,7 @@ bool Deploy::createRunScript() {
         "export QML2_IMPORT_PATH=$BASEDIR/qml:QML2_IMPORT_PATH\n"
         "export QT_PLUGIN_PATH=$BASEDIR/plugins:QT_PLUGIN_PATH\n"
         "export QT_QPA_PLATFORM_PLUGIN_PATH=$BASEDIR/plugins/platforms:QT_QPA_PLATFORM_PLUGIN_PATH\n"
-        "$BASEDIR/%1 \"$@\"";
+        ".$BASEDIR/%1 \"$@\"";
 
     content = content.arg(QFileInfo(target).fileName());
 

diff --git a/sharedBuild.sh b/sharedBuild.sh
@@ -3,9 +3,11 @@
 declare -a QTLIBS
 
 BASE_DIR=$(dirname "$(readlink -f "$0")")
-
 QTLIBS=( libQt5Sql.so libQt5Xml.so libQt5Core.so libQt5Test.so libQt5Network.so libQt5Concurrent.so)
 
+make clean
+find $BASE_DIR -type f -name 'Makefile' -exec rm {} \;
+
 cd $BASE_DIR/qtBase
 
 for var in "${QTLIBS[@]}"
@@ -16,34 +18,28 @@ do
 	else
 	    echo "$var - not exits!. rebuild qt ..."
 
-            sudo apt install libpcre2-dev
-
             rm -rdf $BASE_DIR/sharedQt
-
             git clean -xdf
-
             ./configure -confirm-license -prefix $BASE_DIR/sharedQt -release -shared -no-opengl -no-openssl -opensource -nomake tests -nomake examples -no-gui -no-widgets -no-dbus -no-accessibility
-
             make install -j$(nproc)
 	    break
 	fi
 done
 
 cd ..
 rm -rdf $BASE_DIR/build
-
 export PATH=$PATH:$BASE_DIR/sharedQt
-
 $BASE_DIR/sharedQt/bin/qmake CQtDeployer.pro
 
 make -j$(nproc)
-
 strip build/*
-
 chmod +x $BASE_DIR/build/CQtDeployer
 
 $BASE_DIR/build/CQtDeployer -runScript cqtdeployer.sh -bin $BASE_DIR/build/CQtDeployer -qmake $BASE_DIR/sharedQt/bin/qmake
 
-tar -czvf $BASE_DIR/build/cqtdeployer.tar.gz $BASE_DIR/build/*
+cd $BASE_DIR/build
+
+tar -czvf $BASE_DIR/build/cqtdeployer.tar.gz ./*
+cd $BASE_DIR
 
 rm $BASE_DIR/build/lib -rdf $BASE_DIR/build/*.so* $BASE_DIR/build/*.sh*
diff --git a/staticBuild.sh b/staticBuild.sh
@@ -3,11 +3,11 @@
 declare -a QTLIBS
 
 BASE_DIR=$(dirname "$(readlink -f "$0")")
-
-QTLIBS=( libQt5Sql.a libQt5Xml.a libQt5Core.a libQt5Test.a libqtpcre2.a libQt5Network.a libQt5Bootstrap.a libQt5Concurrent.a)  
-
+QTLIBS=( libQt5Sql.a libQt5Xml.a libQt5Core.a libQt5Test.a libQt5Network.a libQt5Bootstrap.a libQt5Concurrent.a)
 echo "base dir $BASE_DIR"
 
+make clean
+find $BASE_DIR -type f -name 'Makefile' -exec rm {} \;
 cd $BASE_DIR/qtBase
 
 for var in "${QTLIBS[@]}"
@@ -17,13 +17,9 @@ do
 	    echo "$var - ok"
 	else
 	    echo "$var - not exits!. rebuild qt ..."
-
             rm -rdf $BASE_DIR/staticQt
-
-            git clean -xdf
-
-            ./configure -confirm-license -prefix $BASE_DIR/staticQt -release -optimize-size -static -no-opengl -no-openssl -opensource -nomake tests -nomake examples -no-gui -no-widgets -no-dbus -no-accessibility
-
+            git clean -xdf    
+            ./configure -confirm-license -prefix $BASE_DIR/staticQt -release -optimize-size -static -no-opengl -no-openssl -opensource -nomake tests -nomake examples -no-gui -no-widgets -no-dbus -no-accessibility    
             make install -j$(nproc)
 	    break
 	fi
@@ -33,7 +29,6 @@ cd ..
 rm -rdf $BASE_DIR/build
 
 export PATH=$PATH:$BASE_DIR/staticQt
-
 $BASE_DIR/staticQt/bin/qmake CQtDeployer.pro
 
 make -j$(nproc)