[vlmc-devel] commit: nsis: forget to remove some files from the uninstaller. ( Ludovic Fauvet )

[git at videolan.org]

vlmc | branch: master | Ludovic Fauvet <etix at l0cal.com> | Mon Mar 29 23:28:52 2010 +0200| [f2219bea86bdd37852184640717c46f5c7247fdc] | committer: Ludovic Fauvet 

nsis: forget to remove some files from the uninstaller.

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=f2219bea86bdd37852184640717c46f5c7247fdc
---

 nsis/CMakeLists.txt |    6 ------
 nsis/installer.nsi  |   12 ++++++++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/nsis/CMakeLists.txt b/nsis/CMakeLists.txt
index 276896e..634b572 100644
--- a/nsis/CMakeLists.txt
+++ b/nsis/CMakeLists.txt
@@ -17,12 +17,6 @@ IF(WIN32)
              DESTINATION ${NSIS_OUTPUT_DIR}
              FILES_MATCHING PATTERN "*.dll")
 
-        # Copy some important files
-        CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/COPYING" ${NSIS_OUTPUT_DIR} COPYONLY)
-        CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/AUTHORS" ${NSIS_OUTPUT_DIR} COPYONLY)
-        CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/TRANSLATORS" ${NSIS_OUTPUT_DIR} COPYONLY)
-        CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/NEWS" ${NSIS_OUTPUT_DIR} COPYONLY)
-
         MESSAGE(STATUS "Configuring NSIS")
 
         # Copy and configure the nsis script file
diff --git a/nsis/installer.nsi b/nsis/installer.nsi
index 07b3fcf..e7b8bfc 100644
--- a/nsis/installer.nsi
+++ b/nsis/installer.nsi
@@ -29,7 +29,7 @@ RequestExecutionLevel admin
 !define MUI_ABORTWARNING
 
 LicenseText "License"
-LicenseData "COPYING"
+LicenseData "@CMAKE_SOURCE_DIR@/COPYING"
 
 ;--------------------------------
 ; Pages
@@ -65,6 +65,10 @@ Section "@PROJECT_NAME_SHORT@ (required)"
   File "QtXml4.dll"
   File "vlmc.exe"
   File "@CMAKE_SOURCE_DIR@/share/vlmc.ico"
+  File "@CMAKE_SOURCE_DIR@/COPYING"
+  File "@CMAKE_SOURCE_DIR@/AUTHORS"
+  File "@CMAKE_SOURCE_DIR@/TRANSLATORS"
+  File "@CMAKE_SOURCE_DIR@/NEWS"
   File /r "plugins"
   File /r "effects"
 
@@ -105,16 +109,20 @@ Section "Uninstall"
   Delete "$INSTDIR\libvlc.dll"
   Delete "$INSTDIR\libvlccore.dll"
   Delete "$INSTDIR\mingwm10.dll"
+  Delete "$INSTDIR\libgcc_s_dw2-1.dll"
   Delete "$INSTDIR\QtCore4.dll"
   Delete "$INSTDIR\QtGui4.dll"
   Delete "$INSTDIR\QtSvg4.dll"
   Delete "$INSTDIR\QtXml4.dll"
+  Delete "$INSTDIR/COPYING"
+  Delete "$INSTDIR/AUTHORS"
+  Delete "$INSTDIR/TRANSLATORS"
+  Delete "$INSTDIR/NEWS"
   Delete "$INSTDIR\plugins\*.*"
   Delete "$INSTDIR\effects\*.*"
   RMDir "$INSTDIR\plugins"
   RMDir "$INSTDIR\effects"
 
-
   ; Remove shortcuts, if any
   Delete "$SMPROGRAMS\@PROJECT_NAME_LONG@\*.*"