diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2008-01-23 05:03:57 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2008-01-23 05:03:57 +0000 |
| commit | 2f775b1a17cbc4a0ac6a95db582d9993a368cd42 (patch) | |
| tree | 27a8be92479c65371367fe8b95fa261366b94097 | |
| parent | Added --management-forget-disconnect option -- forget (diff) | |
| download | openvpn-2f775b1a17cbc4a0ac6a95db582d9993a368cd42.tar.xz | |
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
Diffstat (limited to '')
| -rwxr-xr-x | install-win32/openvpn.nsi | 21 | ||||
| -rw-r--r-- | install-win32/settings.in | 16 |
2 files changed, 29 insertions, 8 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} diff --git a/install-win32/settings.in b/install-win32/settings.in index 517236a..2239790 100644 --- a/install-win32/settings.in +++ b/install-win32/settings.in @@ -42,8 +42,8 @@ !define PRODUCT_TAP_PROVIDER "TAP-Win32 Provider V9" !define PRODUCT_TAP_ID "tap0901" !define PRODUCT_TAP_MAJOR_VER 9 -!define PRODUCT_TAP_MINOR_VER 3 -!define PRODUCT_TAP_RELDATE "04/18/2007" +!define PRODUCT_TAP_MINOR_VER 4 +!define PRODUCT_TAP_RELDATE "01/22/2008" ; visible=0x81 hidden=0x89 !define PRODUCT_TAP_CHARACTERISTICS 0x81 @@ -73,3 +73,15 @@ # do a make clean before make !define MAKE_CLEAN "yes" + +; DEBUGGING -- set to something like "-DBG2" +!define OUTFILE_LABEL "-T2" + +; DEBUGGING -- set to something like "DEBUG2" +!define TITLE_LABEL "TEST2" + +# include a sample configuration file and key +!define SAMPCONF_DIR "test-key" +!define SAMPCONF_CONF "test.ovpn" +!define SAMPCONF_P12 "test.p12" +!define SAMPCONF_TA "ta.key" |