diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2007-04-25 21:37:49 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2007-04-25 21:37:49 +0000 |
| commit | 657ecf14acc58a6d345341a5e36411bde5be9cd9 (patch) | |
| tree | 4f5a53feb9c26991d822e2e606de511f57e32be6 /install-win32/trans.pl | |
| parent | Forgot to add changelog item about OpenVPN GUI being (diff) | |
| download | openvpn-657ecf14acc58a6d345341a5e36411bde5be9cd9.tar.xz | |
TAP driver now passes signing tests on Vista x64.
Added new settings to settings.in to better control
build process.
Removed some unneeded JYFIXMEs from source code.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1874 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to '')
| -rw-r--r-- | install-win32/trans.pl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/install-win32/trans.pl b/install-win32/trans.pl index b275ea8..34fd207 100644 --- a/install-win32/trans.pl +++ b/install-win32/trans.pl @@ -7,9 +7,9 @@ # Input grammar: # (1) comments having ';' or '#' as the first char in the line # (2) a blank line -# (3) include "file" -# (4) define foo bar -# (5) define foo "bar" +# (3) !include "file" +# (4) !define foo bar +# (5) !define foo "bar" # # Environmental variables can be used to override a setting. # The special value "null" causes the variable to be undefined. @@ -25,6 +25,7 @@ sub comment { sub define { my ($name, $value) = @_; if ($mode eq "sh") { + $value="true" if !$value; print "[ -z \"\$$name\" ] && export $name=$value\n"; print "[ \"\$$name\" = \"$nulltag\" ] && unset $name\n"; } else { @@ -34,13 +35,12 @@ sub define { } if ($value ne $nulltag) { print "#define $name $value\n" if ($mode =~ /^(c|h)$/); - print "!define $name $value\n" if ($mode eq "nsi"); - print "define $name $value\n" if ($mode eq "in"); + print "!define $name $value\n" if ($mode =~ /^(nsi|in)$/); print "var $name=$value;\n" if ($mode eq "js"); } else { print "//#undef $name\n" if ($mode =~ /^(c|h)$/); print "#!undef $name\n" if ($mode eq "nsi"); - print ";undef $name\n" if ($mode eq "in"); + print ";!undef $name\n" if ($mode eq "in"); print "//undef $name\n" if ($mode eq "js"); } } @@ -60,9 +60,9 @@ sub include_file { print "\n"; } elsif (/^[#;](.*)$/) { comment ($1); - } elsif (/^define\s+(\w+)\s+(.+)$/) { + } elsif (/^!define\s+(\w+)(?:\s+(.*?))?\s*$/) { define ($1, $2); - } elsif (/^include\s+"(.+)"/) { + } elsif (/^!include\s+"(.+)"$/) { include_file ($1); } else { die "can't parse this line: $_\n"; |