diff options
| author | Kevin Wasserman <kevin.wasserman@painless-security.com> | 2012-07-26 06:57:35 -0400 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2012-08-29 14:50:19 -0400 |
| commit | 4382b4a0d536cbefa672cd470b3cc57953028960 (patch) | |
| tree | a295f8d41e5831ac9cc210a8249ad0e9e46b7dae /src/windows | |
| parent | 9ae1e4ee6df9ffd90f2627e2abce6a2ceac285cc (diff) | |
| download | krb5-4382b4a0d536cbefa672cd470b3cc57953028960.tar.gz krb5-4382b4a0d536cbefa672cd470b3cc57953028960.tar.xz krb5-4382b4a0d536cbefa672cd470b3cc57953028960.zip | |
Use env to determine config in installer build
Use NODEBUG and DEBUG_SYMBOL from the environment to determine whether or
not to define Debug and DebugSyms for the installer build.
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
ticket: 7319 (new)
queue: kfw
target_version: 1.10.4
tags: pullup
Diffstat (limited to 'src/windows')
| -rw-r--r-- | src/windows/installer/wix/config.wxi | 8 | ||||
| -rw-r--r-- | src/windows/installer/wix/site-local.wxi | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/windows/installer/wix/config.wxi b/src/windows/installer/wix/config.wxi index 3bb1cc95cd..806fe36f21 100644 --- a/src/windows/installer/wix/config.wxi +++ b/src/windows/installer/wix/config.wxi @@ -64,6 +64,14 @@ <?include lang\config_$(var.BuildLang).wxi?> <!-- Parameters for the features containing debug symbols --> + <?ifdef env.NODEBUG?> + <?ifdef env.DEBUG_SYMBOL?> + <?define DebugSyms?> + <?endif?> + <?else?> + <?define Debug?> + <?define DebugSyms?> + <?endif?> <?ifdef DebugSyms?> <?ifdef Debug?> <?define DebugSymInstallDefault="followParent"?> diff --git a/src/windows/installer/wix/site-local.wxi b/src/windows/installer/wix/site-local.wxi index 80defd94a0..c3ebc02b07 100644 --- a/src/windows/installer/wix/site-local.wxi +++ b/src/windows/installer/wix/site-local.wxi @@ -52,13 +52,8 @@ <!-- At most one of the following could be defined and must correspond to the type of build performed. --> - <?define Debug?> <!--<?define Release?>--> - <!-- We are including debug symbols anyway. Undefine this for a leaner - installer without debug syms. --> - <?define DebugSyms?> - <!-- Optional defines --> <!-- <?define Beta="1"?> --> <!-- Numeric Beta identifier --> <!-- <?define OldHelp?> --> <!-- Specifies the use of the old leash32.hlp file |