build: require uv for script generation across cmake and autoconf

Author: zayenz

CMakeLists.txt

@@ -116,7 +116,10 @@ if(GECODE_ENABLE_GCC_VISIBILITY)
 endif()
 
 if(GECODE_REGENERATE_VARIMP)
-  find_package(Perl REQUIRED)
+  find_program(GECODE_UV_EXECUTABLE NAMES uv)
+  if(NOT GECODE_UV_EXECUTABLE)
+    message(FATAL_ERROR "GECODE_REGENERATE_VARIMP=ON requires uv on PATH")
+  endif()
 endif()
 
 if(GECODE_ENABLE_MPFR)
@@ -414,26 +417,26 @@ if(GECODE_REGENERATE_VARIMP)
   add_custom_command(
     OUTPUT ${GECODE_VAR_TYPE_HPP}
     COMMAND ${CMAKE_COMMAND}
-      -DPERL_EXECUTABLE=${PERL_EXECUTABLE}
-      -DGENVARIMP=${CMAKE_CURRENT_SOURCE_DIR}/misc/genvarimp.perl
+      -DUV_EXECUTABLE=${GECODE_UV_EXECUTABLE}
+      -DGENVARIMP=${CMAKE_CURRENT_SOURCE_DIR}/misc/genvarimp.py
       -DMODE=-typehpp
       -DOUT_FILE=${GECODE_VAR_TYPE_HPP}
       -DVIS_FILES_SERIALIZED=${GECODE_VIS_FILES_SERIALIZED}
       -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/GenerateVarImp.cmake
-    DEPENDS ${GECODE_VIS_DEPENDS} ${CMAKE_CURRENT_SOURCE_DIR}/misc/genvarimp.perl ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/configure.ac
+    DEPENDS ${GECODE_VIS_DEPENDS} ${CMAKE_CURRENT_SOURCE_DIR}/misc/genvarimp.py ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/configure.ac
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     VERBATIM
   )
   add_custom_command(
     OUTPUT ${GECODE_VAR_IMP_HPP}
     COMMAND ${CMAKE_COMMAND}
-      -DPERL_EXECUTABLE=${PERL_EXECUTABLE}
-      -DGENVARIMP=${CMAKE_CURRENT_SOURCE_DIR}/misc/genvarimp.perl
+      -DUV_EXECUTABLE=${GECODE_UV_EXECUTABLE}
+      -DGENVARIMP=${CMAKE_CURRENT_SOURCE_DIR}/misc/genvarimp.py
       -DMODE=-header
       -DOUT_FILE=${GECODE_VAR_IMP_HPP}
       -DVIS_FILES_SERIALIZED=${GECODE_VIS_FILES_SERIALIZED}
       -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/GenerateVarImp.cmake
-    DEPENDS ${GECODE_VIS_DEPENDS} ${CMAKE_CURRENT_SOURCE_DIR}/misc/genvarimp.perl ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/configure.ac
+    DEPENDS ${GECODE_VIS_DEPENDS} ${CMAKE_CURRENT_SOURCE_DIR}/misc/genvarimp.py ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/configure.ac
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     VERBATIM
   )

Makefile.in

@@ -124,7 +124,7 @@ export SOSUFFIX         = @DLL_ARCH@@USERSUFFIX@@SOSUFFIX@
 #
 export RMF		= rm -rf
 export MV		= mv
-export UVRUN		= uv run --script
+export UVRUN		= @PROG_UV@ run --script
 export MANIFEST		= @MANIFEST@ -nologo
 export FIXMANIFEST	= $(UVRUN) $(top_srcdir)/misc/fixmanifest.py $(DLLSUFFIX)
 export RESCOMP		= @RESCOMP@ -n -i$(top_srcdir)

cmake/GenerateVarImp.cmake

@@ -1,13 +1,13 @@
-if(NOT DEFINED PERL_EXECUTABLE OR NOT DEFINED GENVARIMP OR NOT DEFINED MODE OR NOT DEFINED OUT_FILE)
-  message(FATAL_ERROR "GenerateVarImp.cmake requires PERL_EXECUTABLE, GENVARIMP, MODE, and OUT_FILE")
+if(NOT DEFINED UV_EXECUTABLE OR NOT DEFINED GENVARIMP OR NOT DEFINED MODE OR NOT DEFINED OUT_FILE)
+  message(FATAL_ERROR "GenerateVarImp.cmake requires UV_EXECUTABLE, GENVARIMP, MODE, and OUT_FILE")
 endif()
 
 if(DEFINED VIS_FILES_SERIALIZED)
   string(REPLACE "||" ";" VIS_FILES "${VIS_FILES_SERIALIZED}")
 endif()
 
 execute_process(
-  COMMAND "${PERL_EXECUTABLE}" "${GENVARIMP}" "${MODE}" ${VIS_FILES}
+  COMMAND "${UV_EXECUTABLE}" run --script "${GENVARIMP}" "${MODE}" ${VIS_FILES}
   OUTPUT_FILE "${OUT_FILE}"
   RESULT_VARIABLE genvarimp_status)
 

configure

@@ -754,7 +754,7 @@ RESCOMP
 HAVE_RC
 CXXCPP
 RUNENVIRONMENT
-PROG_PERL
+PROG_UV
 PROG_SED
 PROG_MAKE
 PROG_TAR
@@ -5157,16 +5157,16 @@ fi
  if test "${PROG_SED}x" = "x"; then
     as_fn_error $? "In order to compile Gecode, you need the sed tool." "$LINENO" 5
  fi
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
+# Extract the first word of "uv", so it can be a program name with args.
+set dummy uv; ac_word=$2
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_PROG_PERL+y}
+if test ${ac_cv_prog_PROG_UV+y}
 then :
   printf %s "(cached) " >&6
 else case e in #(
-  e) if test -n "$PROG_PERL"; then
-  ac_cv_prog_PROG_PERL="$PROG_PERL" # Let the user override the test.
+  e) if test -n "$PROG_UV"; then
+  ac_cv_prog_PROG_UV="$PROG_UV" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -5179,7 +5179,7 @@ do
   esac
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_PROG_PERL="ok"
+    ac_cv_prog_PROG_UV="uv"
     printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -5190,18 +5190,18 @@ IFS=$as_save_IFS
 fi ;;
 esac
 fi
-PROG_PERL=$ac_cv_prog_PROG_PERL
-if test -n "$PROG_PERL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PROG_PERL" >&5
-printf "%s\n" "$PROG_PERL" >&6; }
+PROG_UV=$ac_cv_prog_PROG_UV
+if test -n "$PROG_UV"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PROG_UV" >&5
+printf "%s\n" "$PROG_UV" >&6; }
 else
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 fi
 
 
- if test "${PROG_PERL}x" = "x"; then
-    as_fn_error $? "In order to compile Gecode, you need perl." "$LINENO" 5
+ if test "${PROG_UV}x" = "x"; then
+    as_fn_error $? "In order to compile Gecode, you need uv." "$LINENO" 5
  fi
 
 case $host_os in

configure.ac

@@ -86,7 +86,7 @@ AC_CHECK_PROG(PROG_SED, sed, [ok])
  if test "${PROG_SED}x" = "x"; then
     AC_MSG_ERROR([In order to compile Gecode, you need the sed tool.])
  fi
-AC_CHECK_PROG(PROG_UV, uv, [ok])
+AC_CHECK_PROG(PROG_UV, uv, [uv])
  if test "${PROG_UV}x" = "x"; then
     AC_MSG_ERROR([In order to compile Gecode, you need uv.])
  fi

configure.ac.in

@@ -86,7 +86,7 @@ AC_CHECK_PROG(PROG_SED, sed, [ok])
  if test "${PROG_SED}x" = "x"; then
     AC_MSG_ERROR([In order to compile Gecode, you need the sed tool.])
  fi
-AC_CHECK_PROG(PROG_UV, uv, [ok])
+AC_CHECK_PROG(PROG_UV, uv, [uv])
  if test "${PROG_UV}x" = "x"; then
     AC_MSG_ERROR([In order to compile Gecode, you need uv.])
  fi

misc/genrc.py

@@ -52,7 +52,7 @@ def main() -> int:
         " *  CAUTION:\n"
         " *    This file has been automatically generated. Do not edit,\n"
         " *    edit the following files instead:\n"
-        f" *     - {dir_}/misc/genrc.perl\n"
+        f" *     - {dir_}/misc/genrc.py\n"
     )
     for src in srcfiles:
         sys.stdout.write(f" *     - {src}\n")