OpenVPN/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2025-05-09 05:31:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Incremented TAP version number to 9.4.

Browse Source 
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
This commit is contained in:
james 2008-01-23 05:03:57 +00:00
parent a032fcb7bc
commit 2f775b1a17
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
install-win32/openvpn.nsi
View File

@ -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}

16
install-win32/settings.in
View File

@ -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"