sdext/Extension_minimizer.mk | 4 ++--
sdext/Extension_pdfimport.mk | 10 ++++++++--
sdext/Extension_presenter.mk | 4 ++--
sfx2/Library_qstart.mk | 1 -
solenv/gbuild/Extension.mk | 20 ++++++++++++++++++++
solenv/gbuild/TargetLocations.mk | 6 +++---
solenv/gbuild/UnoApi.mk | 2 +-
solenv/gbuild/UnoApiTarget.mk | 24 ++++++++++++++++++++++++
8 files changed, 60 insertions(+), 11 deletions(-)
New commits:
commit bd0973a2106cb99b56e20204de85750cc0c8f52e
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Jun 25 12:44:43 2012 +0200
Library_qstart.mk: remove -DDLL_NAME
The library is not called sfx2 but sfx, and it should really be using
gb_Library_get_runtime_filename, but it turns out DLL_NAME is not
actually used, so just remove it.
Change-Id: I553318015c3c2a21725860b28574995a8319a44b
(cherry picked from commit 7fb922b32b3fa612ebc8b7dfbc7e53ed990b40a0)
Signed-off-by: Michael Stahl <mst...@redhat.com>
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index aa0a549..a1372e5 100644
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_Library_use_api,qstart_gtk,\
))
$(eval $(call gb_Library_add_defs,qstart_gtk,\
- -DDLL_NAME=$(notdir $(call gb_Library_get_target,sfx2)) \
-DENABLE_QUICKSTART_APPLET \
))
commit e930aa48efa5cb7c31585b3e92e5550ed94e80be
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Jun 25 12:34:42 2012 +0200
gbuild: add gb_Extension_add_executable
This is not really necessary, but consistent.
Change-Id: Ic0249efac26c9977ede7ef591d517cc03542b002
(cherry picked from commit efb69f7c737f8f8dae876c8d6b7bf3968a40676d)
Signed-off-by: Michael Stahl <mst...@redhat.com>
diff --git a/sdext/Extension_pdfimport.mk b/sdext/Extension_pdfimport.mk
index 27841f5..c5692de 100644
--- a/sdext/Extension_pdfimport.mk
+++ b/sdext/Extension_pdfimport.mk
@@ -37,8 +37,11 @@ $(eval $(call gb_Extension_add_libraries,pdfimport,\
pdfimport \
))
+$(eval $(call gb_Extension_add_executables,pdfimport,\
+ xpdfimport \
+))
+
$(eval $(call gb_Extension_add_files,pdfimport,,\
- $(call gb_Executable_get_target,xpdfimport) \
$(SRCDIR)/sdext/source/pdfimport/config/pdf_import_filter.xcu \
$(SRCDIR)/sdext/source/pdfimport/config/pdf_types.xcu \
$(SRCDIR)/sdext/source/pdfimport/dialogs/xpdfimport_err.pdf \
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index a959a8f..86c1366 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -166,6 +166,16 @@ define gb_Extension_add_libraries
$(foreach lib,$(2),$(call gb_Extension_add_library,$(1),$(lib)))
endef
+# add an executable from the solver
+define gb_Extension_add_executable
+$(call gb_Extension_add_file,$(1),$(notdir $(call
gb_Executable_get_target,$(2))),\
+ $(call gb_Executable_get_target,$(2)))
+endef
+
+define gb_Extension_add_executables
+$(foreach exe,$(2),$(call gb_Extension_add_executable,$(1),$(exe)))
+endef
+
# localize .properties file
# source file is copied to $(WORKDIR)
define gb_Extension_localize_properties
commit cf6d37a8f4e45fc29e4b156acb098268048af6f6
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Jun 25 12:27:04 2012 +0200
fdo#51115: fix sdext extensions on Windows:
The sdext extensions contain the .lib link stub instead of DLLs;
add gb_Extension_add_library to get the correct DLL filename on Windows,
and use it in presenter screen, presentation minimizer and
PDF import extensions.
Change-Id: Ie8113a6002f9038e4df798edc255208977ba9497
(cherry picked from commit f0de66d9a541505e14261ffac08e021bce6b67ba)
Signed-off-by: Michael Stahl <mst...@redhat.com>
diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk
index 400c290..2e4d1ff 100644
--- a/sdext/Extension_minimizer.mk
+++ b/sdext/Extension_minimizer.mk
@@ -31,8 +31,8 @@ $(eval $(call
gb_Extension_Extension,presentation-minimizer,sdext/source/minimiz
$(eval $(call
gb_Extension_set_platform,presentation-minimizer,$(sdext_PLATFORM)))
-$(eval $(call gb_Extension_add_files,presentation-minimizer,,\
- $(call gb_Library_get_target,SunPresentationMinimizer) \
+$(eval $(call gb_Extension_add_libraries,presentation-minimizer,\
+ SunPresentationMinimizer \
))
$(eval $(call
gb_Extension_add_file,presentation-minimizer,components.rdb,$(call
gb_Rdb_get_target,minimizer)))
diff --git a/sdext/Extension_pdfimport.mk b/sdext/Extension_pdfimport.mk
index 0ecdff1..27841f5 100644
--- a/sdext/Extension_pdfimport.mk
+++ b/sdext/Extension_pdfimport.mk
@@ -33,9 +33,12 @@ $(eval $(call
gb_Extension_set_platform,pdfimport,$(sdext_PLATFORM)))
$(eval $(call gb_Extension_add_file,pdfimport,components.rdb,$(call
gb_Rdb_get_target,pdfimport)))
+$(eval $(call gb_Extension_add_libraries,pdfimport,\
+ pdfimport \
+))
+
$(eval $(call gb_Extension_add_files,pdfimport,,\
$(call gb_Executable_get_target,xpdfimport) \
- $(call gb_Library_get_target,pdfimport) \
$(SRCDIR)/sdext/source/pdfimport/config/pdf_import_filter.xcu \
$(SRCDIR)/sdext/source/pdfimport/config/pdf_types.xcu \
$(SRCDIR)/sdext/source/pdfimport/dialogs/xpdfimport_err.pdf \
diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
index 1311310..2a83712 100644
--- a/sdext/Extension_presenter.mk
+++ b/sdext/Extension_presenter.mk
@@ -31,8 +31,8 @@ $(eval $(call
gb_Extension_Extension,presenter-screen,sdext/source/presenter))
$(eval $(call gb_Extension_set_platform,presenter-screen,$(sdext_PLATFORM)))
-$(eval $(call gb_Extension_add_files,presenter-screen,,\
- $(call gb_Library_get_target,PresenterScreen) \
+$(eval $(call gb_Extension_add_libraries,presenter-screen,\
+ PresenterScreen \
))
$(eval $(call gb_Extension_add_file,presenter-screen,components.rdb,$(call
gb_Rdb_get_target,presenter)))
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 583a9a7..a959a8f 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -156,6 +156,16 @@ $(foreach file,$(3),$(call gb_Extension_add_file,$(1),$(if
$(strip $(2)),$(strip
endef
+# add a library from the solver; DO NOT use gb_Library_get_target
+define gb_Extension_add_library
+$(call gb_Extension_add_file,$(1),$(call
gb_Library_get_runtime_filename,$(2)),\
+ $(gb_Helper_OUTDIRLIBDIR)/$(call gb_Library_get_runtime_filename,$(2)))
+endef
+
+define gb_Extension_add_libraries
+$(foreach lib,$(2),$(call gb_Extension_add_library,$(1),$(lib)))
+endef
+
# localize .properties file
# source file is copied to $(WORKDIR)
define gb_Extension_localize_properties
commit ca226f6c3d62b70bed8d070f21db7960acfb6f62
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Jun 22 20:31:29 2012 +0200
gbuild: fix UnoApiTarget header dependencies:
The existing situtation of not having any explicit rules for header
files does not work because it requires a make restart after
the headers are generated in order for the headers to be delivered.
Because requiring running make twice to get a complete rebuild is bad,
add some rules to force the headers to be delivered immediately.
Change-Id: I5b4d5c8f8e9c9d7d0874fc797e62972eaa1dd904
(cherry picked from commit 55c37591b63a5e9e7c8537679db8e92c7f0161c0)
Signed-off-by: Michael Stahl <mst...@redhat.com>
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 5a86504..60290af 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -144,9 +144,9 @@ gb_SrsTemplatePartTarget_get_target =
$(WORKDIR)/SrsTemplatePartTarget/$(firstwo
gb_SrsTemplateTarget_get_include_dir =
$(WORKDIR)/SrsTemplatePartTarget/$(firstword $(subst /, ,$(1)))
gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1)
gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb
-gb_UnoApiHeadersTarget_get_bootstrap_dir =
$(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap
-gb_UnoApiHeadersTarget_get_comprehensive_dir =
$(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive
-gb_UnoApiHeadersTarget_get_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal
+gb_UnoApiHeadersTarget_get_bootstrap_dir =
$(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap$(2)
+gb_UnoApiHeadersTarget_get_comprehensive_dir =
$(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive$(2)
+gb_UnoApiHeadersTarget_get_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal$(2)
gb_UnoApiHeadersTarget_get_bootstrap_target =
$(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap.done
gb_UnoApiHeadersTarget_get_comprehensive_target =
$(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive.done
gb_UnoApiHeadersTarget_get_target =
$(WORKDIR)/UnoApiHeadersTarget/$(1)/normal.done
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 3619e9a..18f1128 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -62,7 +62,7 @@ endef
define gb_UnoApi__add_headerfile_impl
$(call gb_Package_add_file,$(1)_inc,inc/$(2),$(3))
-$(call gb_UnoApiHeadersTarget_add_headerfile,$(1),$(3))
+$(call gb_UnoApiHeadersTarget_add_headerfile,$(1),$(2),$(3))
endef
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 206bbb9..87fd57b 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -322,9 +322,33 @@ $(call gb_UnoApiHeadersTarget_get_target,$(1)) :
UNOAPI_DEPS :=
$(call gb_UnoApiHeadersTarget_get_bootstrap_target,$(1)) : UNOAPI_DEPS :=
$(call gb_UnoApiHeadersTarget_get_comprehensive_target,$(1)) : UNOAPI_DEPS :=
+# need dummy recipes so that header files are delivered in Package_inc;
+# otherwise make will consider the header to be up-to-date because it was
+# actually built by the recipe for gb_UnoApiHeadersTarget_get_target
+$(call gb_UnoApiHeadersTarget_get_dir,$(1),/%.hdl) :
+ touch $$@
+
+$(call gb_UnoApiHeadersTarget_get_dir,$(1),/%.hpp) :
+ touch $$@
+
+$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$(1),/%.hdl) :
+ touch $$@
+
+$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$(1),/%.hpp) :
+ touch $$@
+
+$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$(1),/%.hdl) :
+ touch $$@
+
+$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$(1),/%.hpp) :
+ touch $$@
+
endef
+# ensure that new urd triggers the dummy rule to rebuild the headers
define gb_UnoApiHeadersTarget_add_headerfile
+$(call gb_UnoApiHeadersTarget_get_dir,$(1),/$(3)) : \
+ $(call gb_UnoApiPartTarget_get_target,$(basename $(2)).urd)
endef
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
