diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-12-07 09:40:39 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-12-07 09:40:39 +0100 |
| commit | ebff822d9338eb8739922d5b18baef875ba8d966 (patch) | |
| tree | 87b4c715a24a0249c7591e88fbc6039ebed66029 | |
| parent | 549b5d030ab60dbf6d0279634b22702e70078dd8 (diff) | |
Add --enable-windows-build-signing option
Change-Id: I9630a486043c97aa9e31873c63f807cedb869a24
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | postprocess/signing/makefile.mk | 8 |
3 files changed, 23 insertions, 4 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 04b15757156f..12a075265996 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -583,6 +583,7 @@ export VISIO_CFLAGS=$(gb_SPACE)@VISIO_CFLAGS@ export VISIO_LIBS=$(gb_SPACE)@VISIO_LIBS@ export WATCH_WINDOW_EXTENSION_PACK=@WATCH_WINDOW_EXTENSION_PACK@ export WGET=@WGET@ +export WINDOWS_BUILD_SIGNING=@WINDOWS_BUILD_SIGNING@ export WINDOWS_SDK_HOME=@WINDOWS_SDK_HOME@ export WINDOWS_SDK_VERSION=@WINDOWS_SDK_VERSION@ export WINDRES=@WINDRES@ diff --git a/configure.ac b/configure.ac index add83643ea71..8186eb626f76 100644 --- a/configure.ac +++ b/configure.ac @@ -1059,6 +1059,11 @@ AC_ARG_ENABLE(release-build, See http://wiki.documentfoundation.org/DevBuild]), ,) +AC_ARG_ENABLE(windows-build-signing, + AS_HELP_STRING([--enable-windows-build-signing], + [Enable signing of windows binaries (*.exe, *.dll)]), +,) + AC_ARG_ENABLE(silent-msi, AS_HELP_STRING([--enable-silent-msi], [Enable MSI with LIMITUI=1 (silent install).]), @@ -2106,6 +2111,19 @@ fi AC_SUBST(ENABLE_RELEASE_BUILD) dnl =================================================================== +dnl Test whether to sign Windows Build +dnl =================================================================== +AC_MSG_CHECKING([whether to sign windows build]) +if test "$enable_windows_build_signing" = "yes" -a "$_os" = "WINNT" -a "$WITH_MINGW" != "YES" ; then + AC_MSG_RESULT([yes]) + WINDOWS_BUILD_SIGNING="TRUE" +else + AC_MSG_RESULT([no]) + WINDOWS_BUILD_SIGNING="FALSE" +fi +AC_SUBST(WINDOWS_BUILD_SIGNING) + +dnl =================================================================== dnl MacOSX build and runtime environment options dnl =================================================================== diff --git a/postprocess/signing/makefile.mk b/postprocess/signing/makefile.mk index b60fc2eb8f20..066927aa11b1 100644 --- a/postprocess/signing/makefile.mk +++ b/postprocess/signing/makefile.mk @@ -33,7 +33,7 @@ IMAGENAMES=$(SOLARBINDIR)$/*.dll $(SOLARBINDIR)$/so$/*.dll $(SOLARBINDIR)$/*.exe TIMESTAMPURL*="http://timestamp.verisign.com/scripts/timstamp.dll" signing.done : -.IF "$(VISTA_SIGNING)"!="" +.IF "$(WINDOWS_BUILD_SIGNING)"=="TRUE" .IF "$(COM)"=="MSC" .IF "$(product)"=="full" $(PERL) signing.pl -e $(EXCLUDELIST) -f $(PFXFILE) -p $(PFXPASSWORD) -t $(TIMESTAMPURL) $(IMAGENAMES) && $(TOUCH) $(MISC)$/signing.done @@ -43,9 +43,9 @@ signing.done : .ELSE # "$(GUI)"=="MSC" @echo Nothing to do, signing is Windows \(MSC\) only. .ENDIF # "$(GUI)"=="MSC" -.ELSE # "$(VISTA_SIGNING)"!="" - @echo Doing nothing. To switch on signing set VISTA_SIGNING=TRUE ... -.ENDIF # "$(VISTA_SIGNING)"!="" +.ELSE # "$(WINDOWS_BUILD_SIGNING)"=="TRUE" + @echo Doing nothing. Windows build signing is disabled ... +.ENDIF # "$(WINDOWS_BUILD_SIGNING)"=="TRUE" .INCLUDE : target.mk |