[vlc-commits] [Git][videolan/vlc][master] 2 commits: Revert "Fix MSI packaging"

[Hugo Beauzée-Luyssen]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
fccc47c6 by Hugo Beauzée-Luyssen at 2021-05-04T12:18:36+00:00
Revert "Fix MSI packaging"

This reverts commit 105de271ad53e15952627ee969cc185eec8f2e59.

- - - - -
e7458985 by Hugo Beauzée-Luyssen at 2021-05-04T12:18:36+00:00
extras: win32 package: Copy README.md as README.txt

- - - - -


2 changed files:

- extras/package/win32/msi/product.wxs
- extras/package/win32/package.mak


Changes:

=====================================
extras/package/win32/msi/product.wxs
=====================================
@@ -125,7 +125,7 @@
                             <File Id='AUTHORS.txt' Name='AUTHORS.txt'  DiskId='1' />
                             <File Id='COPYING.txt' Name='COPYING.txt' DiskId='1' />
                             <File Id='NEWS.txt' Name='NEWS.txt' DiskId='1' />
-                            <File Id='README.md' Name='README.md' DiskId='1' />
+                            <File Id='README.txt' Name='README.txt' DiskId='1' />
                             <File Id='THANKS.txt' Name='THANKS.txt' DiskId='1' />
                         </Component>
 


=====================================
extras/package/win32/package.mak
=====================================
@@ -54,9 +54,10 @@ endif
 	for file in AUTHORS THANKS ; \
 		do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(win32_destdir)/$${file}.txt"; \
 	done
-	for file in NEWS COPYING README.md; \
+	for file in NEWS COPYING; \
 		do cp "$(srcdir)/$$file" "$(win32_destdir)/$${file}.txt"; \
 	done
+	cp "$(srcdir)/README.md" "$(win32_destdir)/README.txt"
 
 	cp $(srcdir)/share/icons/vlc.ico $(win32_destdir)
 	for plugindir in $(prefix)/lib/vlc/plugins/*/; do \



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/172eacd6f388588d72046de271e36726e0f399d0...e74589855c390a5e464a3c676a855afe55eb5f42

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/172eacd6f388588d72046de271e36726e0f399d0...e74589855c390a5e464a3c676a855afe55eb5f42
You're receiving this email because of your account on code.videolan.org.