diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2005-12-30 04:44:42 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2005-12-30 04:44:42 +0000 |
| commit | 183f59203316ae8066b678f0f3d47cf40ba7bf41 (patch) | |
| tree | 684c814a836fc0e084add09cb72d671c4d388b3b | |
| parent | Fixed bug with tls-auth and key-direction parameter (diff) | |
| download | openvpn-183f59203316ae8066b678f0f3d47cf40ba7bf41.tar.xz | |
Added patch to modify openvpn.nsi for building
a turnkey installer.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@866 e7ae566f-a301-0410-adde-c780ea21d3b5
| -rw-r--r-- | install-win32/preconfig.patch | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/install-win32/preconfig.patch b/install-win32/preconfig.patch new file mode 100644 index 0000000..62bb895 --- /dev/null +++ b/install-win32/preconfig.patch @@ -0,0 +1,76 @@ +--- openvpn.nsi 2005-12-27 19:34:10.000000000 -0700 ++++ planet.nsi 2005-12-29 16:00:41.253252888 -0700 +@@ -19,11 +19,19 @@ + !define TAP "tap0801" + !define TAPDRV "${TAP}.sys" + ++# PRECONFIG ++ + ; something like "-DBG2" +-!define OUTFILE_LABEL "" ++!define OUTFILE_LABEL "-PC" + + ; something like "DEBUG2" +-!define TITLE_LABEL "" ++!define TITLE_LABEL "Planet" ++ ++!define PRECONFIG_DIR "..\..\preconfig" ++!define GUI_EXE "openvpn-gui-1.0.3.exe" ++!define CONFIG_FILE "planet.ovpn" ++ ++# END PRECONFIG + + ; Default service settings + !define SERV_CONFIG_DIR "$INSTDIR\config" +@@ -188,6 +196,10 @@ + + File "${HOME}\openvpn.exe" + ++# PRECONFIG ++ File "${PRECONFIG_DIR}\${GUI_EXE}" ++# END PRECONFIG ++ + SectionEnd + + Section "OpenVPN RSA Certificate Management Scripts" SecOpenVPNEasyRSA +@@ -222,6 +234,10 @@ + + SetOutPath "$INSTDIR\config" + ++# PRECONFIG ++ File "${PRECONFIG_DIR}\${CONFIG_FILE}" ++# END PRECONFIG ++ + FileOpen $R0 "$INSTDIR\config\README.txt" w + FileWrite $R0 "This directory should contain OpenVPN configuration files$\r$\n" + FileWrite $R0 "each having an extension of .${SERV_CONFIG_EXT}$\r$\n" +@@ -422,8 +438,16 @@ + !insertmacro WriteRegStringIfUndef HKCR "OpenVPNFile\shell\run" "" "Start OpenVPN on this config file" + !insertmacro WriteRegStringIfUndef HKCR "OpenVPNFile\shell\run\command" "" '"$INSTDIR\bin\openvpn.exe" --pause-exit --config "%1"' + +- ; Create start menu shortcuts to addtap.bat and deltapall.bat + noass: ++ ++# PRECONFIG ++ ; Create GUI shortcut ++ IfFileExists "$INSTDIR\bin\${GUI_EXE}" "" nogui ++ CreateShortCut "$SMPROGRAMS\OpenVPN\OpenVPN GUI.lnk" "$INSTDIR\bin\${GUI_EXE}" "" ++ nogui: ++# END PRECONFIG ++ ++ ; Create start menu shortcuts to addtap.bat and deltapall.bat + IfFileExists "$INSTDIR\bin\addtap.bat" "" trydeltap + CreateShortCut "$SMPROGRAMS\OpenVPN\Add a new TAP-Win32 virtual ethernet adapter.lnk" "$INSTDIR\bin\addtap.bat" "" + +@@ -513,6 +537,11 @@ + + RMDir /r $SMPROGRAMS\OpenVPN + ++# PRECONFIG ++ Delete "$INSTDIR\config\${CONFIG_FILE}" ++ Delete "$INSTDIR\bin\${GUI_EXE}" ++# END PRECONFIG ++ + Delete "$INSTDIR\bin\openvpn.exe" + Delete "$INSTDIR\bin\openvpnserv.exe" + Delete "$INSTDIR\bin\libeay32.dll" |