Revision 5e3703dc3b0292695d1dfeca6dd74bedaef0f5b5 authored by Pascal Obry on 30 December 2016, 09:41:58 UTC, committed by Pascal Obry on 16 January 2017, 21:54:23 UTC
The implementation of the undo/redo was simple but was letting the complexity in the hand of the API users. In fact there was a need to keep a prev state and and a current state, and to record only previous states and not the current one. This was mostly working (except for a redo bug discoverred while working on this new implementation) but was tedious. The new undo implementation is more complex but makes it far easier to use. That is, modules can just record the current state and they don't need to keep a previous state at all. The undo history and map support has been reimplemented with this new semantics and have been cleaned-up as a consequence. This work has been highly motivated by the fact that we want to support undo/redo for masks and that it was far too complex to do right with the previous implementation.
1 parent d8e7d14
build.sh
#!/bin/sh
set -e
DT_SRC_DIR=$(dirname "$0")
DT_SRC_DIR=$(cd "$DT_SRC_DIR" && pwd -P)
# ---------------------------------------------------------------------------
# Set default values to option vars
# ---------------------------------------------------------------------------
INSTALL_PREFIX_DEFAULT="/opt/darktable"
INSTALL_PREFIX="$INSTALL_PREFIX_DEFAULT"
BUILD_TYPE_DEFAULT="RelWithDebInfo"
BUILD_TYPE="$BUILD_TYPE_DEFAULT"
BUILD_DIR_DEFAULT="$DT_SRC_DIR/build"
BUILD_DIR="$BUILD_DIR_DEFAULT"
BUILD_GENERATOR_DFEAULT="Unix Makefiles"
BUILD_GENERATOR="$BUILD_GENERATOR_DFEAULT"
MAKE_TASKS=-1
ADDRESS_SANITIZER=0
DO_CONFIG=1
DO_BUILD=1
DO_INSTALL=0
SUDO=""
PRINT_HELP=0
FEATURES="FLICKR LIBSECRET KWALLET OPENMP OPENCL UNITY TETHERING GEO LUA OPENEXR WEBP"
# prepare a lowercase version with a space before and after
# it's very important for parse_feature, has no impact in for loop expansions
FEATURES_=$(for i in $FEATURES ; do printf " $(printf $i|tr A-Z a-z) "; done)
# ---------------------------------------------------------------------------
# Parsing functions
# ---------------------------------------------------------------------------
parse_feature()
{
local feature="$1"
local value="$2"
if printf "$FEATURES_" | grep -q " $feature " ; then
eval "FEAT_$(printf $feature|tr a-z A-Z)"=$value
else
printf "warning: unknown feature '$feature'\n"
fi
}
parse_args()
{
while [ "$#" -ge 1 ] ; do
option="$1"
case $option in
--prefix)
INSTALL_PREFIX="$2"
shift
;;
--build-type|--buildtype)
BUILD_TYPE="$2"
shift
;;
--build-dir)
BUILD_DIR="$2"
shift
;;
--build-generator)
BUILD_GENERATOR="$2"
shift
;;
-j|--jobs)
MAKE_TASKS=$(printf "%d" "$2" >/dev/null 2>&1 && printf "$2" || printf "$MAKE_TASKS")
shift
;;
--enable-*)
feature=${option#--enable-}
parse_feature "$feature" 1
;;
--disable-*)
feature=${option#--disable-}
parse_feature "$feature" 0
;;
--asan)
ADDRESS_SANITIZER=1
;;
--skip-config)
DO_CONFIG=0
;;
--skip-build)
DO_BUILD=0
;;
--install)
DO_INSTALL=1
;;
--sudo)
SUDO="sudo "
;;
-h|--help)
PRINT_HELP=1
;;
*)
echo "warning: ignoring unknown option $option"
;;
esac
shift
done
}
# ---------------------------------------------------------------------------
# Help
# ---------------------------------------------------------------------------
print_help()
{
cat <<EOF
$(basename $0) [OPTIONS]
Options:
Installation:
--prefix <string> Install directory prefix
(default: $INSTALL_PREFIX_DEFAULT)
--sudo Use sudo when doing the install
Build:
--build-dir <string> Building directory
(default: $BUILD_DIR_DEFAULT)
--build-type <string> Build type (Release, Debug, RelWithDebInfo)
(default: $BUILD_TYPE_DEFAULT)
--build-generator <string> Build tool
(default: Unix Makefiles)
-j --jobs <integer> Number of tasks
(default: number of CPUs)
--asan Enable address sanitizer options
(default: disabled)
Actual actions:
--skip-build Configure but exit before building the binaries
(default: disabled)
--install After building the binaries, install them
(default: disabled)
Features:
By default cmake will enable the features it autodetects on the build machine.
Specifying the option on the command line forces the feature on or off.
All these options have a --disable-* equivalent.
$(for i in $FEATURES_ ; do printf " --enable-$i\n"; done)
Extra:
-h --help Print help message
EOF
}
# ---------------------------------------------------------------------------
# utility functions
# ---------------------------------------------------------------------------
num_cpu()
{
local ncpu
local platform=$(uname -s)
case "$platform" in
SunOS)
ncpu=$(/usr/sbin/psrinfo |wc -l)
;;
Linux|MINGW64*)
if [ -r /proc/cpuinfo ]; then
ncpu=$(grep -c "^processor" /proc/cpuinfo)
elif [ -x /sbin/sysctl ]; then
ncpu=$(/sbin/sysctl -n hw.ncpu 2>/dev/null)
if [ $? -neq 0 ]; then
ncpu=-1
fi
fi
;;
Darwin)
ncpu=$(/usr/sbin/sysctl -n machdep.cpu.core_count 2>/dev/null)
;;
*)
printf "warning: unable to determine number of CPUs on $platform\n"
ncpu=-1
;;
esac
if [ $ncpu -lt 1 ] ; then
ncpu=1
fi
printf "$ncpu"
}
make_name()
{
local make="make"
local platform=$(uname -s)
case "$platform" in
SunOS)
PATH="/usr/gnu/bin:$PATH"
export PATH
make="gmake"
;;
esac
printf "$make"
}
features_set_to_autodetect()
{
for i in $FEATURES; do
eval FEAT_$i=-1
done
}
cmake_boolean_option()
{
name=$1
value=$2
case $value in
-1)
# Do nothing
;;
0)
CMAKE_MORE_OPTIONS="$CMAKE_MORE_OPTIONS -D${name}=Off"
;;
1)
CMAKE_MORE_OPTIONS="$CMAKE_MORE_OPTIONS -D${name}=On"
;;
esac
}
# ---------------------------------------------------------------------------
# Let's process the user's wishes
# ---------------------------------------------------------------------------
MAKE_TASKS=$(num_cpu)
MAKE=$(make_name)
features_set_to_autodetect
parse_args "$@"
if [ $PRINT_HELP -ne 0 ] ; then
print_help
exit 1
fi
CMAKE_MORE_OPTIONS=""
for i in $FEATURES; do
eval cmake_boolean_option USE_$i \$FEAT_$i
done
# Some people might need this, but ignore if unset in environment
CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH:-}
CMAKE_MORE_OPTIONS="${CMAKE_MORE_OPTIONS} ${CMAKE_PREFIX_PATH}"
# ---------------------------------------------------------------------------
# Let's go
# ---------------------------------------------------------------------------
mkdir -p "$BUILD_DIR"
cat <<EOF
Darktable build script
Building directory: $BUILD_DIR
Installation prefix: $INSTALL_PREFIX
Build type: $BUILD_TYPE
Build generator: $BUILD_GENERATOR
Build tasks: $MAKE_TASKS
EOF
if [ $ADDRESS_SANITIZER -ne 0 ] ; then
ASAN_FLAGS="CFLAGS=\"-fsanitize=address -fno-omit-frame-pointer\""
ASAN_FLAGS="$ASAN_FLAGS CXXFLAGS=\"-fsanitize=address -fno-omit-frame-pointer\""
ASAN_FLAGS="$ASAN_FLAGS LDFLAGS=\"-fsanitize=address\" "
fi
cmd_config="${ASAN_FLAGS}cmake -G \"$BUILD_GENERATOR\" -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${CMAKE_MORE_OPTIONS} \"$DT_SRC_DIR\""
cmd_build="cmake --build "$BUILD_DIR" -- -j$MAKE_TASKS"
cmd_install="${SUDO}cmake --build \"$BUILD_DIR\" --target install -- -j$MAKE_TASKS"
OLDPWD="$(pwd)"
if [ $DO_CONFIG -eq 0 ] ; then
cat <<EOF
The script would have configured, built, and installed with these commands:
\$ $(printf "$cmd_config")
\$ $(printf "$cmd_build")
\$ $(printf "$cmd_install")
EOF
exit 0
fi
# configure the build
cd "$BUILD_DIR"
eval "$cmd_config"
cd "$OLDPWD"
if [ $DO_BUILD -eq 0 ] ; then
cat <<EOF
The darktable configuration is finished.
To build and install darktable you need to type:
\$ $(printf "$cmd_build")
\$ $(printf "$cmd_install")
EOF
exit 0
fi
# build the binaries
eval "$cmd_build"
if [ $DO_INSTALL -eq 0 ] ; then
cat <<EOF
darktable finished building.
To actually install darktable you need to type:
\$ $(printf "$cmd_install")
EOF
exit 0
fi
# install the binaries
eval "$cmd_install"
Computing file changes ...