Skip to content

Commit

Permalink
Merge pull request #16183 from victoryforce/remove-no-longer-needed-t…
Browse files Browse the repository at this point in the history
…hings

[maintenance] Remove no longer needed leftovers
  • Loading branch information
TurboGit authored Jan 25, 2024
2 parents a8763b1 + 7fcbdba commit 69f45cc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 62 deletions.
57 changes: 2 additions & 55 deletions .ci/ci-script.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# This file is part of darktable.
# Copyright (C) 2016-2023 darktable developers.
# Copyright (C) 2016-2024 darktable developers.
#
# darktable is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand All @@ -22,7 +22,7 @@
# INSTALL_DIR - the installation prefix
# SRC_DIR - directory with the source code to be compiled
# CC, CXX, CFLAGS, CXXFLAGS are optional, but make sense for build
# TARGET - either build, skiptest, nofeatures or nofeatures_nosse
# TARGET - either build or skiptest
# ECO - some other flags for cmake

set -ex
Expand Down Expand Up @@ -94,59 +94,6 @@ case "$TARGET" in
$ECO "$SRC_DIR" || (cat "$BUILD_DIR"/CMakeFiles/CMakeOutput.log; cat "$BUILD_DIR"/CMakeFiles/CMakeError.log)
target_notest
;;
"nofeatures")
cmake -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" \
-G"$GENERATOR" \
-DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
-DUSE_OPENMP=OFF \
-DUSE_OPENCL=OFF \
-DUSE_LUA=OFF \
-DUSE_GAME=OFF \
-DUSE_CAMERA_SUPPORT=OFF \
-DUSE_NLS=OFF \
-DUSE_GRAPHICSMAGICK=OFF \
-DUSE_OPENJPEG=OFF \
-DUSE_JXL=OFF \
-DUSE_WEBP=OFF \
-DUSE_AVIF=OFF \
-DUSE_HEIF=OFF \
-DUSE_XCF=OFF \
-DBUILD_CMSTEST=OFF \
-DUSE_OPENEXR=OFF \
-DBUILD_PRINT=OFF \
-DBUILD_RS_IDENTIFY=OFF \
-DUSE_GMIC=OFF \
-DUSE_LIBSECRET=OFF \
$ECO "$SRC_DIR" || (cat "$BUILD_DIR"/CMakeFiles/CMakeOutput.log; cat "$BUILD_DIR"/CMakeFiles/CMakeError.log)
target_notest
;;
"nofeatures_nosse")
cmake -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" \
-G"$GENERATOR" \
-DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
-DUSE_OPENMP=OFF \
-DUSE_OPENCL=OFF \
-DUSE_LUA=OFF \
-DUSE_GAME=OFF \
-DUSE_CAMERA_SUPPORT=OFF \
-DUSE_NLS=OFF \
-DUSE_GRAPHICSMAGICK=OFF \
-DUSE_OPENJPEG=OFF \
-DUSE_JXL=OFF \
-DUSE_WEBP=OFF \
-DUSE_AVIF=OFF \
-DUSE_HEIF=OFF \
-DUSE_XCF=OFF \
-DBUILD_CMSTEST=OFF \
-DUSE_OPENEXR=OFF \
-DBUILD_PRINT=OFF \
-DBUILD_RS_IDENTIFY=OFF \
-DUSE_GMIC=OFF \
-DUSE_LIBSECRET=OFF \
-DBUILD_SSE2_CODEPATHS=OFF \
$ECO "$SRC_DIR" || (cat "$BUILD_DIR"/CMakeFiles/CMakeOutput.log; cat "$BUILD_DIR"/CMakeFiles/CMakeError.log)
target_notest
;;
*)
exit 1
;;
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ CMAKE_OPTIONS_FROM_CMDLINE=""

PRINT_HELP=0

FEATURES="CAMERA COLORD GAME GRAPHICSMAGICK IMAGEMAGICK JXL KWALLET LIBSECRET LUA MAC_INTEGRATION MAP NLS OPENCL OPENEXR OPENMP UNITY WEBP"
FEATURES="CAMERA COLORD GRAPHICSMAGICK IMAGEMAGICK JXL KWALLET LIBSECRET LUA MAC_INTEGRATION MAP NLS OPENCL OPENEXR OPENMP UNITY 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
Expand Down
6 changes: 0 additions & 6 deletions data/darktableconfig.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,6 @@
<default>5</default>
<shortdescription>waiting time between each picture in slideshow</shortdescription>
</dtconfig>
<dtconfig>
<name>ui_last/no_april1st</name>
<type>bool</type>
<default>true</default>
<shortdescription>do not show april 1st game</shortdescription>
</dtconfig>
<!-- be sure to keep the code in sync when changing this enum, see common/darktable.c void dt_get_sysresource_level() -->
<dtconfig prefs="processing" section="cpugpu">
<name>resourcelevel</name>
Expand Down

0 comments on commit 69f45cc

Please sign in to comment.