Windows: Installers are optional

diff --git a/packages/windows/installer/NTMakefile b/packages/windows/installer/NTMakefile
index d95b1e2d3f427362104d4034e38bea1e6d3586b4..ac1be409abed57129cd67f3743a66bdcbdfb4139 100644 (file)
--- a/packages/windows/installer/NTMakefile
+++ b/packages/windows/installer/NTMakefile
@@ -33,6 +33,8 @@ RELDIR=packages\windows\installer
 
 !include ../../../windows/NTMakefile.w32
 
+!ifdef BUILD_INSTALLERS
+
 VERSIOND=$(VER_PRODUCT_MAJOR)-$(VER_PRODUCT_MINOR)-$(VER_PRODUCT_AUX)-$(VER_PRODUCT_PATCH)
 VERSION=$(VER_PRODUCT_MAJOR).$(VER_PRODUCT_MINOR).$(VER_PRODUCT_AUX).$(VER_PRODUCT_PATCH)
 POLPREFIX=policy.$(VER_PRODUCT_MAJOR).$(VER_PRODUCT_MINOR)
@@ -143,3 +145,5 @@ all:: $(INSTALLER)
 
 clean::
        -$(RM) $(INSTALLER)
+
+!endif                         # BUILD_INSTALLERS

diff --git a/windows/NTMakefile.config b/windows/NTMakefile.config
index 2f2bfa106bf90b8b355731c8f7d0cee1208a0b88..f2334ca59c2895132f091b1d1561f9d30dbd1507 100644 (file)
--- a/windows/NTMakefile.config
+++ b/windows/NTMakefile.config
@@ -99,3 +99,8 @@ DIR_hdbdir=%{COMMON_APPDATA}/heimdal/hdb
 
 # Enable weak crypto
 WEAK_CRYPTO=1
+
+# Disable build of installers
+!ifndef NO_INSTALLERS
+BUILD_INSTALLERS=1
+!endif

diff --git a/windows/NTMakefile.w32 b/windows/NTMakefile.w32
index 7367c09dbd7f7c818b8b08d043388b5a8235b606..c5dc2c14e068319779f6f3986405de9fe3de48b7 100644 (file)
--- a/windows/NTMakefile.w32
+++ b/windows/NTMakefile.w32
@@ -239,8 +239,18 @@ RC2RES = $(RC2RES_C) -fo $@ $**
 
 !ifndef RECURSE
 
+REQUIRED_TOOLS= \
+       "$(AWK_CMD)" "$(YACC_CMD)" "$(LEX_CMD)" "$(PYTHON)" "$(PERL)" \
+       "$(CMP)" "$(SED)" "$(SIGNTOOL)" "$(MAKECAT)" "$(MAKEINFO)" "$(HHC)"
+
+!ifdef BUILD_INSTALLERS
+REQUIRED_TOOLS=$(REQUIRED_TOOLS) "$(CANDLE_CMD)" "$(LIGHT_CMD)"
+!endif
+
+OPTIONAL_TOOLS="$(SH)" 
+
 check-utils:
-       @for %%g in ( "$(AWK_CMD)" "$(YACC_CMD)" "$(LEX_CMD)" "$(PYTHON)" "$(PERL)" "$(CMP)" "$(SED)" "$(SIGNTOOL)" "$(MAKECAT)" "$(CANDLE_CMD)" "$(LIGHT_CMD)" "$(MAKEINFO)" "$(HHC)") do @( \
+       @for %%g in ( $(REQUIRED_TOOLS) ) do @( \
        for /f %%f in ( "%%g" ) do @( \
                if exist %%f @( \
                        echo Found %%f \
@@ -252,13 +262,13 @@ check-utils:
                ) \
        ) \
        )
-       @for %%g in ( "$(SH)" ) do @( \
+       @for %%g in ( $(OPTIONAL_TOOLS) ) do @( \
        for /f %%f in ( "%%g" ) do @( \
                if exist %%f @( \
                        echo Found %%f \
                ) else if "%%~$$PATH:f"=="" @( \
                        echo Could not find %%f in PATH && \
-                       echo Test targets may fail. \
+                       echo Optional targets may fail. \
                ) else @( \
                        echo Found %%~$$PATH:f \
                ) \