| Message ID | 20220908132817.1831008-1-bmeng.cn@gmail.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | nsis: gitlab-ci: Improve QEMU Windows installer packaging | expand |
On Thu, Sep 8, 2022 at 9:28 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > At present packaging the required DLLs of QEMU executables is a > manual process, and error prone. > > Improve scripts/nsis.py by adding a logic to automatically package > required DLLs of QEMU executables. > > 'make installer' is tested in the cross-build on Linux in CI, but > not in the Windows native build. Update CI to test the installer > generation on Windows too. > > During testing a 32-bit build issue was exposed in block/nfs.c and > the fix is included in this series. > > > Bin Meng (7): > scripts/nsis.py: Drop the unnecessary path separator > scripts/nsis.py: Fix destination directory name when invoked on > Windows > scripts/nsis.py: Automatically package required DLLs of QEMU > executables > .gitlab-ci.d/windows.yml: Drop the sed processing in the 64-bit build > block/nfs: Fix 32-bit Windows build > .gitlab-ci.d/windows.yml: Unify the prerequisite packages > .gitlab-ci.d/windows.yml: Test 'make installer' in the CI > > meson.build | 1 + > block/nfs.c | 8 ++++++ > .gitlab-ci.d/windows.yml | 40 ++++++++++++++++++++------- > scripts/nsis.py | 60 +++++++++++++++++++++++++++++++++------- > 4 files changed, 89 insertions(+), 20 deletions(-) > Ping for this series?
Hi, On Thu, Sep 8, 2022 at 9:28 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > At present packaging the required DLLs of QEMU executables is a > manual process, and error prone. > > Improve scripts/nsis.py by adding a logic to automatically package > required DLLs of QEMU executables. > > 'make installer' is tested in the cross-build on Linux in CI, but > not in the Windows native build. Update CI to test the installer > generation on Windows too. > > During testing a 32-bit build issue was exposed in block/nfs.c and > the fix is included in this series. > > > Bin Meng (7): > scripts/nsis.py: Drop the unnecessary path separator > scripts/nsis.py: Fix destination directory name when invoked on > Windows > scripts/nsis.py: Automatically package required DLLs of QEMU > executables > .gitlab-ci.d/windows.yml: Drop the sed processing in the 64-bit build > block/nfs: Fix 32-bit Windows build > .gitlab-ci.d/windows.yml: Unify the prerequisite packages > .gitlab-ci.d/windows.yml: Test 'make installer' in the CI > > meson.build | 1 + > block/nfs.c | 8 ++++++ > .gitlab-ci.d/windows.yml | 40 ++++++++++++++++++++------- > scripts/nsis.py | 60 +++++++++++++++++++++++++++++++++------- > 4 files changed, 89 insertions(+), 20 deletions(-) > I see Thomas only queued patch #4 (".gitlab-ci.d/windows.yml: Drop the sed processing in the 64-bit build") What about other patches? Regards, Bin
On 21/09/2022 14.18, Bin Meng wrote: > Hi, > > On Thu, Sep 8, 2022 at 9:28 PM Bin Meng <bmeng.cn@gmail.com> wrote: >> >> At present packaging the required DLLs of QEMU executables is a >> manual process, and error prone. >> >> Improve scripts/nsis.py by adding a logic to automatically package >> required DLLs of QEMU executables. >> >> 'make installer' is tested in the cross-build on Linux in CI, but >> not in the Windows native build. Update CI to test the installer >> generation on Windows too. >> >> During testing a 32-bit build issue was exposed in block/nfs.c and >> the fix is included in this series. >> >> >> Bin Meng (7): >> scripts/nsis.py: Drop the unnecessary path separator >> scripts/nsis.py: Fix destination directory name when invoked on >> Windows >> scripts/nsis.py: Automatically package required DLLs of QEMU >> executables >> .gitlab-ci.d/windows.yml: Drop the sed processing in the 64-bit build >> block/nfs: Fix 32-bit Windows build >> .gitlab-ci.d/windows.yml: Unify the prerequisite packages >> .gitlab-ci.d/windows.yml: Test 'make installer' in the CI >> >> meson.build | 1 + >> block/nfs.c | 8 ++++++ >> .gitlab-ci.d/windows.yml | 40 ++++++++++++++++++++------- >> scripts/nsis.py | 60 +++++++++++++++++++++++++++++++++------- >> 4 files changed, 89 insertions(+), 20 deletions(-) >> > > I see Thomas only queued patch #4 (".gitlab-ci.d/windows.yml: Drop the > sed processing in the 64-bit build") > > What about other patches? I hope that Stefan Weil (our W32 maintainer) could have a look at these first... Thomas
Hi Stefan, On Wed, Sep 21, 2022 at 8:24 PM Thomas Huth <thuth@redhat.com> wrote: > > On 21/09/2022 14.18, Bin Meng wrote: > > Hi, > > > > On Thu, Sep 8, 2022 at 9:28 PM Bin Meng <bmeng.cn@gmail.com> wrote: > >> > >> At present packaging the required DLLs of QEMU executables is a > >> manual process, and error prone. > >> > >> Improve scripts/nsis.py by adding a logic to automatically package > >> required DLLs of QEMU executables. > >> > >> 'make installer' is tested in the cross-build on Linux in CI, but > >> not in the Windows native build. Update CI to test the installer > >> generation on Windows too. > >> > >> During testing a 32-bit build issue was exposed in block/nfs.c and > >> the fix is included in this series. > >> > >> > >> Bin Meng (7): > >> scripts/nsis.py: Drop the unnecessary path separator > >> scripts/nsis.py: Fix destination directory name when invoked on > >> Windows > >> scripts/nsis.py: Automatically package required DLLs of QEMU > >> executables > >> .gitlab-ci.d/windows.yml: Drop the sed processing in the 64-bit build > >> block/nfs: Fix 32-bit Windows build > >> .gitlab-ci.d/windows.yml: Unify the prerequisite packages > >> .gitlab-ci.d/windows.yml: Test 'make installer' in the CI > >> > >> meson.build | 1 + > >> block/nfs.c | 8 ++++++ > >> .gitlab-ci.d/windows.yml | 40 ++++++++++++++++++++------- > >> scripts/nsis.py | 60 +++++++++++++++++++++++++++++++++------- > >> 4 files changed, 89 insertions(+), 20 deletions(-) > >> > > > > I see Thomas only queued patch #4 (".gitlab-ci.d/windows.yml: Drop the > > sed processing in the 64-bit build") > > > > What about other patches? > > I hope that Stefan Weil (our W32 maintainer) could have a look at these first... Would you please comment this series? Thanks! Regards, Bin
Hi Thomas, On Wed, Sep 21, 2022 at 8:24 PM Thomas Huth <thuth@redhat.com> wrote: > > On 21/09/2022 14.18, Bin Meng wrote: > > Hi, > > > > On Thu, Sep 8, 2022 at 9:28 PM Bin Meng <bmeng.cn@gmail.com> wrote: > >> > >> At present packaging the required DLLs of QEMU executables is a > >> manual process, and error prone. > >> > >> Improve scripts/nsis.py by adding a logic to automatically package > >> required DLLs of QEMU executables. > >> > >> 'make installer' is tested in the cross-build on Linux in CI, but > >> not in the Windows native build. Update CI to test the installer > >> generation on Windows too. > >> > >> During testing a 32-bit build issue was exposed in block/nfs.c and > >> the fix is included in this series. > >> > >> > >> Bin Meng (7): > >> scripts/nsis.py: Drop the unnecessary path separator > >> scripts/nsis.py: Fix destination directory name when invoked on > >> Windows > >> scripts/nsis.py: Automatically package required DLLs of QEMU > >> executables > >> .gitlab-ci.d/windows.yml: Drop the sed processing in the 64-bit build > >> block/nfs: Fix 32-bit Windows build > >> .gitlab-ci.d/windows.yml: Unify the prerequisite packages > >> .gitlab-ci.d/windows.yml: Test 'make installer' in the CI > >> > >> meson.build | 1 + > >> block/nfs.c | 8 ++++++ > >> .gitlab-ci.d/windows.yml | 40 ++++++++++++++++++++------- > >> scripts/nsis.py | 60 +++++++++++++++++++++++++++++++++------- > >> 4 files changed, 89 insertions(+), 20 deletions(-) > >> > > > > I see Thomas only queued patch #4 (".gitlab-ci.d/windows.yml: Drop the > > sed processing in the 64-bit build") > > > > What about other patches? > > I hope that Stefan Weil (our W32 maintainer) could have a look at these first... > Stefan has reviewed / tested patch 1-3. Not sure who is going to queue these 3 patches? Regards, Bin
On 29/10/2022 15.45, Bin Meng wrote: > Hi Thomas, > > On Wed, Sep 21, 2022 at 8:24 PM Thomas Huth <thuth@redhat.com> wrote: >> >> On 21/09/2022 14.18, Bin Meng wrote: >>> Hi, >>> >>> On Thu, Sep 8, 2022 at 9:28 PM Bin Meng <bmeng.cn@gmail.com> wrote: >>>> >>>> At present packaging the required DLLs of QEMU executables is a >>>> manual process, and error prone. >>>> >>>> Improve scripts/nsis.py by adding a logic to automatically package >>>> required DLLs of QEMU executables. >>>> >>>> 'make installer' is tested in the cross-build on Linux in CI, but >>>> not in the Windows native build. Update CI to test the installer >>>> generation on Windows too. >>>> >>>> During testing a 32-bit build issue was exposed in block/nfs.c and >>>> the fix is included in this series. >>>> >>>> >>>> Bin Meng (7): >>>> scripts/nsis.py: Drop the unnecessary path separator >>>> scripts/nsis.py: Fix destination directory name when invoked on >>>> Windows >>>> scripts/nsis.py: Automatically package required DLLs of QEMU >>>> executables >>>> .gitlab-ci.d/windows.yml: Drop the sed processing in the 64-bit build >>>> block/nfs: Fix 32-bit Windows build >>>> .gitlab-ci.d/windows.yml: Unify the prerequisite packages >>>> .gitlab-ci.d/windows.yml: Test 'make installer' in the CI >>>> >>>> meson.build | 1 + >>>> block/nfs.c | 8 ++++++ >>>> .gitlab-ci.d/windows.yml | 40 ++++++++++++++++++++------- >>>> scripts/nsis.py | 60 +++++++++++++++++++++++++++++++++------- >>>> 4 files changed, 89 insertions(+), 20 deletions(-) >>>> >>> >>> I see Thomas only queued patch #4 (".gitlab-ci.d/windows.yml: Drop the >>> sed processing in the 64-bit build") >>> >>> What about other patches? >> >> I hope that Stefan Weil (our W32 maintainer) could have a look at these first... >> > > Stefan has reviewed / tested patch 1-3. Not sure who is going to queue > these 3 patches? If Stefan has time for a pull request, I think he would be the best fit. Stefan? Otherwise, maybe Marc-André could take those patches, since he apparently wrote that nsis.py script? (By the way, should we have an entry for that script in MAINTAINERS? ... likely in the W32/W64 section?) Thomas
Am 31.10.22 um 07:52 schrieb Thomas Huth: > On 29/10/2022 15.45, Bin Meng wrote: >> Stefan has reviewed / tested patch 1-3. Not sure who is going to queue >> these 3 patches? > > If Stefan has time for a pull request, I think he would be the best > fit. Stefan? > > Otherwise, maybe Marc-André could take those patches, since he > apparently wrote that nsis.py script? > > (By the way, should we have an entry for that script in MAINTAINERS? > ... likely in the W32/W64 section?) > > Thomas Thanks. I have sent a pull request now. Please excuse that some of you got that pull request e-mails twice. I used Peter's make-pullreq script for the first time and had to learn how it works. Stefan
Hi Stefan On Mon, Oct 31, 2022 at 1:27 PM Stefan Weil via <qemu-devel@nongnu.org> wrote: > > Am 31.10.22 um 07:52 schrieb Thomas Huth: > > > On 29/10/2022 15.45, Bin Meng wrote: > >> Stefan has reviewed / tested patch 1-3. Not sure who is going to queue > >> these 3 patches? > > > > If Stefan has time for a pull request, I think he would be the best > > fit. Stefan? > > > > Otherwise, maybe Marc-André could take those patches, since he > > apparently wrote that nsis.py script? > > > > (By the way, should we have an entry for that script in MAINTAINERS? > > ... likely in the W32/W64 section?) > > > > Thomas > > > Thanks. I have sent a pull request now. > > Please excuse that some of you got that pull request e-mails twice. > > I used Peter's make-pullreq script for the first time and had to learn > how it works. Could you send a MAINTAINERS patch to add scripts/nsis.py to w32/w64? thanks
At present packaging the required DLLs of QEMU executables is a manual process, and error prone. Improve scripts/nsis.py by adding a logic to automatically package required DLLs of QEMU executables. 'make installer' is tested in the cross-build on Linux in CI, but not in the Windows native build. Update CI to test the installer generation on Windows too. During testing a 32-bit build issue was exposed in block/nfs.c and the fix is included in this series. Bin Meng (7): scripts/nsis.py: Drop the unnecessary path separator scripts/nsis.py: Fix destination directory name when invoked on Windows scripts/nsis.py: Automatically package required DLLs of QEMU executables .gitlab-ci.d/windows.yml: Drop the sed processing in the 64-bit build block/nfs: Fix 32-bit Windows build .gitlab-ci.d/windows.yml: Unify the prerequisite packages .gitlab-ci.d/windows.yml: Test 'make installer' in the CI meson.build | 1 + block/nfs.c | 8 ++++++ .gitlab-ci.d/windows.yml | 40 ++++++++++++++++++++------- scripts/nsis.py | 60 +++++++++++++++++++++++++++++++++------- 4 files changed, 89 insertions(+), 20 deletions(-)