Commit de96e9ec authored by Gildas Bazin's avatar Gildas Bazin

* vlc.win32.nsi: brand new NSIS auto-installer script.

* Makefile.am: use vlc icon in the NSIS installer.
parent b9e6db04
...@@ -21,13 +21,13 @@ EXTRA_DIST = \ ...@@ -21,13 +21,13 @@ EXTRA_DIST = \
MAINTAINERS \ MAINTAINERS \
README.MacOSX.rtf \ README.MacOSX.rtf \
bootstrap \ bootstrap \
install-win32 \
src/extras/COPYING \ src/extras/COPYING \
toolbox \ toolbox \
vlc-config.in.in \ vlc-config.in.in \
vlc.ebuild \ vlc.ebuild \
vlc.spec \ vlc.spec \
vlc.spec.mdk \ vlc.spec.mdk \
vlc.win32.nsi \
$(NULL) $(NULL)
BUILT_SOURCES = BUILT_SOURCES =
...@@ -566,19 +566,19 @@ remove_distdir_woody = \ ...@@ -566,19 +566,19 @@ remove_distdir_woody = \
# XXX: this rule is probably only useful to you if you have exactly # XXX: this rule is probably only useful to you if you have exactly
# the same setup as me. Contact sam@zoy.org if you need to use it. # the same setup as me. Contact sam@zoy.org if you need to use it.
# #
# Check that tmp isn't in the way
package-win32-base: package-win32-base:
# Check that tmp isn't in the way
@if test -e "$(srcdir)/vlc-${VERSION}"; then \ @if test -e "$(srcdir)/vlc-${VERSION}"; then \
echo "Error: please remove $(srcdir)/vlc-${VERSION}, it is in the way"; \ echo "Error: please remove $(srcdir)/vlc-${VERSION}, it is in the way"; \
false; \ false; \
else \ else \
echo "OK."; mkdir -p "$(srcdir)/vlc-${VERSION}"; \ echo "OK."; mkdir -p "$(srcdir)/vlc-${VERSION}"; \
fi fi
# Create installation script
cp "$(srcdir)/install-win32" "$(srcdir)/vlc-${VERSION}/nsi"
# Copy relevant files # Copy relevant files
cp "$(srcdir)/vlc.win32.nsi" "$(srcdir)/vlc-${VERSION}/"
cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/vlc-${VERSION}/" cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/vlc-${VERSION}/"
cp "$(top_builddir)/vlc$(EXEEXT).manifest" "$(srcdir)/vlc-${VERSION}/" cp "$(top_builddir)/vlc.exe.manifest" "$(srcdir)/vlc-${VERSION}/"
$(STRIP) "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)" $(STRIP) "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"
@if test -n "$(UPX)"; then \ @if test -n "$(UPX)"; then \
$(UPX) -9 "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"; fi ; $(UPX) -9 "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"; fi ;
...@@ -637,6 +637,8 @@ package-win32-base: ...@@ -637,6 +637,8 @@ package-win32-base:
cp $(srcdir)/share/http/vlm/*.html \ cp $(srcdir)/share/http/vlm/*.html \
$(srcdir)/vlc-${VERSION}/http/vlm/ ; $(srcdir)/vlc-${VERSION}/http/vlm/ ;
cp $(srcdir)/share/vlc48x48.ico $(srcdir)/vlc-${VERSION}/ ;
mkdir -p "$(srcdir)/vlc-${VERSION}/mozilla" mkdir -p "$(srcdir)/vlc-${VERSION}/mozilla"
if BUILD_MOZILLA if BUILD_MOZILLA
cp $(srcdir)/mozilla/*$(LIBEXT) $(srcdir)/vlc-${VERSION}/mozilla/ ; cp $(srcdir)/mozilla/*$(LIBEXT) $(srcdir)/vlc-${VERSION}/mozilla/ ;
...@@ -649,7 +651,7 @@ endif ...@@ -649,7 +651,7 @@ endif
package-win32-base-exe: package-win32-base-exe:
# Create package # Create package
wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe \ wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe \
-- /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/nsi -- /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/vlc.win32.nsi
package-win32-base-zip: package-win32-base-zip:
# Create package # Create package
......
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; NSIS installer script for vlc ;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;
; CHANGELOG ;
;;;;;;;;;;;;;
; modifications by Gildas Bazin <gbazin@netcourrier.com> 6 Jul 2003
; . Start menu shortcuts now created in the "All Users" section.
; modifications by Gildas Bazin <gbazin@netcourrier.com> 6 Apr 2003
; . added shortcut to the skins interface, added the default skin.
; modifications by Gildas Bazin <gbazin@netcourrier.com> 26 Feb 2003
; . added the locale directory.
; modifications by Samuel Hocevar <sam@zoy.org> 05 Apr 2002
; . no need for @VERSION@ anymore
; . updated script for NSIS 1.96.
; modifications by Samuel Hocevar <sam@zoy.org> 12 Nov 2001
; . removed version information.
; written by Pierre Baillet <oct@zoy.org> 29 Jul 2001 v0.2
; . lists all installed files so as to prevent installer.nsi to be included
; in the release.
; . really remove the shortcuts.
; . added an exec command to display the program file folder. (grOovy)
;;;;;;;;;;;;;;;;;;;;;;;;;
; General configuration ;
;;;;;;;;;;;;;;;;;;;;;;;;;
OutFile ..\vlc-${VERSION}-win32.exe
SetCompressor bzip2
Name "VLC media player"
Caption "VLC '${VERSION}' for Win32 Setup"
;Icon ../share/gvlc32x32.ico
CRCCheck on
InstallDir "$PROGRAMFILES\VideoLAN\VLC"
; check if the program has already been installed, if so, take this dir
; as install dir
InstallDirRegKey HKLM SOFTWARE\VideoLAN\VLC "Install_Dir"
DirText "Choose a directory to install in to:"
AutoCloseWindow false
ShowInstDetails show
SetOverwrite ifnewer
SetDatablockOptimize on
SetDateSave off
SetCompress auto
UninstallText "This will uninstall the VLC media player."
;;;;;;;;;;;;;;;;;;;;
; Install settings ;
;;;;;;;;;;;;;;;;;;;;
Section "Install"
SetOutPath $INSTDIR
File vlc.exe
File vlc.exe.manifest
File *.txt
File /r plugins
File /r locale
File /r skins
File /r skins2
File /r http
File /r mozilla
SetShellVarContext all
CreateDirectory "$SMPROGRAMS\VideoLAN"
CreateShortCut "$SMPROGRAMS\VideoLAN\vlc.lnk" \
"$INSTDIR\vlc.exe" "--intf wxwin"
CreateShortCut "$SMPROGRAMS\VideoLAN\vlc (skins).lnk" \
"$INSTDIR\vlc.exe" "--intf skins"
WriteRegStr HKLM \
SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN \
"DisplayName" "VideoLAN VLC media player ${VERSION}"
WriteRegStr HKLM \
SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN \
"UninstallString" '"$INSTDIR\uninstall.exe"'
WriteUninstaller "uninstall.exe"
WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "InstallDir" $INSTDIR
WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "Version" "${VERSION}"
WriteRegStr HKLM \
SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION} \
"Path" '"$INSTDIR\mozilla\npvlc.dll"'
Exec "explorer $SMPROGRAMS\VideoLAN\"
SectionEnd
;;;;;;;;;;;;;;;;;;;;;;
; Uninstall settings ;
;;;;;;;;;;;;;;;;;;;;;;
Section "Uninstall"
SetShellVarContext all
RMDir /r $SMPROGRAMS\VideoLAN
RMDir /r $INSTDIR
DeleteRegKey HKLM SOFTWARE\VideoLAN
DeleteRegKey HKLM \
SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}
DeleteRegKey HKLM \
Software\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN
SectionEnd
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment