diff options
| author | El Mostafa Idrassi <el-mostafa.idrassi@prestalab.net> | 2019-10-07 17:49:46 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2019-10-07 18:49:46 +0200 |
| commit | 15a8cde6f5b990ccf5ce4fcad065a3e8ca476ba8 (patch) | |
| tree | 4fb184dd140e5bcaffdb5ce8a5e676cafca66ca8 /src/Build/build_cmake_deb.sh | |
| parent | 6d7f7527be5ddd31a87cb015c04074de81ab0061 (diff) | |
| download | VeraCrypt-15a8cde6f5b990ccf5ce4fcad065a3e8ca476ba8.tar.gz VeraCrypt-15a8cde6f5b990ccf5ce4fcad065a3e8ca476ba8.zip | |
Updated and fixed build and packaging scripts. (#512)
Now, under Debian 10+ and Ubuntu 18.04+, we link against the GTK-3 version of wxWidgets (libwxgtk3.0-gtk3-0v5).
Under Debian 9- and Ubuntu 16.04, we link against the GTK-2 version of wxWidgets (libwxgtk3.0-0v5) which is the
only one available.
Also, we now have 2 separate RPM scripts : 'build_cmake_rpm_gtk2.sh' which builds wxWidgets and links it against GTK-2,
then links VeraCrypt against 'gtk2' package (typically to be used under CentOS 6) and 'build_cmake_rpm_gtk3' which builds
wxWidgets and links it against GTK-3, then links VeraCrypt against 'gtk3' package (typically to be used under CentOS 7+).
Diffstat (limited to 'src/Build/build_cmake_deb.sh')
| -rwxr-xr-x | src/Build/build_cmake_deb.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/Build/build_cmake_deb.sh b/src/Build/build_cmake_deb.sh index c8098947..3be23dda 100755 --- a/src/Build/build_cmake_deb.sh +++ b/src/Build/build_cmake_deb.sh @@ -20,6 +20,7 @@ make || exit 1 make install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1 echo "Building console version of VeraCrypt for DEB using system wxWidgets" + # This is to avoid " Error: Unable to initialize GTK+, is DISPLAY set properly?" # when building over SSH without X11 Forwarding # export DISPLAY=:0.0 @@ -29,13 +30,14 @@ make NOGUI=1 || exit 1 make NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console" || exit 1 echo "Creating VeraCrypt DEB packages" + # -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack DEB # -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack DEB -mkdir $PARENTDIR/VeraCrypt_Packaging - -cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/GUI" -DNOGUI=FALSE || exit 1 -cpack --config $PARENTDIR/VeraCrypt_Packaging/CPackConfig.cmake || exit 1 +mkdir -p $PARENTDIR/VeraCrypt_Packaging/GUI +mkdir -p $PARENTDIR/VeraCrypt_Packaging/Console -cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/Console" -DNOGUI=TRUE || exit 1 -cpack --config $PARENTDIR/VeraCrypt_Packaging/CPackConfig.cmake || exit 1
\ No newline at end of file +cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging/GUI -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/GUI" -DNOGUI=FALSE || exit 1 +cpack --config $PARENTDIR/VeraCrypt_Packaging/GUI/CPackConfig.cmake || exit 1 +cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging/Console -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/Console" -DNOGUI=TRUE || exit 1 +cpack --config $PARENTDIR/VeraCrypt_Packaging/Console/CPackConfig.cmake || exit 1 |