Linux: enhancements to build_cmake_deb.sh script. Use wxWidgets 3.2.5
This commit is contained in:
parent
01d414c3fe
commit
6ac3b02a24
|
@ -18,69 +18,74 @@ export SOURCEPATH=$(readlink -f "$SCRIPTPATH/..")
|
|||
# Directory where the VeraCrypt has been checked out
|
||||
export PARENTDIR=$(readlink -f "$SCRIPTPATH/../../..")
|
||||
|
||||
# The sources of wxWidgets 3.2.2.1 must be extracted to the parent directory
|
||||
export WX_ROOT=$PARENTDIR/wxWidgets-3.2.2.1
|
||||
# The sources of wxWidgets 3.2.5 must be extracted to the parent directory
|
||||
export WX_ROOT=$PARENTDIR/wxWidgets-3.2.5
|
||||
echo "Using wxWidgets sources in $WX_ROOT"
|
||||
|
||||
cd $SOURCEPATH
|
||||
|
||||
if [ "$#" = "1" ] && [ "$1" = "WXSTATIC" ]
|
||||
then
|
||||
echo "Building GUI version of VeraCrypt for DEB using wxWidgets static libraries"
|
||||
build_and_install() {
|
||||
target=$1
|
||||
wxstatic=$2
|
||||
indicator=$3
|
||||
nogui=""
|
||||
|
||||
# This will be the temporary wxWidgets directory
|
||||
export WX_BUILD_DIR=$PARENTDIR/wxBuildGUI
|
||||
# Determine wxWidgets build directory based on target
|
||||
if [ "$target" = "Console" ]; then
|
||||
export WX_BUILD_DIR="$PARENTDIR/wxBuildConsole"
|
||||
nogui="NOGUI=1"
|
||||
else
|
||||
export WX_BUILD_DIR="$PARENTDIR/wxBuildGUI"
|
||||
fi
|
||||
|
||||
# To build wxWidgets without GUI
|
||||
make WXSTATIC=1 wxbuild || exit 1
|
||||
make WXSTATIC=1 clean || exit 1
|
||||
make WXSTATIC=1 || exit 1
|
||||
make WXSTATIC=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1
|
||||
wxstatic_value=""
|
||||
if [ "$wxstatic" = "WXSTATIC" ]; then
|
||||
wxstatic_value="WXSTATIC=1"
|
||||
make $wxstatic_value $nogui wxbuild || exit 1
|
||||
fi
|
||||
|
||||
else
|
||||
indicator_value=""
|
||||
if [ "$indicator" = "INDICATOR" ]; then
|
||||
indicator_value="INDICATOR=1"
|
||||
fi
|
||||
|
||||
echo "Building GUI version of VeraCrypt for DEB using system wxWidgets"
|
||||
make clean || exit 1
|
||||
make $wxstatic_value $indicator_value $nogui clean || exit 1
|
||||
make $wxstatic_value $indicator_value $nogui || exit 1
|
||||
make $wxstatic_value $indicator_value $nogui install DESTDIR="$PARENTDIR/VeraCrypt_Setup/$target" || exit 1
|
||||
}
|
||||
|
||||
if [ "$#" = "1" ] && [ "$1" = "INDICATOR" ]
|
||||
then
|
||||
|
||||
make INDICATOR=1 || exit 1
|
||||
make INDICATOR=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1
|
||||
|
||||
else
|
||||
|
||||
make || exit 1
|
||||
make install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1
|
||||
|
||||
fi
|
||||
|
||||
fi
|
||||
# Handle arguments
|
||||
case "$1$2" in
|
||||
"WXSTATIC")
|
||||
echo "Building GUI version of VeraCrypt for DEB using wxWidgets static libraries"
|
||||
build_and_install "GUI" "WXSTATIC" ""
|
||||
;;
|
||||
"INDICATOR")
|
||||
echo "Building GUI version of VeraCrypt for DEB using system wxWidgets and indicator"
|
||||
build_and_install "GUI" "" "INDICATOR"
|
||||
;;
|
||||
"WXSTATICINDICATOR"|"INDICATORWXSTATIC")
|
||||
echo "Building GUI version of VeraCrypt for DEB using wxWidgets static libraries and indicator"
|
||||
build_and_install "GUI" "WXSTATIC" "INDICATOR"
|
||||
;;
|
||||
*)
|
||||
echo "Building GUI version of VeraCrypt for DEB using system wxWidgets"
|
||||
build_and_install "GUI" "" ""
|
||||
;;
|
||||
esac
|
||||
|
||||
echo "Building console version of VeraCrypt for DEB using wxWidgets static libraries"
|
||||
|
||||
# This is to avoid " Error: Unable to initialize GTK+, is DISPLAY set properly?"
|
||||
# when building over SSH without X11 Forwarding
|
||||
# export DISPLAY=:0.0
|
||||
|
||||
# This will be the temporary wxWidgets directory
|
||||
export WX_BUILD_DIR=$PARENTDIR/wxBuildConsole
|
||||
|
||||
# To build wxWidgets without GUI
|
||||
make WXSTATIC=1 NOGUI=1 wxbuild || exit 1
|
||||
make WXSTATIC=1 NOGUI=1 clean || exit 1
|
||||
make WXSTATIC=1 NOGUI=1 || exit 1
|
||||
make WXSTATIC=1 NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console" || exit 1
|
||||
build_and_install "Console" "WXSTATIC" ""
|
||||
|
||||
echo "Creating VeraCrypt DEB packages"
|
||||
|
||||
# -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack DEB
|
||||
# -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack DEB
|
||||
|
||||
mkdir -p $PARENTDIR/VeraCrypt_Packaging/GUI
|
||||
mkdir -p $PARENTDIR/VeraCrypt_Packaging/Console
|
||||
mkdir -p $PARENTDIR/VeraCrypt_Packaging/{GUI,Console}
|
||||
|
||||
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
|
||||
cpack --config $PARENTDIR/VeraCrypt_Packaging/Console/CPackConfig.cmake || exit 1
|
||||
|
|
Loading…
Reference in New Issue