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>
(cherry picked from commit 4382b4a0d536cbefa672cd470b3cc57953028960)

ticket: 7319
status: resolved

diff --git a/src/windows/installer/wix/config.wxi b/src/windows/installer/wix/config.wxi
index 3bb1cc95cd156fd840117e2b3b751b802c313525..806fe36f21d124487b2f9d736cb267458ff0c259 100644 (file)
--- 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 5ff2bd427405d62de8031a990aef7804e9837c40..46e51b90af8df38b4d293b816a7de9f5e7281763 100644 (file)
--- 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="2"?> <!-- Numeric Beta identifier -->
     <!-- <?define OldHelp?> --> <!-- Specifies the use of the old leash32.hlp file