Incremented TAP version number to 9.4.

Added SAMPCONF macros to settings.in and
openvpn.nsi to allow a default configuration
to be loaded by the installer.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@2656 e7ae566f-a301-0410-adde-c780ea21d3b5

1 files changed, 15 insertions, 6 deletions

diff --git a/install-win32/openvpn.nsi b/install-win32/openvpn.nsi
index 1c0e00e..add382f 100755
--- a/install-win32/openvpn.nsi
+++ b/install-win32/openvpn.nsi
@@ -28,12 +28,6 @@
 !define TAP "${PRODUCT_TAP_ID}"
 !define TAPDRV "${TAP}.sys"
 
-; something like "-DBG2"
-!define OUTFILE_LABEL ""
-
-; something like "DEBUG2"
-!define TITLE_LABEL ""
-
 ; Default service settings
 !define SERV_CONFIG_DIR   "$INSTDIR\config"
 !define SERV_CONFIG_EXT   "${PRODUCT_FILE_EXT}"
@@ -502,6 +496,21 @@ Section -post
   File "${HOME}\install-win32\license.txt"
   File "${HOME}\images\${PRODUCT_ICON}"
 
+  ; store sample config files
+!ifdef SAMPCONF_DIR
+  SetOverwrite on
+  SetOutPath "$INSTDIR\config"
+!ifdef SAMPCONF_CONF
+  File "${HOME}\..\${SAMPCONF_DIR}\${SAMPCONF_CONF}"
+!endif
+!ifdef SAMPCONF_P12
+  File "${HOME}\..\${SAMPCONF_DIR}\${SAMPCONF_P12}"
+!endif
+!ifdef SAMPCONF_TA
+  File "${HOME}\..\${SAMPCONF_DIR}\${SAMPCONF_TA}"
+!endif
+!endif
+
   ; Create file association if requested
   SectionGetFlags ${SecFileAssociation} $R0
   IntOp $R0 $R0 & ${SF_SELECTED}