Home
My Posts

Archive
Login
Signup

Recent Posts

Free subdomains

Want your own xyz.kpaste.net sub-domain for your community? Just type the address into your browser address bar (foo.xyz.kpaste.net is also supported).

Suggestions/Bugs?

Email us at . Try to include as much info as possible.

About

Pastebin is a tool for collaborative debugging or editing.

 

msnfs41client: Patches for VS2022 make install, 32bit nfs_mount.exe on 64bit Windows+misc, 2024-11-20
Posted by Anonymous on Wed 20th Nov 2024 17:29
raw | new post

Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.

Syntax highlighting: None Bash C C++ CSS Diff HTML mIRC Script Perl PHP Python Smarty XML ---------------------------- ABAP Actionscript ADA Apache Log AppleScript APT sources.list ASM ASP AutoIT Bash C C# C++ C++ (with QT) CSS Diff HTML INI (Config Files) Java Javascript Lua Make mIRC Script MySQL NSIS Perl PHP Python Q(uick)BASIC robots Ruby Ruby on Rails SDLBasic Smarty SQL TCL Text VB.NET Visual BASIC Visual Fox Pro Visual Prolog Windows Registry Files XML Xorg.conf

To highlight particular lines, prefix each line with {%HIGHLIGHT}
From 7e76960f1835c5f4a1f00ec70222618e205c23cf Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Wed, 20 Nov 2024 17:41:03 +0100 Subject: [PATCH 1/3] cygwin: Makefile.install: Fix *.dll copy for VS2022 Fix *.dll copy in cygwin/Makefile.install for Visual Studio 2022 Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- cygwin/Makefile.install | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cygwin/Makefile.install b/cygwin/Makefile.install index 019f038..4fda8f5 100644 --- a/cygwin/Makefile.install +++ b/cygwin/Makefile.install @@ -103,14 +103,18 @@ installdest: [[ -x $(CYGWIN_BASEPATH)/bin/shcomp.exe ]] && cp -f $(CYGWIN_BASEPATH)/bin/shcomp.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/bin/shcomp.exe || true cp $(PROJECT_BASEDIR_DIR)/cygwin/cygwin_ksh93/ksh.kshrc $(DESTDIR)/$(CYGWIN_BASEPATH)/etc/ksh.kshrc @ printf '# Packaging libs\n' + set -o errexit -o pipefail ; \ + typeset msbuildpath="$$(which MSBuild.exe)" ; \ + typeset vsbasepath="$${msbuildpath%*/Community/*}" ; \ + test -d "$${vsbasepath}" || { printf "vsbasepath not found\n" 1>&2 ; exit 1 ; }; \ if [[ "$(CYGWIN_BASEPATH)" == *64* ]] ; then \ cp \ - "$$(find '/cygdrive/c/Program Files (x86)/Microsoft Visual Studio/2019/Community' -ipath '*/x64/*/VCRUNTIME140D.dll' | head -n 1)" \ + "$$(find "$${vsbasepath}/Community" -ipath '*/x64/*/VCRUNTIME140D.dll' | sort -n -r | head -n 1)" \ $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. ; \ cp '/cygdrive/c/Program Files (x86)/Windows Kits/10/bin/x64/ucrt/ucrtbased.dll' $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. ; \ else \ cp \ - "$$(find '/cygdrive/c/Program Files (x86)/Microsoft Visual Studio/2019/Community' -ipath '*/x86/*/VCRUNTIME140D.dll' | head -n 1)" \ + "$$(find "$${vsbasepath}/Community" -ipath '*/x86/*/VCRUNTIME140D.dll' | sort -n -r | head -n 1)" \ $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. ; \ cp '/cygdrive/c/Program Files (x86)/Windows Kits/10/bin/x86/ucrt/ucrtbased.dll' $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. ; \ fi -- 2.45.1 From 23d2b7c7492c13ff662d3114a1f0c9f662cdde15 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Wed, 20 Nov 2024 18:00:03 +0100 Subject: [PATCH 2/3] cygwin: Install 32bit nfs_mount.exe to assist debugging 32bit apps on 64bit Windows Install 32bit nfs_mount.exe as /sbin/nfs_mount.i686.exe and /sbin/nfs_umount.i686.exe to assist debugging 32bit apps on 64bit Windows. Reported-by: Mark Liam Brown <brownmarkliam@gmail.com> Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- cygwin/Makefile | 4 ++++ cygwin/Makefile.install | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/cygwin/Makefile b/cygwin/Makefile index 0775b24..43813de 100644 --- a/cygwin/Makefile +++ b/cygwin/Makefile @@ -102,6 +102,8 @@ installdest32: \ make -f $(CYGWIN_MAKEFILE_DIR)/Makefile.install \ installdest \ VS_BUILD_DIR="$(VS_BUILD_DIR32)" \ + VS_BUILD_DIR32="$(VS_BUILD_DIR32)" \ + VS_BUILD_DIR64="$(VS_BUILD_DIR64)" \ CYGWIN_BASEPATH=/cygdrive/c/cygwin/ # installdest64: 32bit nfs41_np.dll is required to support 32bit @@ -118,6 +120,8 @@ installdest64: \ make -f $(CYGWIN_MAKEFILE_DIR)/Makefile.install \ installdest \ VS_BUILD_DIR="$(VS_BUILD_DIR64)" \ + VS_BUILD_DIR32="$(VS_BUILD_DIR32)" \ + VS_BUILD_DIR64="$(VS_BUILD_DIR64)" \ CYGWIN_BASEPATH=/cygdrive/c/cygwin64/ # installdest: we need a .WAIT here becase Makefile.install uses git commands diff --git a/cygwin/Makefile.install b/cygwin/Makefile.install index 4fda8f5..07a55f6 100644 --- a/cygwin/Makefile.install +++ b/cygwin/Makefile.install @@ -41,6 +41,12 @@ installdest: cp -r $(VS_BUILD_DIR)/nfs_mount.* $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. # we need a hardlink for nfs_umount.exe, softlinks do not work ln -f $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_mount.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_umount.exe + # install 32bit nfs_mount.exe on 64bit Windows to assist with debugging 32bit issues + # we use the "Release" version to avoid issues with missing debug libraries + if [[ "$(CYGWIN_BASEPATH)" == *64* ]] ; then \ + cp $(VS_BUILD_DIR32)/../Release/nfs_mount.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_mount.i686.exe ; \ + ln -f $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_mount.i686.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_umount.i686.exe ; \ + fi cp -r $(VS_BUILD_DIR)/nfsd.* $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. cp -r $(VS_BUILD_DIR)/nfs_install.* $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. cp -r $(VS_BUILD_DIR)/libtirpc.* $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. -- 2.45.1 From 7cf017d3d2289f3f99894f4e76711e99ab0f6472 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Wed, 20 Nov 2024 18:08:04 +0100 Subject: [PATCH 3/3] cygwin: Remove cp option "-r" for non-directories Remove cp option "-r" for non-directories Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- cygwin/Makefile.install | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cygwin/Makefile.install b/cygwin/Makefile.install index 07a55f6..b973635 100644 --- a/cygwin/Makefile.install +++ b/cygwin/Makefile.install @@ -36,9 +36,9 @@ installdest: mkdir -p $(DESTDIR)/$(CYGWIN_BASEPATH)/usr/share/msnfs41client mkdir -p $(DESTDIR)/$(CYGWIN_BASEPATH)/usr/share/msnfs41client/tests mkdir -p $(DESTDIR)/$(CYGWIN_BASEPATH)/usr/share/msnfs41client/tests/misc - cp -r $(VS_BUILD_DIR)/nfsd.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfsd_debug.exe - cp -r $(VS_BUILD_DIR)/nfsd.pdb $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfsd_debug.pdb - cp -r $(VS_BUILD_DIR)/nfs_mount.* $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. + cp $(VS_BUILD_DIR)/nfsd.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfsd_debug.exe + cp $(VS_BUILD_DIR)/nfsd.pdb $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfsd_debug.pdb + cp $(VS_BUILD_DIR)/nfs_mount.* $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. # we need a hardlink for nfs_umount.exe, softlinks do not work ln -f $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_mount.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_umount.exe # install 32bit nfs_mount.exe on 64bit Windows to assist with debugging 32bit issues @@ -47,11 +47,11 @@ installdest: cp $(VS_BUILD_DIR32)/../Release/nfs_mount.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_mount.i686.exe ; \ ln -f $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_mount.i686.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_umount.i686.exe ; \ fi - cp -r $(VS_BUILD_DIR)/nfsd.* $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. - cp -r $(VS_BUILD_DIR)/nfs_install.* $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. - cp -r $(VS_BUILD_DIR)/libtirpc.* $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. - cp -r $(VS_BUILD_DIR)/nfs41_np.* $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/. - cp -r $(VS_BUILD_DIR)/nfs41_driver.* $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/. + cp $(VS_BUILD_DIR)/nfsd.* $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. + cp $(VS_BUILD_DIR)/nfs_install.* $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. + cp $(VS_BUILD_DIR)/libtirpc.* $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. + cp $(VS_BUILD_DIR)/nfs41_np.* $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/. + cp $(VS_BUILD_DIR)/nfs41_driver.* $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/. cp $(PROJECT_BASEDIR_DIR)/nfs41rdr.inf $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/. cp $(PROJECT_BASEDIR_DIR)/etc_netconfig $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/. cp $(PROJECT_BASEDIR_DIR)/ms-nfs41-idmap.conf $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/. -- 2.45.1

Title:

Privacy: Public Private

How long should your post be retained?

15 mins an hour a day a week a month forever

All content is user-submitted.
The administrators of this site (kpaste.net) are not responsible for their content.
Abuse reports should be emailed to us at