[26937] in CVS-changelog-for-Kerberos-V5
krb5 commit: Use env to determine config in installer build
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Wed Aug 29 14:56:10 2012
Date: Wed, 29 Aug 2012 14:55:52 -0400
From: Benjamin Kaduk <kaduk@mit.edu>
Message-Id: <201208291855.q7TItqlx015905@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/4382b4a0d536cbefa672cd470b3cc57953028960
commit 4382b4a0d536cbefa672cd470b3cc57953028960
Author: Kevin Wasserman <kevin.wasserman@painless-security.com>
Date: Thu Jul 26 06:57:35 2012 -0400
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
src/windows/installer/wix/config.wxi | 8 ++++++++
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 3bb1cc9..806fe36 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 80defd9..c3ebc02 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
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
