From 0ef6b383ba8e60915d6d3086a315200d41bb0c59 Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Tue, 16 Apr 2024 13:02:06 -0500
Subject: [PATCH] Remove Vagrant stuff in favor of Podman.

Updates to Vagrant are no longer free software.
https://ir.hashicorp.com/news-releases/news-release-details/hashicorp-adopts-business-source-license-future-releases-its

As a result, Ubuntu no longer packages Vagrant, and Debian has
plans to do the same.
https://bugs.launchpad.net/ubuntu/+source/vagrant/+bug/2054608

Official builds will now use the Podman container.
---
 .gitignore  |  2 +-
 GNUmakefile |  4 ----
 README      | 17 +++--------------
 Vagrantfile | 27 ---------------------------
 4 files changed, 4 insertions(+), 46 deletions(-)
 delete mode 100644 Vagrantfile

diff --git a/.gitignore b/.gitignore
index f4c9af43..d090e979 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 .*.swp
-/.vagrant/
 /build/
 /image/
 /llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64.tar.xz
@@ -27,3 +26,4 @@
 /build.log
 /usr/
 /wine-build.zip
+/.wine-test-prefix
diff --git a/GNUmakefile b/GNUmakefile
index 43e83ece..d557dc3c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -6,11 +6,7 @@ SRCDIR:=$(dir $(MAKEFILE_LIST))
 BUILDDIR=$(SRCDIR)/build
 IMAGEDIR=$(SRCDIR)/image
 
-ifeq ($(shell test -d $(SRCDIR)/output && echo y),y)
-OUTDIR=$(SRCDIR)/output
-else
 OUTDIR=$(SRCDIR)
-endif
 
 TESTS_OUTDIR=$(OUTDIR)/tests
 
diff --git a/README b/README
index 88ba9395..e731a689 100644
--- a/README
+++ b/README
@@ -24,7 +24,7 @@ To build Wine Mono, you will need the following:
  * libgdiplus, to support Mono's resource compiler.
  * Optional: The zip or 7z command, for the tests-zip target only.
 
-When using the Vagrant build VM, only Vagrant is required on the host machine.
+When using the Podman build container, only Podman is required on the host machine.
 
 
 BUILD
@@ -33,20 +33,9 @@ To build Wine Mono, use the msi or bin target.
 
 $ make msi
 
-Optionally, a build VM can be automatically set up using the Vagrantfile included with the source distribution. To start the VM, run:
+To use a Podman container, prepend podman- to the build target.
 
-$ vagrant up
-$ vagrant ssh
-
-You can then cd to /vagrant and build from there.
-
-Note that the source code will be rsynced into the VM when it is first created. If you edit the source code on the host, you can update the VM by running:
-
-$ vagrant rsync
-
-Or, to have vagrant watch for changes:
-
-$ vagrant rsync-auto
+$ make podman-msi
 
 
 INSTALL
diff --git a/Vagrantfile b/Vagrantfile
deleted file mode 100644
index fa03d660..00000000
--- a/Vagrantfile
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Vagrant file for setting up a build environment for Wine Mono.
-
-Vagrant.configure(2) do |config|
-  config.vm.box = "ubuntu/mantic64"
-
-  config.vm.provider "virtualbox" do |v|
-    v.cpus = `nproc`.to_i
-    # meminfo shows KB and we need to convert to MB
-    v.memory = `grep 'MemTotal' /proc/meminfo | sed -e 's/MemTotal://' -e 's/ kB//'`.to_i / 1024 / 4
-  end
-
-  # Use virtualbox shared folders only for build output.
-  config.vm.synced_folder ".", "/vagrant", type: "rsync", rsync__exclude: [".git/", "/build-*/", "/image/", "/tests-*/", "/winemono.msi", "/output/"], rsync__args: ["--verbose", "--archive", "-z", "--links", "--update"]
-  config.vm.synced_folder ".", "/vagrant/output", create: "true"
-
-  config.vm.provision "shell", privileged: "true", inline: <<-SHELL
-    dpkg --add-architecture i386
-    echo '* libraries/restart-without-asking boolean true' | sudo debconf-set-selections
-    apt-get update
-	# --no-install-recommends to avoid corefonts which needs eula
-    apt-get install -y --no-install-recommends wine-stable
-	apt-get install -y autoconf libtool gettext python3 libtool-bin cmake libgdiplus zip g++
-  SHELL
-end