From 7efed11f631458eee9de25e92b0161ec136734e6 Mon Sep 17 00:00:00 2001
From: hondet <gabrielhondet@gmail.com>
Date: Mon, 1 Nov 2021 15:45:43 +0100
Subject: [PATCH] simpler dependencies spec
---
tools/bootstrap.sh | 5 ++---
tools/debian-deps | 14 ++++++++++++++
tools/install-deps/.gitignore | 3 ---
tools/install-deps/Makefile | 7 -------
tools/install-deps/lambdapi-pvs.ctl | 27 ---------------------------
5 files changed, 16 insertions(+), 40 deletions(-)
create mode 100644 tools/debian-deps
delete mode 100644 tools/install-deps/.gitignore
delete mode 100644 tools/install-deps/Makefile
delete mode 100644 tools/install-deps/lambdapi-pvs.ctl
diff --git a/tools/bootstrap.sh b/tools/bootstrap.sh
index 0e48e68..ee4dce0 100755
--- a/tools/bootstrap.sh
+++ b/tools/bootstrap.sh
@@ -5,9 +5,8 @@ SCRIPT=$(realpath "$0")
DIR=$(dirname "$SCRIPT")
ROOT=$(realpath "${DIR}/..") # Root of personoj repo
-curl -s 'http://www.lsv.fr/~hondet/pvs/lambdapi-pvs_1.0_all.deb' > lambdapi-pvs.deb
-yes | sudo apt-get -q install ./lambdapi-pvs.deb
-yes | sudo apt-get install -q emacs # For PVS
+xargs sudo apt-get -yq install < debian-deps
+yes | sudo apt-get install -q emacs-nox # For PVS
sudo sysctl kernel.unprivileged_userns_clone=1
yes '/usr/local/bin' | sudo bash -c "sh <(curl -fsSL https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh) --version 2.1.0"
diff --git a/tools/debian-deps b/tools/debian-deps
new file mode 100644
index 0000000..aed6272
--- /dev/null
+++ b/tools/debian-deps
@@ -0,0 +1,14 @@
+zlib1g-dev
+libx11-dev
+libgmp-dev
+bubblewrap
+m4,gcc
+autoconf
+make
+unzip
+pkg-config
+git
+rsync
+bmake
+c-compiler
+perl
diff --git a/tools/install-deps/.gitignore b/tools/install-deps/.gitignore
deleted file mode 100644
index 87bb437..0000000
--- a/tools/install-deps/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.buildinfo
-*.changes
-*.deb
diff --git a/tools/install-deps/Makefile b/tools/install-deps/Makefile
deleted file mode 100644
index d352239..0000000
--- a/tools/install-deps/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-VERSION = 1.0
-
-lambdapi-pvs_${VERSION}_all.deb: lambdapi-pvs.ctl
- equivs-build $<
-
-clean:
- rm -f *.buildinfo *.changes
diff --git a/tools/install-deps/lambdapi-pvs.ctl b/tools/install-deps/lambdapi-pvs.ctl
deleted file mode 100644
index 3bf2894..0000000
--- a/tools/install-deps/lambdapi-pvs.ctl
+++ /dev/null
@@ -1,27 +0,0 @@
-Source: lambdapi-pvs
-Section: misc
-Priority: optional
-Homepage: https://github.com/Deducteam/personoj
-Standards-Version: 3.9.2
-
-Package: lambdapi-pvs
-Version: 1.0
-Maintainer: Gabriel Hondet <gabriel (dot) hondet (at) inria (dot) fr>
-# Pre-Depends: <comma-separated list of packages>
-Depends: zlib1g-dev,libx11-dev,libgmp-dev,bubblewrap,m4,gcc,autoconf,make,unzip,pkg-config,git,rsync,bmake,ksh,c-compiler,sbcl
-Recommends: emacs-nox
-# Suggests: <comma-separated list of packages>
-# Provides: <comma-separated list of packages>
-# Replaces: <comma-separated list of packages>
-# Architecture: all
-# Multi-Arch: <one of: foreign|same|allowed>
-# Copyright: BSD3
-# Changelog: <changelog file; defaults to a generic changelog>
-# Readme: <README.Debian file; defaults to a generic one>
-# Extra-Files: <comma-separated list of additional files for the doc directory>
-# Links: <pair of space-separated paths; First is path symlink points at, second is filename of link>
-# Files: <pair of space-separated paths; First is file to include, second is destination>
-# <more pairs, if there's more than one file to include. Notice the starting space>
-Description: Meta package to install dependencies for lambdapi and PVS
- This package gathers the dependencies required to export theories from PVS to
- Dedukti.
--
GitLab