From nobody Tue Feb 22 18:00:37 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A96D519C84F0; Tue, 22 Feb 2022 18:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K36Qs6M0kz3p9D; Tue, 22 Feb 2022 18:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645552837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hV0eMBmKh2bntkT1MNZd5+3y5Z8jLS/GoG/E4ZaQNLY=; b=FCnvQu7Sn/ew8F3lMiUbWw82KCLn0P6Al1V24DDI82BQ5ojSoFCdRzmCJGE3Xdt/667vuO c10eofATjPcMSqNa1/ycQYCz94T1/jZBfprK7ETxkyGwuZjDCRLGsMrz/5OlFdyAp+4uyl IdC87oFlp9X6Xd2pdZuD2A6xI/Sq4KCk17Iejdxc9H31Jo5rH6xF2SrZeMzK5Fhk6KP+EH RhCxpETAg+B2olSryQOxjoFJl20plZLTTyWI9Bf+UocZvKpg//WveYNf0Gpon2WGk+eZEC 3gYwXa1NLLxSZHmGpmm0ZF9UcbwcJ/4+wVv+G7khlisVQnDgvJEx2bHJ1n0g4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A6B4BD01; Tue, 22 Feb 2022 18:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21MI0bOL072255; Tue, 22 Feb 2022 18:00:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21MI0bdo072254; Tue, 22 Feb 2022 18:00:37 GMT (envelope-from git) Date: Tue, 22 Feb 2022 18:00:37 GMT Message-Id: <202202221800.21MI0bdo072254@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 17bae86fd487 - main - math/minizinc: Update 2.5.5 -> 2.6.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17bae86fd48743f3b1dbe70ba570b478462856ea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645552837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hV0eMBmKh2bntkT1MNZd5+3y5Z8jLS/GoG/E4ZaQNLY=; b=ZHUfWiV+gSxbn1UWmC8rVIQWZ3yxFrt3hmbQUGn8878Af9Z9T8N2/g7VOAGYKpaIKHHi5C vAppvmqtteQlElDYDzhzs5/uyVU2SxvXi8MDKqoX0SvWUeiKWo4qN+w1t8uoVqLTnPVBdo UuhT7oM6q2+6tqi7f9NJ0brDsCaVmCKnX4pBcpL7Jp7xb0YmsoMYvBpvQepekAvTsp+kfY sYRXkbb/8U61VkeEwDfdw+IbFNMa8N4LtsgMGCdt+iBse3wzagj99382a9rWF1QnNvlaLV p6UlskRxqHsIpgYmEleaAhwlkvQAOG0qArEbCqJETR/VAg8BuphA0GZhPIxq1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645552837; a=rsa-sha256; cv=none; b=P8B4tMzfo6JZTJm9gUwPJvpVPaW7CVTmLNv+DcalYZDsr2MnjFc6eYtbVI356qujHZuPv+ PhDkCkjsTzX3v0jL2SfyqqEGCfEf44JRfQReJq1IE/JO7zwhzALKUZDpLypshwCVx2E8jA fHxubPAMC174w0C9rS/hzmLA3IUyHEQH6AqJLEFp2aRAOsgMMtVpgqIvOrfcw0RcBC59jt LRWQ1URW1ij7fmW0+awdYTKFWogkHYrsjj+p/Imx5vdg4faaeae87p6bCW7ERRem59VQjr RhiOWx+jH46z6UOhvj0IQr9WNk4MiAHREyhVdoyKW8o9GD6A3gj0HJWXD7NAKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=17bae86fd48743f3b1dbe70ba570b478462856ea commit 17bae86fd48743f3b1dbe70ba570b478462856ea Author: Yuri Victorovich AuthorDate: 2022-02-22 17:48:39 +0000 Commit: Yuri Victorovich CommitDate: 2022-02-22 18:00:28 +0000 math/minizinc: Update 2.5.5 -> 2.6.0 Reported by: portscout --- math/minizinc/Makefile | 5 +- math/minizinc/distinfo | 6 +- math/minizinc/files/patch-lib_solver__config.cpp | 10 ++- math/minizinc/pkg-plist | 110 ++++++++++++++++++----- 4 files changed, 103 insertions(+), 28 deletions(-) diff --git a/math/minizinc/Makefile b/math/minizinc/Makefile index df6501fa5527..d89a55ff7082 100644 --- a/math/minizinc/Makefile +++ b/math/minizinc/Makefile @@ -1,6 +1,5 @@ PORTNAME= minizinc -DISTVERSION= 2.5.5 -PORTREVISION= 3 +DISTVERSION= 2.6.0 CATEGORIES= math lang MAINTAINER= yuri@FreeBSD.org @@ -13,7 +12,9 @@ CONFLICTS_BUILD= CoinMP LIB_DEPENDS= libCbc.so:math/cbc \ libCgl.so:math/cgl \ + libCoinUtils.so:math/coinutils \ libgecodekernel.so:math/gecode \ + libOsi.so:math/osi \ libOsiClp.so:math/clp USES= bison cmake compiler:c++11-lang diff --git a/math/minizinc/distinfo b/math/minizinc/distinfo index cb967600c214..c7fd684cc52c 100644 --- a/math/minizinc/distinfo +++ b/math/minizinc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1616977123 -SHA256 (MiniZinc-libminizinc-2.5.5_GH0.tar.gz) = c6c81fa8bdc2d7f8c8d851e5a4b936109f5d996abd8c6f809539f753581c6288 -SIZE (MiniZinc-libminizinc-2.5.5_GH0.tar.gz) = 12593468 +TIMESTAMP = 1645548102 +SHA256 (MiniZinc-libminizinc-2.6.0_GH0.tar.gz) = 35559e75db3b9b5cd939879935ea5b4f343104040c9ca40aafef06b44ddc6fd7 +SIZE (MiniZinc-libminizinc-2.6.0_GH0.tar.gz) = 12961316 diff --git a/math/minizinc/files/patch-lib_solver__config.cpp b/math/minizinc/files/patch-lib_solver__config.cpp index 6cc277581d7f..b2a47b1fc17b 100644 --- a/math/minizinc/files/patch-lib_solver__config.cpp +++ b/math/minizinc/files/patch-lib_solver__config.cpp @@ -1,8 +1,8 @@ - Remove a non-existent directory from search. ---- lib/solver_config.cpp.orig 2021-05-02 20:37:56 UTC +--- lib/solver_config.cpp.orig 2022-02-17 23:53:35 UTC +++ lib/solver_config.cpp -@@ -662,9 +662,11 @@ SolverConfigs::SolverConfigs(std::ostream& log) { +@@ -637,6 +637,7 @@ SolverConfigs::SolverConfigs(std::ostream& log) { FileUtils::directory_exists("/usr/local/share")) { _solverPath.emplace_back("/usr/local/share/minizinc/solvers"); } @@ -10,7 +10,11 @@ if (_mznlibDir != "/usr/share/minizinc" && FileUtils::directory_exists("/usr/share")) { _solverPath.emplace_back("/usr/share/minizinc/solvers"); } -+# endif +@@ -648,6 +649,7 @@ SolverConfigs::SolverConfigs(std::ostream& log) { + FileUtils::directory_exists("/opt/homebrew/share")) { + _solverPath.emplace_back("/opt/homebrew/share/minizinc/solvers"); + } ++#endif #endif } diff --git a/math/minizinc/pkg-plist b/math/minizinc/pkg-plist index 2fdea27855ea..ef43affb613a 100644 --- a/math/minizinc/pkg-plist +++ b/math/minizinc/pkg-plist @@ -5,7 +5,11 @@ include/minizinc/_thirdparty/b64/cdecode.h include/minizinc/_thirdparty/b64/cencode.h include/minizinc/_thirdparty/b64/decode.h include/minizinc/_thirdparty/b64/encode.h +include/minizinc/_thirdparty/cplex_interface.h +include/minizinc/_thirdparty/gurobi_interface.h include/minizinc/_thirdparty/miniz.h +include/minizinc/_thirdparty/scip_interface.h +include/minizinc/_thirdparty/xpress_interface.h include/minizinc/algorithms/min_cut.h include/minizinc/ast.hh include/minizinc/ast.hpp @@ -79,6 +83,7 @@ include/minizinc/solvers/nl/nl_file.hh include/minizinc/solvers/nl/nl_solreader.hh include/minizinc/solvers/nl/nl_solverfactory.hh include/minizinc/solvers/nl/nl_solverinstance.hh +include/minizinc/stackdump.hh include/minizinc/statistics.hh include/minizinc/support/regex.hh include/minizinc/support/regex_parser.tab.hh @@ -88,6 +93,7 @@ include/minizinc/typecheck.hh include/minizinc/utils.hh include/minizinc/utils_savestream.hh include/minizinc/values.hh +include/minizinc/warning.hh lib/cmake/libminizinc/FindGecode.cmake lib/cmake/libminizinc/FindMPFR.cmake lib/cmake/libminizinc/FindOsiCBC.cmake @@ -97,11 +103,6 @@ lib/cmake/libminizinc/libminizincTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/libminizinc/libminizincTargets.cmake lib/libmzn.so %%DATADIR%%/Preferences.json -%%DATADIR%%/g12_fd/all_different_int.mzn -%%DATADIR%%/g12_fd/cumulative.mzn -%%DATADIR%%/g12_fd/global_cardinality_low_up.mzn -%%DATADIR%%/g12_lazyfd/all_different_int.mzn -%%DATADIR%%/g12_lazyfd/redefinitions.mzn %%DATADIR%%/geas/fzn_all_different_int.mzn %%DATADIR%%/geas/fzn_alldifferent_except_0.mzn %%DATADIR%%/geas/fzn_cumulative.mzn @@ -204,27 +205,19 @@ lib/libmzn.so %%DATADIR%%/linear/redefs_lin_imp.mzn %%DATADIR%%/linear/redefs_lin_reifs.mzn %%DATADIR%%/linear/subcircuit_wDummy.mzn -%%DATADIR%%/linear_old/all_different_int.mzn -%%DATADIR%%/linear_old/domain_encodings.mzn -%%DATADIR%%/linear_old/inverse.mzn -%%DATADIR%%/linear_old/linear/all_different_int.mzn -%%DATADIR%%/linear_old/linear/domain_encodings.mzn -%%DATADIR%%/linear_old/linear/inverse.mzn -%%DATADIR%%/linear_old/linear/redefinitions-2.0.2.mzn -%%DATADIR%%/linear_old/linear/redefinitions-2.0.mzn -%%DATADIR%%/linear_old/linear/redefinitions.mzn -%%DATADIR%%/linear_old/linear/table_int.mzn -%%DATADIR%%/linear_old/redefinitions-2.0.2.mzn -%%DATADIR%%/linear_old/redefinitions-2.0.mzn -%%DATADIR%%/linear_old/redefinitions.mzn -%%DATADIR%%/linear_old/table_int.mzn %%DATADIR%%/std/all_different.mzn +%%DATADIR%%/std/all_different_except.mzn +%%DATADIR%%/std/all_different_except_0.mzn %%DATADIR%%/std/all_different_int.mzn +%%DATADIR%%/std/all_different_int.mzn.deprecated.mzn %%DATADIR%%/std/all_different_set.mzn +%%DATADIR%%/std/all_different_set.mzn.deprecated.mzn %%DATADIR%%/std/all_disjoint.mzn %%DATADIR%%/std/all_equal.mzn %%DATADIR%%/std/all_equal_int.mzn +%%DATADIR%%/std/all_equal_int.mzn.deprecated.mzn %%DATADIR%%/std/all_equal_set.mzn +%%DATADIR%%/std/all_equal_set.mzn.deprecated.mzn %%DATADIR%%/std/alldifferent.mzn %%DATADIR%%/std/alldifferent_except.mzn %%DATADIR%%/std/alldifferent_except_0.mzn @@ -234,15 +227,23 @@ lib/libmzn.so %%DATADIR%%/std/analyse_all_different.mzn %%DATADIR%%/std/arg_max.mzn %%DATADIR%%/std/arg_max_bool.mzn +%%DATADIR%%/std/arg_max_bool.mzn.deprecated.mzn %%DATADIR%%/std/arg_max_float.mzn +%%DATADIR%%/std/arg_max_float.mzn.deprecated.mzn %%DATADIR%%/std/arg_max_int.mzn +%%DATADIR%%/std/arg_max_int.mzn.deprecated.mzn %%DATADIR%%/std/arg_min.mzn %%DATADIR%%/std/arg_min_bool.mzn +%%DATADIR%%/std/arg_min_bool.mzn.deprecated.mzn %%DATADIR%%/std/arg_min_float.mzn +%%DATADIR%%/std/arg_min_float.mzn.deprecated.mzn %%DATADIR%%/std/arg_min_int.mzn +%%DATADIR%%/std/arg_min_int.mzn.deprecated.mzn %%DATADIR%%/std/arg_sort.mzn %%DATADIR%%/std/arg_sort_float.mzn +%%DATADIR%%/std/arg_sort_float.mzn.deprecated.mzn %%DATADIR%%/std/arg_sort_int.mzn +%%DATADIR%%/std/arg_sort_int.mzn.deprecated.mzn %%DATADIR%%/std/at_least.mzn %%DATADIR%%/std/at_least.mzn.deprecated.mzn %%DATADIR%%/std/at_least_int.mzn @@ -261,7 +262,7 @@ lib/libmzn.so %%DATADIR%%/std/bin_packing_load_fn.mzn %%DATADIR%%/std/bounded_path.mzn %%DATADIR%%/std/circuit.mzn -%%DATADIR%%/std/comparison_rel_array.mzn +%%DATADIR%%/std/circuit_opt.mzn %%DATADIR%%/std/connected.mzn %%DATADIR%%/std/cost_mdd.mzn %%DATADIR%%/std/cost_regular.mzn @@ -278,9 +279,13 @@ lib/libmzn.so %%DATADIR%%/std/dag.mzn %%DATADIR%%/std/decreasing.mzn %%DATADIR%%/std/decreasing_bool.mzn +%%DATADIR%%/std/decreasing_bool.mzn.deprecated.mzn %%DATADIR%%/std/decreasing_float.mzn +%%DATADIR%%/std/decreasing_float.mzn.deprecated.mzn %%DATADIR%%/std/decreasing_int.mzn +%%DATADIR%%/std/decreasing_int.mzn.deprecated.mzn %%DATADIR%%/std/decreasing_set.mzn +%%DATADIR%%/std/decreasing_set.mzn.deprecated.mzn %%DATADIR%%/std/diffn.mzn %%DATADIR%%/std/diffn_k.mzn %%DATADIR%%/std/diffn_nonstrict.mzn @@ -294,9 +299,13 @@ lib/libmzn.so %%DATADIR%%/std/distribute_fn.mzn %%DATADIR%%/std/element.mzn %%DATADIR%%/std/element_bool.mzn +%%DATADIR%%/std/element_bool.mzn.deprecated.mzn %%DATADIR%%/std/element_float.mzn +%%DATADIR%%/std/element_float.mzn.deprecated.mzn %%DATADIR%%/std/element_int.mzn +%%DATADIR%%/std/element_int.mzn.deprecated.mzn %%DATADIR%%/std/element_set.mzn +%%DATADIR%%/std/element_set.mzn.deprecated.mzn %%DATADIR%%/std/exactly.mzn %%DATADIR%%/std/exactly.mzn.deprecated.mzn %%DATADIR%%/std/exactly_int.mzn @@ -304,6 +313,7 @@ lib/libmzn.so %%DATADIR%%/std/experimental.mzn %%DATADIR%%/std/flatzinc_builtins.mzn %%DATADIR%%/std/fzn_all_different_int.mzn +%%DATADIR%%/std/fzn_all_different_int_opt.mzn %%DATADIR%%/std/fzn_all_different_int_reif.mzn %%DATADIR%%/std/fzn_all_different_set.mzn %%DATADIR%%/std/fzn_all_different_set_reif.mzn @@ -322,15 +332,25 @@ lib/libmzn.so %%DATADIR%%/std/fzn_among.mzn %%DATADIR%%/std/fzn_among_reif.mzn %%DATADIR%%/std/fzn_arg_max_bool.mzn +%%DATADIR%%/std/fzn_arg_max_bool_opt.mzn %%DATADIR%%/std/fzn_arg_max_float.mzn +%%DATADIR%%/std/fzn_arg_max_float_opt.mzn %%DATADIR%%/std/fzn_arg_max_int.mzn +%%DATADIR%%/std/fzn_arg_max_int_opt.mzn %%DATADIR%%/std/fzn_arg_min_bool.mzn +%%DATADIR%%/std/fzn_arg_min_bool_opt.mzn %%DATADIR%%/std/fzn_arg_min_float.mzn +%%DATADIR%%/std/fzn_arg_min_float_opt.mzn %%DATADIR%%/std/fzn_arg_min_int.mzn +%%DATADIR%%/std/fzn_arg_min_int_opt.mzn %%DATADIR%%/std/fzn_arg_sort_float.mzn %%DATADIR%%/std/fzn_arg_sort_float_reif.mzn %%DATADIR%%/std/fzn_arg_sort_int.mzn %%DATADIR%%/std/fzn_arg_sort_int_reif.mzn +%%DATADIR%%/std/fzn_array_int_union.mzn +%%DATADIR%%/std/fzn_array_opt_int_union.mzn +%%DATADIR%%/std/fzn_array_set_intersect.mzn +%%DATADIR%%/std/fzn_array_set_union.mzn %%DATADIR%%/std/fzn_at_least_int.mzn %%DATADIR%%/std/fzn_at_least_int_reif.mzn %%DATADIR%%/std/fzn_at_least_set.mzn @@ -356,6 +376,8 @@ lib/libmzn.so %%DATADIR%%/std/fzn_bounded_path_int.mzn %%DATADIR%%/std/fzn_bounded_path_int_reif.mzn %%DATADIR%%/std/fzn_circuit.mzn +%%DATADIR%%/std/fzn_circuit_opt.mzn +%%DATADIR%%/std/fzn_circuit_opt_reif.mzn %%DATADIR%%/std/fzn_circuit_reif.mzn %%DATADIR%%/std/fzn_connected.mzn %%DATADIR%%/std/fzn_connected_reif.mzn @@ -389,6 +411,7 @@ lib/libmzn.so %%DATADIR%%/std/fzn_count_neq_reif.mzn %%DATADIR%%/std/fzn_cumulative.mzn %%DATADIR%%/std/fzn_cumulative_opt.mzn +%%DATADIR%%/std/fzn_cumulative_opt_decomp.mzn %%DATADIR%%/std/fzn_cumulative_opt_reif.mzn %%DATADIR%%/std/fzn_cumulative_reif.mzn %%DATADIR%%/std/fzn_dag.mzn @@ -419,6 +442,7 @@ lib/libmzn.so %%DATADIR%%/std/fzn_disjunctive_reif.mzn %%DATADIR%%/std/fzn_disjunctive_strict.mzn %%DATADIR%%/std/fzn_disjunctive_strict_opt.mzn +%%DATADIR%%/std/fzn_disjunctive_strict_opt_decomp.mzn %%DATADIR%%/std/fzn_disjunctive_strict_opt_reif.mzn %%DATADIR%%/std/fzn_disjunctive_strict_reif.mzn %%DATADIR%%/std/fzn_distribute.mzn @@ -453,11 +477,15 @@ lib/libmzn.so %%DATADIR%%/std/fzn_geost_smallest_bb_reif.mzn %%DATADIR%%/std/fzn_global_cardinality.mzn %%DATADIR%%/std/fzn_global_cardinality_closed.mzn +%%DATADIR%%/std/fzn_global_cardinality_closed_opt.mzn %%DATADIR%%/std/fzn_global_cardinality_closed_reif.mzn %%DATADIR%%/std/fzn_global_cardinality_low_up.mzn %%DATADIR%%/std/fzn_global_cardinality_low_up_closed.mzn +%%DATADIR%%/std/fzn_global_cardinality_low_up_closed_opt.mzn %%DATADIR%%/std/fzn_global_cardinality_low_up_closed_reif.mzn +%%DATADIR%%/std/fzn_global_cardinality_low_up_opt.mzn %%DATADIR%%/std/fzn_global_cardinality_low_up_reif.mzn +%%DATADIR%%/std/fzn_global_cardinality_opt.mzn %%DATADIR%%/std/fzn_global_cardinality_reif.mzn %%DATADIR%%/std/fzn_if_then_else_bool.mzn %%DATADIR%%/std/fzn_if_then_else_float.mzn @@ -475,6 +503,7 @@ lib/libmzn.so %%DATADIR%%/std/fzn_if_then_else_var_opt_int.mzn %%DATADIR%%/std/fzn_if_then_else_var_set.mzn %%DATADIR%%/std/fzn_increasing_bool.mzn +%%DATADIR%%/std/fzn_increasing_bool_opt.mzn %%DATADIR%%/std/fzn_increasing_bool_reif.mzn %%DATADIR%%/std/fzn_increasing_float.mzn %%DATADIR%%/std/fzn_increasing_float_reif.mzn @@ -487,6 +516,7 @@ lib/libmzn.so %%DATADIR%%/std/fzn_inverse.mzn %%DATADIR%%/std/fzn_inverse_in_range.mzn %%DATADIR%%/std/fzn_inverse_in_range_reif.mzn +%%DATADIR%%/std/fzn_inverse_opt.mzn %%DATADIR%%/std/fzn_inverse_reif.mzn %%DATADIR%%/std/fzn_inverse_set.mzn %%DATADIR%%/std/fzn_inverse_set_reif.mzn @@ -566,6 +596,7 @@ lib/libmzn.so %%DATADIR%%/std/fzn_regular_regexp.mzn %%DATADIR%%/std/fzn_regular_reif.mzn %%DATADIR%%/std/fzn_regular_set.mzn +%%DATADIR%%/std/fzn_regular_set.mzn.deprecated.mzn %%DATADIR%%/std/fzn_regular_set_reif.mzn %%DATADIR%%/std/fzn_roots.mzn %%DATADIR%%/std/fzn_roots_reif.mzn @@ -618,6 +649,7 @@ lib/libmzn.so %%DATADIR%%/std/fzn_tree_int.mzn %%DATADIR%%/std/fzn_tree_int_reif.mzn %%DATADIR%%/std/fzn_value_precede_chain_int.mzn +%%DATADIR%%/std/fzn_value_precede_chain_int_opt.mzn %%DATADIR%%/std/fzn_value_precede_chain_int_reif.mzn %%DATADIR%%/std/fzn_value_precede_chain_set.mzn %%DATADIR%%/std/fzn_value_precede_chain_set_reif.mzn @@ -639,14 +671,26 @@ lib/libmzn.so %%DATADIR%%/std/global_cardinality_closed.mzn %%DATADIR%%/std/global_cardinality_closed_fn.mzn %%DATADIR%%/std/global_cardinality_fn.mzn +%%DATADIR%%/std/global_cardinality_low_up.deprecated.mzn %%DATADIR%%/std/global_cardinality_low_up.mzn +%%DATADIR%%/std/global_cardinality_low_up_closed.deprecated.mzn %%DATADIR%%/std/global_cardinality_low_up_closed.mzn %%DATADIR%%/std/globals.mzn +%%DATADIR%%/std/ide/vis.mzn +%%DATADIR%%/std/ide/vis_bar.html +%%DATADIR%%/std/ide/vis_gantt.html +%%DATADIR%%/std/ide/vis_geost.html +%%DATADIR%%/std/ide/vis_network.html +%%DATADIR%%/std/ide/vis_scatter.html %%DATADIR%%/std/increasing.mzn %%DATADIR%%/std/increasing_bool.mzn +%%DATADIR%%/std/increasing_bool.mzn.deprecated.mzn %%DATADIR%%/std/increasing_float.mzn +%%DATADIR%%/std/increasing_float.mzn.deprecated.mzn %%DATADIR%%/std/increasing_int.mzn +%%DATADIR%%/std/increasing_int.mzn.deprecated.mzn %%DATADIR%%/std/increasing_set.mzn +%%DATADIR%%/std/increasing_set.mzn.deprecated.mzn %%DATADIR%%/std/int_set_channel.mzn %%DATADIR%%/std/inverse.mzn %%DATADIR%%/std/inverse_fn.mzn @@ -660,38 +704,57 @@ lib/libmzn.so %%DATADIR%%/std/lex_chain_greatereq_orbitope.mzn %%DATADIR%%/std/lex_chain_less.mzn %%DATADIR%%/std/lex_chain_less_bool.mzn +%%DATADIR%%/std/lex_chain_less_bool.mzn.deprecated.mzn %%DATADIR%%/std/lex_chain_less_int.mzn +%%DATADIR%%/std/lex_chain_less_int.mzn.deprecated.mzn %%DATADIR%%/std/lex_chain_lesseq.mzn %%DATADIR%%/std/lex_chain_lesseq_bool.mzn +%%DATADIR%%/std/lex_chain_lesseq_bool.mzn.deprecated.mzn %%DATADIR%%/std/lex_chain_lesseq_int.mzn +%%DATADIR%%/std/lex_chain_lesseq_int.mzn.deprecated.mzn %%DATADIR%%/std/lex_chain_lesseq_orbitope.mzn %%DATADIR%%/std/lex_greater.mzn %%DATADIR%%/std/lex_greatereq.mzn %%DATADIR%%/std/lex_less.mzn %%DATADIR%%/std/lex_less_bool.mzn +%%DATADIR%%/std/lex_less_bool.mzn.deprecated.mzn %%DATADIR%%/std/lex_less_float.mzn +%%DATADIR%%/std/lex_less_float.mzn.deprecated.mzn %%DATADIR%%/std/lex_less_int.mzn +%%DATADIR%%/std/lex_less_int.mzn.deprecated.mzn %%DATADIR%%/std/lex_less_set.mzn +%%DATADIR%%/std/lex_less_set.mzn.deprecated.mzn %%DATADIR%%/std/lex_lesseq.mzn %%DATADIR%%/std/lex_lesseq_bool.mzn +%%DATADIR%%/std/lex_lesseq_bool.mzn.deprecated.mzn %%DATADIR%%/std/lex_lesseq_float.mzn +%%DATADIR%%/std/lex_lesseq_float.mzn.deprecated.mzn %%DATADIR%%/std/lex_lesseq_int.mzn +%%DATADIR%%/std/lex_lesseq_int.mzn.deprecated.mzn %%DATADIR%%/std/lex_lesseq_set.mzn +%%DATADIR%%/std/lex_lesseq_set.mzn.deprecated.mzn %%DATADIR%%/std/link_set_to_booleans.mzn %%DATADIR%%/std/maximum.mzn %%DATADIR%%/std/mdd.mzn %%DATADIR%%/std/mdd_nondet.mzn %%DATADIR%%/std/member.mzn %%DATADIR%%/std/member_bool.mzn +%%DATADIR%%/std/member_bool.mzn.deprecated.mzn %%DATADIR%%/std/member_float.mzn +%%DATADIR%%/std/member_float.mzn.deprecated.mzn %%DATADIR%%/std/member_int.mzn +%%DATADIR%%/std/member_int.mzn.deprecated.mzn %%DATADIR%%/std/member_set.mzn +%%DATADIR%%/std/member_set.mzn.deprecated.mzn %%DATADIR%%/std/minimum.mzn %%DATADIR%%/std/network_flow.mzn %%DATADIR%%/std/neural_net.mzn %%DATADIR%%/std/nosets.mzn %%DATADIR%%/std/nvalue.mzn %%DATADIR%%/std/nvalue_fn.mzn +%%DATADIR%%/std/output.mzn +%%DATADIR%%/std/output/array2d_bool.mzn +%%DATADIR%%/std/output/gantt.mzn %%DATADIR%%/std/partition_set.mzn %%DATADIR%%/std/path.mzn %%DATADIR%%/std/piecewise_linear.mzn @@ -706,6 +769,7 @@ lib/libmzn.so %%DATADIR%%/std/redefinitions-2.2.1.mzn %%DATADIR%%/std/redefinitions-2.3.3.mzn %%DATADIR%%/std/redefinitions-2.5.2.mzn +%%DATADIR%%/std/redefinitions-2.5.6.mzn %%DATADIR%%/std/redefinitions.mzn %%DATADIR%%/std/regular.mzn %%DATADIR%%/std/regular_nfa.mzn @@ -749,14 +813,20 @@ lib/libmzn.so %%DATADIR%%/std/symmetric_all_different.mzn %%DATADIR%%/std/table.mzn %%DATADIR%%/std/table_bool.mzn +%%DATADIR%%/std/table_bool.mzn.deprecated.mzn %%DATADIR%%/std/table_int.mzn +%%DATADIR%%/std/table_int.mzn.deprecated.mzn %%DATADIR%%/std/tree.mzn %%DATADIR%%/std/value_precede.mzn %%DATADIR%%/std/value_precede_chain.mzn %%DATADIR%%/std/value_precede_chain_int.mzn +%%DATADIR%%/std/value_precede_chain_int.mzn.deprecated.mzn %%DATADIR%%/std/value_precede_chain_set.mzn +%%DATADIR%%/std/value_precede_chain_set.mzn.deprecated.mzn %%DATADIR%%/std/value_precede_int.mzn +%%DATADIR%%/std/value_precede_int.mzn.deprecated.mzn %%DATADIR%%/std/value_precede_set.mzn +%%DATADIR%%/std/value_precede_set.mzn.deprecated.mzn %%DATADIR%%/std/weighted_spanning_tree.mzn %%DATADIR%%/std/write.mzn %%DATADIR%%/std/writes.mzn