[Libreoffice-commits] .: 2 commits - desktop/Executable_crashrep.com.mk desktop/Executable_soffice.bin.mk desktop/Executable_unopkg.com.mk desktop/Package_manifest.mk desktop/util

[Jan Holesovsky]

 desktop/Executable_crashrep.com.mk |   26 ++++++++++----------------
 desktop/Executable_soffice.bin.mk  |    1 -
 desktop/Executable_unopkg.com.mk   |   24 +++++++++---------------
 desktop/Package_manifest.mk        |    2 --
 desktop/util/Makefile              |    4 ++--
 5 files changed, 21 insertions(+), 36 deletions(-)

New commits:
commit b0ddd564c178e0d61040d7b059dccc10e031532d
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Sep 22 12:48:27 2011 +0200

    Fix manifest creation in the MinGW case (and hopefully not breaking native).

diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index d9b5f21..aec58c5 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_Executable_add_noexception_objects,$(sofficebin),\
 # the resulting executable is called soffice_bin.exe, copy it to soffice.bin
 $(eval $(call gb_Package_Package,$(sofficebin),$(OUTDIR)/bin))
 $(eval $(call gb_Package_add_file,$(sofficebin),bin/soffice.bin,$(sofficebin).exe))
-$(eval $(call gb_Package_add_file,$(sofficebin),bin/soffice.bin.manifest,$(sofficebin).exe.manifest))
 
 endif
 
diff --git a/desktop/Package_manifest.mk b/desktop/Package_manifest.mk
index 9e1fb5b..a8d17de 100644
--- a/desktop/Package_manifest.mk
+++ b/desktop/Package_manifest.mk
@@ -31,6 +31,4 @@ $(eval $(call gb_CustomTarget_add_outdir_dependencies,desktop/util,\
     $(OUTDIR)/bin/soffice.bin \
 ))
 
-$(eval $(call gb_Package_add_file,desktop_manifest,$(OUTDIR)/bin/soffice.bin.manifest,sofficebin.manifest))
-
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/util/Makefile b/desktop/util/Makefile
index 5e72a41..ff5c9d4 100644
--- a/desktop/util/Makefile
+++ b/desktop/util/Makefile
@@ -25,9 +25,9 @@
 
 DESTDIR := $(WORKDIR)/CustomTarget/desktop/util
 
-ifeq ($(COM),MSC)
+ifeq ($(OS_FOR_BUILD)$(COM),WNTMSC)
 
-$(DESTDIR)/linker.manifest : $(OUTDIR)/bin/soffice.bin
+$(DESTDIR)/linker.manifest : $(OUTDIR)/bin/soffice_bin.exe
 	mkdir -p $(DESTDIR) && mt.exe -inputresource:$< -out:$@
 
 $(OUTDIR)/bin/soffice.bin.manifest : $(DESTDIR)/linker.manifest $(SRCDIR)/desktop/util/template.manifest
commit 919ce6a9b83daebc0dc5b787ce748f6d6899d51f
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Sep 22 12:45:18 2011 +0200

    Unify the MinGW / native Win temporary name here.

diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk
index 45e8410..858ab10 100644
--- a/desktop/Executable_crashrep.com.mk
+++ b/desktop/Executable_crashrep.com.mk
@@ -23,37 +23,31 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-ifeq ($(OS_FOR_BUILD),WNT)
-crashrepcom := crashrep_com
-else
-crashrepcom := crashrep.com
-endif
+$(eval $(call gb_Executable_Executable,crashrep_com))
 
-$(eval $(call gb_Executable_Executable,$(crashrepcom)))
+$(eval $(call gb_Executable_set_targettype_gui,crashrep_com,NO))
 
-$(eval $(call gb_Executable_set_targettype_gui,$(crashrepcom),NO))
+$(eval $(call gb_Executable_add_precompiled_header,crashrep_com,desktop/inc/pch/precompiled_desktop.hxx))
 
-$(eval $(call gb_Executable_add_precompiled_header,$(crashrepcom),desktop/inc/pch/precompiled_desktop.hxx))
-
-$(eval $(call gb_Executable_set_include,$(crashrepcom),\
+$(eval $(call gb_Executable_set_include,crashrep_com,\
     $$(INCLUDE) \
     -I$(SRCDIR)/desktop/inc/pch \
 ))
 
-$(eval $(call gb_Executable_add_defs,$(crashrepcom),\
+$(eval $(call gb_Executable_add_defs,crashrep_com,\
     $(LFS_CFLAGS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,$(crashrepcom),\
+$(eval $(call gb_Executable_add_linked_libs,crashrep_com,\
     user32 \
 ))
 
-$(eval $(call gb_Executable_add_exception_objects,$(crashrepcom),\
+$(eval $(call gb_Executable_add_exception_objects,crashrep_com,\
     desktop/win32/source/guistdio/guistdio \
 ))
 
-# the resulting executable is called $(crashrepcom).exe, copy it to crashrep.com
-$(eval $(call gb_Package_Package,$(crashrepcom),$(OUTDIR)/bin))
-$(eval $(call gb_Package_add_file,$(crashrepcom),bin/crashrep.com,$(crashrepcom).exe))
+# the resulting executable is called crashrep_com.exe, copy it to crashrep.com
+$(eval $(call gb_Package_Package,crashrep_com,$(OUTDIR)/bin))
+$(eval $(call gb_Package_add_file,crashrep_com,bin/crashrep.com,crashrep_com.exe))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_unopkg.com.mk b/desktop/Executable_unopkg.com.mk
index 54106bb..ee73509 100644
--- a/desktop/Executable_unopkg.com.mk
+++ b/desktop/Executable_unopkg.com.mk
@@ -23,33 +23,27 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-ifeq ($(OS_FOR_BUILD),WNT)
-unopkgcom := unopkg_com
-else
-unopkgcom := unopkg.com
-endif
+$(eval $(call gb_Executable_Executable,unopkg_com))
 
-$(eval $(call gb_Executable_Executable,$(unopkgcom)))
+$(eval $(call gb_Executable_set_targettype_gui,unopkg_com,NO))
 
-$(eval $(call gb_Executable_set_targettype_gui,$(unopkgcom),NO))
+$(eval $(call gb_Executable_add_precompiled_header,unopkg_com,desktop/inc/pch/precompiled_desktop.hxx))
 
-$(eval $(call gb_Executable_add_precompiled_header,$(unopkgcom),desktop/inc/pch/precompiled_desktop.hxx))
-
-$(eval $(call gb_Executable_set_include,$(unopkgcom),\
+$(eval $(call gb_Executable_set_include,unopkg_com,\
     $$(INCLUDE) \
     -I$(SRCDIR)/desktop/inc/pch \
 ))
 
-$(eval $(call gb_Executable_add_defs,$(unopkgcom),\
+$(eval $(call gb_Executable_add_defs,unopkg_com,\
     $(LFS_CFLAGS) \
 ))
 
-$(eval $(call gb_Executable_add_exception_objects,$(unopkgcom),\
+$(eval $(call gb_Executable_add_exception_objects,unopkg_com,\
     desktop/win32/source/guistdio/unopkgio \
 ))
 
-# the resulting executable is called $(unopkgcom).exe, copy it to unopkg.com
-$(eval $(call gb_Package_Package,$(unopkgcom),$(OUTDIR)/bin))
-$(eval $(call gb_Package_add_file,$(unopkgcom),bin/unopkg.com,$(unopkgcom).exe))
+# the resulting executable is called unopkg_com.exe, copy it to unopkg.com
+$(eval $(call gb_Package_Package,unopkg_com,$(OUTDIR)/bin))
+$(eval $(call gb_Package_add_file,unopkg_com,bin/unopkg.com,unopkg_com.exe))
 
 # vim: set ts=4 sw=4 et: