Skip to content

Commit c423c73

Browse files
zayenzzayenz
committed
Fixes for python
1 parent b8bebcb commit c423c73

8 files changed

Lines changed: 121 additions & 125 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v4
1818

19+
- name: Install uv
20+
uses: astral-sh/setup-uv@v6
21+
1922
- name: Install Ubuntu build deps
2023
if: runner.os == 'Linux'
2124
shell: bash

‎Makefile.dep‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33944,6 +33944,101 @@ test/flatzinc/steiner_triples$(OBJSUFFIX) test/flatzinc/steiner_triples$(SBJSUFF
3394433944
./gecode/support/static-stack.hpp ./gecode/support/thread.hpp ./gecode/support/thread/thread.hpp \
3394533945
./gecode/support/timer.hpp ./test/flatzinc.hh ./test/test.hh \
3394633946
./test/test.hpp
33947+
test/flatzinc/subtyping$(OBJSUFFIX) test/flatzinc/subtyping$(SBJSUFFIX): \
33948+
./gecode/driver.hh ./gecode/driver/options.hpp ./gecode/driver/script.hpp \
33949+
./gecode/flatzinc.hh ./gecode/flatzinc/ast.hh ./gecode/flatzinc/conexpr.hh \
33950+
./gecode/flatzinc/option.hh ./gecode/flatzinc/varspec.hh ./gecode/float.hh \
33951+
./gecode/float/array-traits.hpp ./gecode/float/array.hpp ./gecode/float/branch.hpp \
33952+
./gecode/float/branch/action.hpp ./gecode/float/branch/afc.hpp ./gecode/float/branch/assign.hpp \
33953+
./gecode/float/branch/chb.hpp ./gecode/float/branch/traits.hpp ./gecode/float/branch/val.hpp \
33954+
./gecode/float/branch/var.hpp ./gecode/float/channel.hpp ./gecode/float/exception.hpp \
33955+
./gecode/float/limits.hpp ./gecode/float/nextafter.hpp ./gecode/float/num.hpp \
33956+
./gecode/float/rounding.hpp ./gecode/float/trace.hpp ./gecode/float/trace/delta.hpp \
33957+
./gecode/float/trace/trace-view.hpp ./gecode/float/trace/traits.hpp ./gecode/float/val.hpp \
33958+
./gecode/float/var-imp.hpp ./gecode/float/var-imp/delta.hpp ./gecode/float/var-imp/float.hpp \
33959+
./gecode/float/var/float.hpp ./gecode/float/var/print.hpp ./gecode/float/view.hpp \
33960+
./gecode/float/view/float.hpp ./gecode/float/view/minus.hpp ./gecode/float/view/offset.hpp \
33961+
./gecode/float/view/print.hpp ./gecode/float/view/rel-test.hpp ./gecode/float/view/scale.hpp \
33962+
./gecode/gist.hh ./gecode/gist/gist.hpp ./gecode/int.hh \
33963+
./gecode/int/array-traits.hpp ./gecode/int/array.hpp ./gecode/int/branch.hpp \
33964+
./gecode/int/branch/action.hpp ./gecode/int/branch/afc.hpp ./gecode/int/branch/assign.hpp \
33965+
./gecode/int/branch/chb.hpp ./gecode/int/branch/traits.hpp ./gecode/int/branch/val.hpp \
33966+
./gecode/int/branch/var.hpp ./gecode/int/channel.hpp ./gecode/int/div.hh \
33967+
./gecode/int/div.hpp ./gecode/int/exception.hpp ./gecode/int/extensional.hpp \
33968+
./gecode/int/extensional/dfa.hpp ./gecode/int/extensional/tuple-set.hpp ./gecode/int/int-set-1.hpp \
33969+
./gecode/int/int-set-2.hpp ./gecode/int/ipl.hpp ./gecode/int/irt.hpp \
33970+
./gecode/int/limits.hpp ./gecode/int/propagator.hpp ./gecode/int/reify.hpp \
33971+
./gecode/int/trace.hpp ./gecode/int/trace/bool-delta.hpp ./gecode/int/trace/bool-trace-view.hpp \
33972+
./gecode/int/trace/int-delta.hpp ./gecode/int/trace/int-trace-view.hpp ./gecode/int/trace/traits.hpp \
33973+
./gecode/int/var-imp.hpp ./gecode/int/var-imp/bool.hpp ./gecode/int/var-imp/delta.hpp \
33974+
./gecode/int/var-imp/int.hpp ./gecode/int/var/bool.hpp ./gecode/int/var/int.hpp \
33975+
./gecode/int/var/print.hpp ./gecode/int/view.hpp ./gecode/int/view/bool-test.hpp \
33976+
./gecode/int/view/bool.hpp ./gecode/int/view/cached.hpp ./gecode/int/view/constint.hpp \
33977+
./gecode/int/view/int.hpp ./gecode/int/view/iter.hpp ./gecode/int/view/minus.hpp \
33978+
./gecode/int/view/neg-bool.hpp ./gecode/int/view/offset.hpp ./gecode/int/view/print.hpp \
33979+
./gecode/int/view/rel-test.hpp ./gecode/int/view/scale.hpp ./gecode/int/view/zero.hpp \
33980+
./gecode/iter.hh ./gecode/iter/ranges-add.hpp ./gecode/iter/ranges-append.hpp \
33981+
./gecode/iter/ranges-array.hpp ./gecode/iter/ranges-cache.hpp ./gecode/iter/ranges-compl.hpp \
33982+
./gecode/iter/ranges-diff.hpp ./gecode/iter/ranges-empty.hpp ./gecode/iter/ranges-inter.hpp \
33983+
./gecode/iter/ranges-list.hpp ./gecode/iter/ranges-map.hpp ./gecode/iter/ranges-minmax.hpp \
33984+
./gecode/iter/ranges-minus.hpp ./gecode/iter/ranges-negative.hpp ./gecode/iter/ranges-offset.hpp \
33985+
./gecode/iter/ranges-operations.hpp ./gecode/iter/ranges-positive.hpp ./gecode/iter/ranges-rangelist.hpp \
33986+
./gecode/iter/ranges-scale.hpp ./gecode/iter/ranges-singleton-append.hpp ./gecode/iter/ranges-singleton.hpp \
33987+
./gecode/iter/ranges-size.hpp ./gecode/iter/ranges-union.hpp ./gecode/iter/ranges-values.hpp \
33988+
./gecode/iter/values-array.hpp ./gecode/iter/values-bitset.hpp ./gecode/iter/values-bitsetoffset.hpp \
33989+
./gecode/iter/values-inter.hpp ./gecode/iter/values-list.hpp ./gecode/iter/values-map.hpp \
33990+
./gecode/iter/values-minus.hpp ./gecode/iter/values-negative.hpp ./gecode/iter/values-offset.hpp \
33991+
./gecode/iter/values-positive.hpp ./gecode/iter/values-ranges.hpp ./gecode/iter/values-singleton.hpp \
33992+
./gecode/iter/values-union.hpp ./gecode/iter/values-unique.hpp ./gecode/kernel.hh \
33993+
./gecode/kernel/archive.hpp ./gecode/kernel/branch/action.hpp ./gecode/kernel/branch/afc.hpp \
33994+
./gecode/kernel/branch/chb.hpp ./gecode/kernel/branch/filter.hpp ./gecode/kernel/branch/merit.hpp \
33995+
./gecode/kernel/branch/print.hpp ./gecode/kernel/branch/tiebreak.hpp ./gecode/kernel/branch/traits.hpp \
33996+
./gecode/kernel/branch/val-commit.hpp ./gecode/kernel/branch/val-sel-commit.hpp ./gecode/kernel/branch/val-sel.hpp \
33997+
./gecode/kernel/branch/val.hpp ./gecode/kernel/branch/var.hpp ./gecode/kernel/branch/view-sel.hpp \
33998+
./gecode/kernel/branch/view-val.hpp ./gecode/kernel/branch/view.hpp ./gecode/kernel/core.hpp \
33999+
./gecode/kernel/data/array.hpp ./gecode/kernel/data/rnd.hpp ./gecode/kernel/data/shared-array.hpp \
34000+
./gecode/kernel/data/shared-data.hpp ./gecode/kernel/exception.hpp ./gecode/kernel/gpi.hpp \
34001+
./gecode/kernel/macros.hpp ./gecode/kernel/memory/allocators.hpp ./gecode/kernel/memory/config.hpp \
34002+
./gecode/kernel/memory/manager.hpp ./gecode/kernel/memory/region.hpp ./gecode/kernel/modevent.hpp \
34003+
./gecode/kernel/propagator/advisor.hpp ./gecode/kernel/propagator/pattern.hpp ./gecode/kernel/propagator/subscribed.hpp \
34004+
./gecode/kernel/propagator/wait.hpp ./gecode/kernel/range-list.hpp ./gecode/kernel/shared-object.hpp \
34005+
./gecode/kernel/shared-space-data.hpp ./gecode/kernel/trace/filter.hpp ./gecode/kernel/trace/general.hpp \
34006+
./gecode/kernel/trace/print.hpp ./gecode/kernel/trace/recorder.hpp ./gecode/kernel/trace/tracer.hpp \
34007+
./gecode/kernel/trace/traits.hpp ./gecode/kernel/var-imp.hpp ./gecode/kernel/var-type.hpp \
34008+
./gecode/kernel/var.hpp ./gecode/kernel/view.hpp ./gecode/minimodel.hh \
34009+
./gecode/minimodel/aliases.hpp ./gecode/minimodel/bool-expr.hpp ./gecode/minimodel/channel.hpp \
34010+
./gecode/minimodel/exception.hpp ./gecode/minimodel/float-expr.hpp ./gecode/minimodel/float-rel.hpp \
34011+
./gecode/minimodel/int-expr.hpp ./gecode/minimodel/int-rel.hpp ./gecode/minimodel/ipl.hpp \
34012+
./gecode/minimodel/ldsb.hpp ./gecode/minimodel/matrix.hpp ./gecode/minimodel/optimize.hpp \
34013+
./gecode/minimodel/reg.hpp ./gecode/minimodel/set-expr.hpp ./gecode/minimodel/set-rel.hpp \
34014+
./gecode/search.hh ./gecode/search/bab.hpp ./gecode/search/base.hpp \
34015+
./gecode/search/build.hpp ./gecode/search/cutoff.hpp ./gecode/search/dfs.hpp \
34016+
./gecode/search/engine.hpp ./gecode/search/exception.hpp ./gecode/search/lds.hpp \
34017+
./gecode/search/options.hpp ./gecode/search/pbs.hpp ./gecode/search/rbs.hpp \
34018+
./gecode/search/sebs.hpp ./gecode/search/seq/dead.hh ./gecode/search/statistics.hpp \
34019+
./gecode/search/stop.hpp ./gecode/search/support.hh ./gecode/search/trace-recorder.hpp \
34020+
./gecode/search/tracer.hpp ./gecode/search/traits.hpp ./gecode/set.hh \
34021+
./gecode/set/array-traits.hpp ./gecode/set/array.hpp ./gecode/set/branch.hpp \
34022+
./gecode/set/branch/action.hpp ./gecode/set/branch/afc.hpp ./gecode/set/branch/assign.hpp \
34023+
./gecode/set/branch/chb.hpp ./gecode/set/branch/traits.hpp ./gecode/set/branch/val.hpp \
34024+
./gecode/set/branch/var.hpp ./gecode/set/exception.hpp ./gecode/set/int.hpp \
34025+
./gecode/set/limits.hpp ./gecode/set/trace.hpp ./gecode/set/trace/delta.hpp \
34026+
./gecode/set/trace/trace-view.hpp ./gecode/set/trace/traits.hpp ./gecode/set/var-imp.hpp \
34027+
./gecode/set/var-imp/delta.hpp ./gecode/set/var-imp/integerset.hpp ./gecode/set/var-imp/iter.hpp \
34028+
./gecode/set/var-imp/set.hpp ./gecode/set/var/print.hpp ./gecode/set/var/set.hpp \
34029+
./gecode/set/view.hpp ./gecode/set/view/cached.hpp ./gecode/set/view/complement.hpp \
34030+
./gecode/set/view/const.hpp ./gecode/set/view/print.hpp ./gecode/set/view/set.hpp \
34031+
./gecode/set/view/singleton.hpp ./gecode/support.hh ./gecode/support/allocator.hpp \
34032+
./gecode/support/auto-link.hpp ./gecode/support/bitset-base.hpp ./gecode/support/bitset-offset.hpp \
34033+
./gecode/support/bitset.hpp ./gecode/support/block-allocator.hpp ./gecode/support/cast.hpp \
34034+
./gecode/support/config.hpp ./gecode/support/dynamic-array.hpp ./gecode/support/dynamic-queue.hpp \
34035+
./gecode/support/dynamic-stack.hpp ./gecode/support/exception.hpp ./gecode/support/hash.hpp \
34036+
./gecode/support/heap.hpp ./gecode/support/hw-rnd.hpp ./gecode/support/int-type.hpp \
34037+
./gecode/support/macros.hpp ./gecode/support/marked-pointer.hpp ./gecode/support/random.hpp \
34038+
./gecode/support/ref-count.hpp ./gecode/support/run-jobs.hpp ./gecode/support/sort.hpp \
34039+
./gecode/support/static-stack.hpp ./gecode/support/thread.hpp ./gecode/support/thread/thread.hpp \
34040+
./gecode/support/timer.hpp ./test/flatzinc.hh ./test/test.hh \
34041+
./test/test.hpp
3394734042
test/flatzinc/timetabling$(OBJSUFFIX) test/flatzinc/timetabling$(SBJSUFFIX): \
3394834043
./gecode/driver.hh ./gecode/driver/options.hpp ./gecode/driver/script.hpp \
3394934044
./gecode/flatzinc.hh ./gecode/flatzinc/ast.hh ./gecode/flatzinc/conexpr.hh \

‎Makefile.in‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,11 @@ export SOSUFFIX = @DLL_ARCH@@USERSUFFIX@@SOSUFFIX@
124124
#
125125
export RMF = rm -rf
126126
export MV = mv
127+
export UVRUN = uv run --script
127128
export MANIFEST = @MANIFEST@ -nologo
128-
export FIXMANIFEST = perl $(top_srcdir)/misc/fixmanifest.perl $(DLLSUFFIX)
129+
export FIXMANIFEST = $(UVRUN) $(top_srcdir)/misc/fixmanifest.py $(DLLSUFFIX)
129130
export RESCOMP = @RESCOMP@ -n -i$(top_srcdir)
130-
export RCGEN = perl $(top_srcdir)/misc/genrc.perl $(DLLSUFFIX) $(top_srcdir)
131+
export RCGEN = $(UVRUN) $(top_srcdir)/misc/genrc.py $(DLLSUFFIX) $(top_srcdir)
131132

132133
ifeq "@need_soname@" "yes"
133134
export CREATELINK = ln -fs
@@ -1350,12 +1351,12 @@ compilesubdirs:
13501351

13511352
VIS = @ALLVIS@
13521353
VISDEP = $(VIS) \
1353-
$(top_srcdir)/misc/genvarimp.perl Makefile
1354+
$(top_srcdir)/misc/genvarimp.py Makefile
13541355

13551356
gecode/kernel/var-type.hpp: $(VISDEP)
1356-
perl $(top_srcdir)/misc/genvarimp.perl -typehpp $(VIS) > $@
1357+
$(UVRUN) $(top_srcdir)/misc/genvarimp.py -typehpp $(VIS) > $@
13571358
gecode/kernel/var-imp.hpp: $(VISDEP)
1358-
perl $(top_srcdir)/misc/genvarimp.perl -header $(VIS) > $@
1359+
$(UVRUN) $(top_srcdir)/misc/genvarimp.py -header $(VIS) > $@
13591360

13601361
#
13611362
# Object targets
@@ -1856,26 +1857,26 @@ DOCSRC_NOTGENERATED = \
18561857
misc/doxygen/back.png misc/doxygen/footer.html \
18571858
misc/doxygen/gecode-logo-100.png \
18581859
misc/doxygen/stylesheet.css \
1859-
misc/genlicense.perl misc/genstatistics.perl \
1860-
misc/genchangelog.perl
1860+
misc/genlicense.py misc/genstatistics.py \
1861+
misc/genchangelog.py
18611862
DOCSRC = $(DOCSRC_NOTGENERATED:%=$(top_srcdir)/%) \
18621863
doxygen.conf.use header.html \
18631864
doxygen.hh license.hh stat.hh changelog.hh
18641865

18651866
changelog.hh: $(top_srcdir)/changelog.in
1866-
perl $(top_srcdir)/misc/genchangelog.perl < $^ > changelog.hh
1867+
$(UVRUN) $(top_srcdir)/misc/genchangelog.py < $^ > changelog.hh
18671868

18681869
ChangeLog: $(top_srcdir)/changelog.in
1869-
perl $(top_srcdir)/misc/gentxtchangelog.perl < $^ > ChangeLog
1870+
$(UVRUN) $(top_srcdir)/misc/gentxtchangelog.py < $^ > ChangeLog
18701871

18711872
license.hh: $(ALLGECODEHDR:%=$(top_srcdir)/%) $(ALLSRC:%=$(top_srcdir)/%) \
18721873
$(VARIMPHDR)
1873-
perl $(top_srcdir)/misc/genlicense.perl $^ > license.hh
1874+
$(UVRUN) $(top_srcdir)/misc/genlicense.py $^ > license.hh
18741875

18751876
stat.hh: $(ALLGECODEHDR:%=$(top_srcdir)/%) $(ALLSRC:%=$(top_srcdir)/%) \
18761877
$(TESTHDR:%=$(top_srcdir)/%) $(TESTSRC:%=$(top_srcdir)/%) \
18771878
$(VARIMPHDR)
1878-
perl $(top_srcdir)/misc/genstatistics.perl $^ > stat.hh
1879+
$(UVRUN) $(top_srcdir)/misc/genstatistics.py $^ > stat.hh
18791880

18801881

18811882
ifeq "@ENABLEDOCCHM@" "yes"
@@ -2127,7 +2128,7 @@ distclean: veryclean
21272128

21282129
depend: mkcompiledirs
21292130
@$(MAKE) $(VARIMP) gecode/flatzinc/parser.tab.hpp
2130-
perl $(top_srcdir)/misc/makedepend.perl \
2131+
$(UVRUN) $(top_srcdir)/misc/makedepend.py \
21312132
$(top_srcdir) \
21322133
$(ALLSRC) \
21332134
$(FLATZINC_GENSRC) \

‎configure.ac‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ AC_CHECK_PROG(PROG_SED, sed, [ok])
8686
if test "${PROG_SED}x" = "x"; then
8787
AC_MSG_ERROR([In order to compile Gecode, you need the sed tool.])
8888
fi
89-
AC_CHECK_PROG(PROG_PERL, perl, [ok])
90-
if test "${PROG_PERL}x" = "x"; then
91-
AC_MSG_ERROR([In order to compile Gecode, you need perl.])
89+
AC_CHECK_PROG(PROG_UV, uv, [ok])
90+
if test "${PROG_UV}x" = "x"; then
91+
AC_MSG_ERROR([In order to compile Gecode, you need uv.])
9292
fi
9393

9494
dnl Check for environment to use when running programs in the Makefile

‎configure.ac.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ AC_CHECK_PROG(PROG_SED, sed, [ok])
8686
if test "${PROG_SED}x" = "x"; then
8787
AC_MSG_ERROR([In order to compile Gecode, you need the sed tool.])
8888
fi
89-
AC_CHECK_PROG(PROG_PERL, perl, [ok])
90-
if test "${PROG_PERL}x" = "x"; then
91-
AC_MSG_ERROR([In order to compile Gecode, you need perl.])
89+
AC_CHECK_PROG(PROG_UV, uv, [ok])
90+
if test "${PROG_UV}x" = "x"; then
91+
AC_MSG_ERROR([In order to compile Gecode, you need uv.])
9292
fi
9393

9494
dnl Check for environment to use when running programs in the Makefile

‎gecode/flatzinc/complete.hh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,5 @@ namespace Gecode { namespace FlatZinc {
7676
}}
7777

7878
#endif // FLATZINC_COMPLETE_HH
79+
80+
// STATISTICS: flatzinc-branch

‎gecode/flatzinc/lastval.hh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,3 +174,5 @@ namespace Gecode { namespace FlatZinc {
174174
}}
175175

176176
#endif //__FLATZINC_LASTVAL_HH__
177+
178+
// STATISTICS: flatzinc-branch

‎gecode/third-party/boost/extract.perl‎

Lines changed: 0 additions & 107 deletions
This file was deleted.

0 commit comments

Comments
 (0)