From f1593cad709ff58c5797e9bc687fe789de454195 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Sun, 5 May 2019 17:16:38 -0700
Subject: [PATCH] Updated readmes.
---
BUILD_LINUX.md | 13 ++++---------
tools/qt-builder/README.md | 13 ++++++++-----
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/BUILD_LINUX.md b/BUILD_LINUX.md
index e8599ffce4..0bfb99c4cf 100644
--- a/BUILD_LINUX.md
+++ b/BUILD_LINUX.md
@@ -11,7 +11,7 @@ Should you choose not to install Qt5 via a package manager that handles dependen
### Ubuntu 16.04 only
Add the following line to *.bash_profile*
`export QT_QPA_FONTDIR=/usr/share/fonts/truetype/dejavu/`
-### Ubuntu 18.04 only
+### Ubuntu 18.04 server only
Add the universe repository:
_(This is not enabled by default on the server edition)_
`sudo add-apt-repository universe`
@@ -36,20 +36,15 @@ Verify by git --version
1. g++
`sudo apt-get install g++ -y`
Verify by g++ --version
-1. cmake
+1. *Ubuntu 18.04* cmake
`sudo apt-get install cmake -y`
Verify by git --version
-1. cmake
+1. *Ubuntu 16.04* cmake
`wget https://cmake.org/files/v3.14/cmake-3.14.2-Linux-x86_64.sh`
`sudo sh cmake-3.14.2-Linux-x86_64.sh --prefix=/usr/local --exclude-subdir`
-##### Python
-Add to _bash_profile:
-`
### Get code and checkout the tag you need
Clone this repository:
-```bash
-git clone https://github.com/highfidelity/hifi.git
-```
+`git clone https://github.com/highfidelity/hifi.git`
To compile a RELEASE version checkout the tag you need getting a list of all tags:
`git fetch -a`
diff --git a/tools/qt-builder/README.md b/tools/qt-builder/README.md
index c8823c89c5..4cd49ce865 100644
--- a/tools/qt-builder/README.md
+++ b/tools/qt-builder/README.md
@@ -135,7 +135,7 @@ If not, follow https://github.com/highfidelity/vcpkg to install *vcpkg* and then
run `..\qt5\qt5vars.bat`
`cd ..\..\qt5-build`
-`..\qt5\configure -opensource -confirm-license -opengl desktop -platform win32-msvc -openssl-linked OPENSSL_LIBS="-lssleay32 -llibeay32" -I %HIFI_VCPKG_BASE_VERSION%\packages\openssl-windows_x64-windows\include -L %HIFI_VCPKG_BASE_VERSION%\packages\openssl-windows_x64-windows\lib -nomake examples -nomake tests -skip qttranslations -skip qtserialport -skip qt3d -skip qtlocation -skip qtwayland -skip qtsensors -skip qtgamepad -skip qtspeech -skip qtcharts -skip qtx11extras -skip qtmacextras -skip qtvirtualkeyboard -skip qtpurchasing -skip qtdatavis3d -no-warnings-are-errors -no-pch -prefix ..\qt5-install`
+`..\qt5\configure -force-debug-info -opensource -confirm-license -opengl desktop -platform win32-msvc -openssl-linked OPENSSL_LIBS="-lssleay32 -llibeay32" -I %HIFI_VCPKG_BASE_VERSION%\packages\openssl-windows_x64-windows\include -L %HIFI_VCPKG_BASE_VERSION%\packages\openssl-windows_x64-windows\lib -nomake examples -nomake tests -skip qttranslations -skip qtserialport -skip qt3d -skip qtlocation -skip qtwayland -skip qtsensors -skip qtgamepad -skip qtspeech -skip qtcharts -skip qtx11extras -skip qtmacextras -skip qtvirtualkeyboard -skip qtpurchasing -skip qtdatavis3d -no-warnings-are-errors -no-pch -prefix ..\qt5-install`
#### Make
`nmake`
`nmake install`
@@ -170,12 +170,14 @@ Upload qt5-install.tar.gz to https://hifi-qa.s3.amazonaws.com/qt5/Windows/
*Ubuntu 18.04*
`../qt5/configure -force-debug-info -release -opensource -confirm-license -gdb-index -recheck-all -nomake tests -nomake examples -skip qttranslations -skip qtserialport -skip qt3d -skip qtlocation -skip qtwayland -skip qtsensors -skip qtgamepad -skip qtspeech -skip qtcharts -skip qtx11extras -skip qtmacextras -skip qtvirtualkeyboard -skip qtpurchasing -skip qtdatavis3d -no-warnings-are-errors -no-pch -c++std c++14 -prefix ../qt5-install`
+
+???`../qt5/configure -opensource -confirm-license -gdb-index -nomake examples -nomake tests -skip qttranslations -skip qtserialport -skip qt3d -skip qtlocation -skip qtwayland -skip qtsensors -skip qtgamepad -skip qtspeech -skip qtcharts -skip qtmacextras -skip qtvirtualkeyboard -skip qtpurchasing -skip qtdatavis3d -no-warnings-are-errors -no-pch -prefix ../qt5-install`
#### Make
`make`
-*Ubuntu 18.04 only*
-`make module-qtwebengine`
-`make module-qtscript`
+????*Ubuntu 18.04 only*
+????`make module-qtwebengine`
+????`make module-qtscript`
*Both*
`make install`
@@ -216,7 +218,7 @@ git clone --recursive git://code.qt.io/qt/qt5.git -b 5.12.3 --single-branch
`mkdir qt5-build`
`cd ../qt5-build`
-`../qt5/configure -opensource -confirm-license -qt-zlib -qt-libjpeg -qt-libpng -qt-freetype -qt-pcre -qt-harfbuzz -nomake examples -nomake tests -skip qttranslations -skip qtserialport -skip qt3d -skip qtlocation -skip qtwayland -skip qtsensors -skip qtgamepad -skip qtspeech -skip qtcharts -skip qtx11extras -skip qtmacextras -skip qtvirtualkeyboard -skip qtpurchasing -skip qtdatavis3d -no-warnings-are-errors -no-pch -prefix ../qt5-install`
+`../qt5/configure -force-debug-info -opensource -confirm-license -qt-zlib -qt-libjpeg -qt-libpng -qt-freetype -qt-pcre -qt-harfbuzz -nomake examples -nomake tests -skip qttranslations -skip qtserialport -skip qt3d -skip qtlocation -skip qtwayland -skip qtsensors -skip qtgamepad -skip qtspeech -skip qtcharts -skip qtx11extras -skip qtmacextras -skip qtvirtualkeyboard -skip qtpurchasing -skip qtdatavis3d -no-warnings-are-errors -no-pch -prefix ../qt5-install`
#### Make
`make`
`make install`
@@ -224,6 +226,7 @@ git clone --recursive git://code.qt.io/qt/qt5.git -b 5.12.3 --single-branch
1. The *.prl* files have an absolute path that needs to be removed (see http://www.linuxfromscratch.org/blfs/view/stable-systemd/x/qtwebengine.html)
`cd ../qt5-install`
`find . -name \*.prl -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;`
+`cd ..`
1. Copy *qt.conf* to *qt5-install\bin*
#### Uploading
`tar -zcvf qt5-install.tar.gz qt5-install`