normalize minizinc inteface onto the cp-sat name

google · Jun 3, 2024 · e427afb · e427afb
1 parent 274b809
commit e427afb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/cmake/flatzinc.cmake b/cmake/flatzinc.cmake
@@ -184,8 +184,8 @@ file(RELATIVE_PATH FZ_REL_INSTALL_BINARY
   ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/minizinc/solvers
   ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/fzn-cp-sat)
 configure_file(
-  ortools/flatzinc/cpsat.msc.in
-  ${PROJECT_BINARY_DIR}/cpsat.msc
+  ortools/flatzinc/cp-sat.msc.in
+  ${PROJECT_BINARY_DIR}/cp-sat.msc
   @ONLY)
 
 # Install rules
@@ -199,7 +199,7 @@ install(TARGETS flatzinc fzn #fzn-parser_test
   )
 
 install(DIRECTORY ortools/flatzinc/mznlib/
-  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/minizinc/cpsat
+  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/minizinc/cp-sat
   FILES_MATCHING PATTERN "*.mzn")
-install(FILES ${PROJECT_BINARY_DIR}/cpsat.msc
+install(FILES ${PROJECT_BINARY_DIR}/cp-sat.msc
   DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/minizinc/solvers)
diff --git a/ortools/flatzinc/cpsat.msc.in → ortools/flatzinc/cp-sat.msc.in b/ortools/flatzinc/cpsat.msc.in → ortools/flatzinc/cp-sat.msc.in
@@ -1,11 +1,11 @@
 {
-  "id": "com.google.ortools.sat",
+  "id": "cp-sat",
   "name": "OR Tools CP-SAT",
   "description": "Google's Operations Research CP-SAT-LP FlatZinc interface",
   "version": "@PROJECT_VERSION@",
-  "mznlib": "../cpsat",
+  "mznlib": "../cp-sat",
   "executable": "@FZ_REL_INSTALL_BINARY@",
-  "tags": ["cpsatlp", "cp", "lcg", "int"],
+  "tags": ["cp-sat", "cp", "lcg", "int"],
   "stdFlags": ["-a", "-f", "-p", "-r", "-s", "-v"],
   "extraFlags": [
     ["--params", "Provide parameters interpreted as a text SatParameters proto", "string", ""]