diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2007-04-25 22:58:21 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2007-04-25 22:58:21 +0000 |
| commit | 52d84f6eaf811749c965d1634f781c9f7c12d5eb (patch) | |
| tree | f12efcc7600c7b192cc74662d13ccd7a11ba9e81 /install-win32 | |
| parent | 657ecf14acc58a6d345341a5e36411bde5be9cd9 (diff) | |
| download | openvpn-52d84f6eaf811749c965d1634f781c9f7c12d5eb.tar.gz openvpn-52d84f6eaf811749c965d1634f781c9f7c12d5eb.tar.xz openvpn-52d84f6eaf811749c965d1634f781c9f7c12d5eb.zip | |
misc Windows build system changes
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1875 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'install-win32')
| -rw-r--r-- | install-win32/dosname.pl | 2 | ||||
| -rw-r--r-- | install-win32/maketapinstall | 4 | ||||
| -rwxr-xr-x | install-win32/openvpn.nsi | 4 | ||||
| -rw-r--r-- | install-win32/settings.in | 3 |
4 files changed, 12 insertions, 1 deletions
diff --git a/install-win32/dosname.pl b/install-win32/dosname.pl index 5bfa6b9..a678e66 100644 --- a/install-win32/dosname.pl +++ b/install-win32/dosname.pl @@ -1,5 +1,7 @@ #!/usr/bin/perl +# convert a unix filename to a DOS filename + while ($unixname = shift(@ARGV)) { $unixname =~ s#^/([a-zA-Z])(/|$)#$1:\\#g; $unixname =~ s#/#\\#g; diff --git a/install-win32/maketapinstall b/install-win32/maketapinstall index 1ebc220..781380e 100644 --- a/install-win32/maketapinstall +++ b/install-win32/maketapinstall @@ -22,6 +22,10 @@ if [ -z "$DRVBINSRC" ] ; then rm -rf tapinstall cp -a "$TISRC" tapinstall + if [ -e tapinstall/sources.in ]; then + perl install-win32/ifdef.pl autodefs/defs.in <tapinstall/sources.in >tapinstall/sources + fi + cd tapinstall t=`pwd` cd .. diff --git a/install-win32/openvpn.nsi b/install-win32/openvpn.nsi index 275cb19..5cbef9b 100755 --- a/install-win32/openvpn.nsi +++ b/install-win32/openvpn.nsi @@ -606,10 +606,12 @@ Section "Uninstall" RMDir /r $SMPROGRAMS\${PRODUCT_NAME} - Delete "$INSTDIR\bin\${PRODUCT_UNIX_NAME}.exe" !ifdef OPENVPN_GUI_DEFINED Delete "$INSTDIR\bin\${OPENVPN_GUI}" + Delete "$DESKTOP\${PRODUCT_NAME} GUI.lnk" !endif + + Delete "$INSTDIR\bin\${PRODUCT_UNIX_NAME}.exe" Delete "$INSTDIR\bin\${PRODUCT_UNIX_NAME}serv.exe" Delete "$INSTDIR\bin\libeay32.dll" Delete "$INSTDIR\bin\libssl32.dll" diff --git a/install-win32/settings.in b/install-win32/settings.in index f65a756..0840a56 100644 --- a/install-win32/settings.in +++ b/install-win32/settings.in @@ -47,6 +47,9 @@ ; visible=0x81 hidden=0x89 !define PRODUCT_TAP_CHARACTERISTICS 0x81 +# hide tap warning +;!define PRODUCT_TAP_HIDE_WARN + # Build debugging version of TAP driver ;!define PRODUCT_TAP_DEBUG |