Skip to content

Commit

Permalink
Remove Vagrant stuff in favor of Podman.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Esme Povirk committed Apr 16, 2024
1 parent 6383cde commit 0ef6b38
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 46 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.*.swp
/.vagrant/
/build/
/image/
/llvm-mingw-20240320-ucrt-ubuntu-20.04-x86_64.tar.xz
Expand Down Expand Up @@ -27,3 +26,4 @@
/build.log
/usr/
/wine-build.zip
/.wine-test-prefix
4 changes: 0 additions & 4 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
17 changes: 3 additions & 14 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
27 changes: 0 additions & 27 deletions Vagrantfile

This file was deleted.

0 comments on commit 0ef6b38

Please sign in to comment.