Skip to content

Commit 72b39d0

Browse files
authored
Merge pull request melianmiko#77 from melianmiko/release/v0.18.0
Minor fixes (no version change)
2 parents 1c984dc + 6ab113e commit 72b39d0

3 files changed

Lines changed: 23 additions & 40 deletions

File tree

Vagrantfile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
Vagrant.configure("2") do |config|
22
config.vm.define "debian", primary: true do |debian|
33
debian.vm.box = "generic/debian12"
4-
debian.vm.synced_folder ".", "/home/vagrant/openfreebuds"
4+
debian.vm.synced_folder ".", "/home/vagrant/openfreebuds",
5+
type: "nfs",
6+
nfs_version: 4
57

68
debian.vm.provision "shell",
79
run: 'once',
@@ -68,12 +70,12 @@ Vagrant.configure("2") do |config|
6870
end
6971

7072
config.vm.define "windows", primary: true do |win|
71-
win.vm.box = "gusztavvargadr/windows-11-24h2-enterprise"
73+
# From https://github.com/rgl/windows-vagrant, built it or use any other image
74+
win.vm.box = "windows-2025-amd64"
7275
win.vm.synced_folder ".", "C:\\openfreebuds"
73-
win.vm.provider "vmware_desktop" do |v|
74-
v.vmx["numvcpus"] = "4"
75-
v.vmx["memsize"] = "4096"
76-
v.gui = true
76+
win.vm.provider :libvirt do |libvirt|
77+
libvirt.cpus = 4
78+
libvirt.memory = 4096
7779
end
7880

7981
win.vm.provision "shell",
@@ -90,6 +92,8 @@ Vagrant.configure("2") do |config|
9092
echo 'Sleep for 60s for winget appear...'; Start-Sleep -s 60
9193
}
9294
95+
Add-AppPackage -path "https://cdn.winget.microsoft.com/cache/source.msix"
96+
9397
winget install -e --accept-source-agreements --no-upgrade --id Casey.Just
9498
winget install -e --no-upgrade --id NSIS.NSIS
9599
winget install -e --no-upgrade --id UPX.UPX

debian/copyright

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,8 @@ Source: https://github.com/melianmiko/openfreebuds
55

66
Files: *
77
Copyright: 2020 MelianMiko <melianmiko@gmail.com>
8-
License: GPL-2+
9-
This package is free software; you can redistribute it and/or modify
10-
it under the terms of the GNU General Public License as published by
11-
the Free Software Foundation; either version 2 of the License, or
12-
(at your option) any later version.
13-
.
14-
This package is distributed in the hope that it will be useful,
15-
but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17-
GNU General Public License for more details.
18-
.
19-
You should have received a copy of the GNU General Public License
20-
along with this program. If not, see <https://www.gnu.org/licenses/>
21-
.
22-
On Debian systems, the complete text of the GNU General
23-
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
8+
License: GPL-3+
249

2510
Files: debian/*
2611
Copyright: 2020 MelianMiko <melianmiko@gmail.com>
27-
License: GPL-2+
28-
This package is free software; you can redistribute it and/or modify
29-
it under the terms of the GNU General Public License as published by
30-
the Free Software Foundation; either version 2 of the License, or
31-
(at your option) any later version.
32-
.
33-
This package is distributed in the hope that it will be useful,
34-
but WITHOUT ANY WARRANTY; without even the implied warranty of
35-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
36-
GNU General Public License for more details.
37-
.
38-
You should have received a copy of the GNU General Public License
39-
along with this program. If not, see <https://www.gnu.org/licenses/>
40-
.
41-
On Debian systems, the complete text of the GNU General
42-
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
43-
12+
License: GPL-3+

justfile

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,20 @@ test:
6464
prepare:
6565
pdm install
6666

67+
clean:
68+
rm -rf dist scripts/dist scripts/build .pdm-build
69+
70+
vg_destroy:
71+
vagrant destroy -f
72+
6773
vg_all:
6874
vagrant halt -f
6975
vagrant up --parallel
7076

77+
# Grab files from windows due to rsync back isn't implemented
78+
vagrant ssh-config > .vagrant/sshconfig
79+
scp -F .vagrant/sshconfig windows:/openfreebuds/dist/*.exe dist
80+
7181

7282
# ------------------------------------------------
7383
# Project auto-install staff
@@ -113,7 +123,7 @@ install_check:
113123
# Build everything
114124
build: qt_i18n
115125
pdm run pyuic6 ./openfreebuds_qt/designer/
116-
pdm build
126+
pdm build --no-clean
117127

118128
# Compile Qt Linguist translation files
119129
[script]

0 commit comments

Comments
 (0)