CDM Server as win32 service - installer improvements

diff --git a/src/main/installer/win32/setup.nsi b/src/main/installer/win32/setup.nsi
index 653af699fc95fa47f4522df685b4fc1a703c9602..2aa48ab4ba2e03f18651954c1f478bb0abeea347 100644 (file)
--- a/src/main/installer/win32/setup.nsi
+++ b/src/main/installer/win32/setup.nsi
@@ -1,6 +1,8 @@
 # Auto-generated by EclipseNSIS Script Wizard\r
 # 28.10.2010 13:58:54\r
 \r
+# TODO : preserve $INSTDIR/.cdmLibrary from being deleted if the user desides to keep it, or just warn the user.\r
+\r
 Name "EDIT CDM-Server"\r
 \r
 # General Symbol Definitions\r
@@ -18,6 +20,7 @@ Name "EDIT CDM-Server"
 !define OUT_FOLDER "..\..\..\..\dist"\r
 !define JAR_FILE_NAME "cdm-server-${VERSION}.jar"\r
 !define JAR_FILE "..\..\..\..\target\${JAR_FILE_NAME}"\r
+!define CDMLIBRARY_TEMPLATE "..\templates\.cdmLibrary"\r
 \r
 # Reserved Files\r
 ReserveFile "${NSISDIR}\Plugins\StartMenu.dll"\r
@@ -57,8 +60,10 @@ Section -Main SEC0000
     SetOutPath $INSTDIR\r
     SetOverwrite on\r
     File /r /x .svn /x *.log /x *.jar program-folder\* \r
-    SetOutPath "$INSTDIR\lib"\r
+    File /r /x .svn ${CDMLIBRARY_TEMPLATE}\r
     File ${JAR_FILE}\r
+    SetOverwrite off\r
+    SetOutPath "$INSTDIR\lib"\r
     WriteRegStr HKLM "${REGKEY}\Components" Main 1\r
 SectionEnd\r
 \r