[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in solenv/bin solenv/inc

[David Tardon]

 config_host.mk.in                                 |    1 +
 configure.in                                      |   16 ++++++++++++++++
 solenv/bin/modules/installer/windows/msiglobal.pm |    2 +-
 solenv/inc/tg_ext.mk                              |    2 +-
 4 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit a420516af36b3c7b6b657ffdef8cb0ef0a6ae1b4
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Apr 16 14:50:19 2012 +0200

    mingw: unbreak make check
    
    Even if it does nothing because there is no installation available .-)

diff --git a/config_host.mk.in b/config_host.mk.in
index 8ad7f5c..fe5fc87 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -525,6 +525,7 @@ export UPD=@UPD@
 export USE_FT_EMBOLDEN=@USE_FT_EMBOLDEN@
 export use_shl_version=@use_shl_version@
 export USE_XINERAMA=@USE_XINERAMA@
+export UUIDGEN=@UUIDGEN@
 export VALGRIND_CFLAGS=@VALGRIND_CFLAGS@
 export VALIDATOR_EXTENSION_PACK=@VALIDATOR_EXTENSION_PACK@
 export VERBOSE=@VERBOSE@
diff --git a/configure.in b/configure.in
index 624464a..1792d2b 100644
--- a/configure.in
+++ b/configure.in
@@ -8160,6 +8160,22 @@ fi
 AC_SUBST(WINDOWS_SDK_HOME)
 
 dnl =========================================
+dnl Check for uuidgen
+dnl =========================================
+if test "$_os" = "WINNT"; then
+    if test "$WITH_MINGW" = "yes"; then
+        AC_PATH_PROG([UUIDGEN], [uuid])
+        if test -z "$UUIDGEN"; then
+            AC_MSG_ERROR([uuid is needed for dev-install])
+        fi
+    else
+        # presence is already tested above in the WINDOWS_SDK_HOME check
+        UUIDGEN=uuidgen.exe
+        AC_SUBST(UUIDGEN)
+    fi
+fi
+
+dnl =========================================
 dnl Check for the Microsoft DirectX SDK.
 dnl =========================================
 if test -n "$ENABLE_DIRECTX" -a "$_os" = "WINNT"; then
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 52711c6..c6a70ff 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1266,7 +1266,7 @@ sub get_guid_list
 
     if ( $log ) { installer::logger::include_header_into_logfile("Generating $number GUID"); }
 
-    my $uuidgen = "uuidgen.exe";        # Has to be in the path
+    my $uuidgen = $ENV{'UUIDGEN'};        # Has to be in the path
 
     # "-c" for uppercase output
 
commit afbc8993bdff272eb6712333c89715c9a1de0533
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Apr 16 11:08:13 2012 +0200

    this is only for _building_ on windows

diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 9588456..9a25d7a 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -189,7 +189,7 @@ $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE)
     @echo no patch needed...
     $(COMMAND_ECHO)$(TOUCH) $@
 .ELSE			# "$(PATCH_FILES)"=="none" ||	"$(PATCH_FILES)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI_FOR_BUILD)"=="WNT"
     $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
 .ELSE           # "$(GUI)"=="WNT"
     $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)