Skip to content

Commit a024b93

Browse files
authored
Merge pull request #3432 from jimklimov/issue-3420
Refine `scripts/Windows/dllldd.sh` helper script
2 parents ac88819 + f7e1b15 commit a024b93

4 files changed

Lines changed: 135 additions & 54 deletions

File tree

Makefile.am

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1684,10 +1684,10 @@ install-win-bundle-thirdparty: @dotMAKE@
16841684
| while read D ; do \
16851685
BD="`basename \"$$D\"`" ; \
16861686
if test -e './$(bindir)/'"$$BD" && diff './$(bindir)/'"$$BD" "$$D" 2>/dev/null >/dev/null ; then \
1687-
echo " DLL->bin $$D : skip (already installed there)" 2>&1 ; \
1687+
echo " DLL->bin SKIP $$D : skip (already installed there)" 2>&1 ; \
16881688
continue ; \
16891689
fi ; \
1690-
echo " DLL->bin $$D" 2>&1 ; \
1690+
echo " DLL->bin COPY $$D" 2>&1 ; \
16911691
cp -pf "$$D" './$(bindir)/' ; \
16921692
done ; \
16931693
) || exit ; \
@@ -1696,7 +1696,7 @@ install-win-bundle-thirdparty: @dotMAKE@
16961696
GREP='$(GREP)' EGREP='$(EGREP)' \
16971697
'$(abs_top_srcdir)/scripts/Windows/dllldd.sh' dllldddir . \
16981698
| while read D ; do \
1699-
echo " DLL->sbin $$D (symlink from bindir)" 2>&1 ; \
1699+
echo " DLL->sbin LINK $$D (symlink from bindir)" 2>&1 ; \
17001700
ln -f '$(DESTDIR)/$(bindir)'/"`basename \"$$D\"`" ./ ; \
17011701
done ; \
17021702
) || exit ; \
@@ -1706,7 +1706,7 @@ install-win-bundle-thirdparty: @dotMAKE@
17061706
GREP='$(GREP)' EGREP='$(EGREP)' \
17071707
'$(abs_top_srcdir)/scripts/Windows/dllldd.sh' dllldddir . \
17081708
| while read D ; do \
1709-
echo " DLL->drv $$D (symlink from bindir)" 2>&1 ; \
1709+
echo " DLL->drv LINK $$D (symlink from bindir)" 2>&1 ; \
17101710
ln -f '$(DESTDIR)/$(bindir)'/"`basename \"$$D\"`" ./ ; \
17111711
done ; \
17121712
) || exit ; \
@@ -1718,7 +1718,7 @@ install-win-bundle-thirdparty: @dotMAKE@
17181718
GREP='$(GREP)' EGREP='$(EGREP)' \
17191719
'$(abs_top_srcdir)/scripts/Windows/dllldd.sh' dllldddir . \
17201720
| while read D ; do \
1721-
echo " DLL->cgi $$D (symlink from bindir)" 2>&1 ; \
1721+
echo " DLL->cgi LINK $$D (symlink from bindir)" 2>&1 ; \
17221722
ln -f '$(DESTDIR)/$(bindir)'/"`basename \"$$D\"`" ./ ; \
17231723
done ; \
17241724
) || exit ; \
@@ -1730,7 +1730,7 @@ install-win-bundle-thirdparty: @dotMAKE@
17301730
GREP='$(GREP)' EGREP='$(EGREP)' \
17311731
'$(abs_top_srcdir)/scripts/Windows/dllldd.sh' dllldddir . \
17321732
| while read D ; do \
1733-
echo " DLL->libexec $$D (symlink from bindir)" 2>&1 ; \
1733+
echo " DLL->libexec LINK $$D (symlink from bindir)" 2>&1 ; \
17341734
ln -f '$(DESTDIR)/$(bindir)'/"`basename \"$$D\"`" ./ ; \
17351735
done ; \
17361736
) || exit

docs/download.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ link:https://github.com/networkupstools/nut/wiki/Links-to-distribution-packaging
251251
+
252252
The automatically generated binary build archive of the latest release is
253253
available here:
254-
link:https://www.networkupstools.org/package/windows/NUT-for-Windows-x86_64-RELEASE-{revision}.7z[NUT-for-Windows-x86_64-RELEASE-{revision}.7z]
254+
link:https://www.networkupstools.org/package/windows/NUT-for-Windows-x86_64-RELEASE-{revision}-1-fixNSS.7z[NUT-for-Windows-x86_64-RELEASE-{revision}-1-fixNSS.7z]
255255
+
256256
[NOTE]
257257
======

docs/nut.dict

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
personal_ws-1.1 en 3747 utf-8
1+
personal_ws-1.1 en 3748 utf-8
22
AAC
33
AAS
44
ABI
@@ -2182,6 +2182,7 @@ filesystem
21822182
filesystems
21832183
firewalling
21842184
firmwares
2185+
fixNSS
21852186
fmt
21862187
fno
21872188
fontconfig

0 commit comments

Comments
 (0)