From f9ad66c789308d99576ca5d28b1bedf973957ab2 Mon Sep 17 00:00:00 2001
From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Tue, 6 Mar 2007 06:48:09 +0000
Subject: Changes to Windows build environment, to allow straightforward
 building directly from an svn checkout or export.

install-win32/version.nsi contains high-level version info.

The script install-win32/winconfig should be run initially to set up
build configuration files.

Then make can be executed as such:

   . autodefs/nsidefs.sh
   make -f makefile.w32 -j 2


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1757 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 install-win32/preconfig.patch | 76 -------------------------------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 install-win32/preconfig.patch

(limited to 'install-win32/preconfig.patch')

diff --git a/install-win32/preconfig.patch b/install-win32/preconfig.patch
deleted file mode 100644
index 62bb895..0000000
--- a/install-win32/preconfig.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- 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"
-- 
cgit v1.2.3