[Libreoffice-commits] .: config_host.mk.in configure.ac postprocess/signing
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Dec 7 00:41:06 PST 2012
config_host.mk.in | 1 +
configure.ac | 18 ++++++++++++++++++
postprocess/signing/makefile.mk | 8 ++++----
3 files changed, 23 insertions(+), 4 deletions(-)
New commits:
commit ebff822d9338eb8739922d5b18baef875ba8d966
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri Dec 7 09:40:39 2012 +0100
Add --enable-windows-build-signing option
Change-Id: I9630a486043c97aa9e31873c63f807cedb869a24
diff --git a/config_host.mk.in b/config_host.mk.in
index 04b1575..12a0752 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 add8364..8186eb6 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 b60fc2e..066927a 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
More information about the Libreoffice-commits
mailing list