Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
4a271bf4
Kaydet (Commit)
4a271bf4
authored
Nis 08, 2012
tarafından
David Tardon
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
gbuild: "use" vs. "add"
üst
2283607f
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
81 additions
and
27 deletions
+81
-27
UnoApiMerge_types.mk
offapi/UnoApiMerge_types.mk
+2
-2
UnoApi_offapi.mk
offapi/UnoApi_offapi.mk
+1
-1
UnoApi_oovbaapi.mk
oovbaapi/UnoApi_oovbaapi.mk
+1
-1
InternalUnoApi_scaddins.mk
scaddins/InternalUnoApi_scaddins.mk
+2
-2
InternalUnoApi.mk
solenv/gbuild/InternalUnoApi.mk
+19
-7
UnoApi.mk
solenv/gbuild/UnoApi.mk
+13
-4
UnoApiMerge.mk
solenv/gbuild/UnoApiMerge.mk
+16
-3
UnoApiTarget.mk
solenv/gbuild/UnoApiTarget.mk
+26
-6
UnoApiMerge_uretypes.mk
udkapi/UnoApiMerge_uretypes.mk
+1
-1
No files found.
offapi/UnoApiMerge_types.mk
Dosyayı görüntüle @
4a271bf4
...
...
@@ -28,12 +28,12 @@
$(eval $(call gb_UnoApiMerge_UnoApiMerge,types))
$(eval $(call gb_UnoApiMerge_
add_rdbfiles
,types,\
$(eval $(call gb_UnoApiMerge_
use_api
,types,\
udkapi \
offapi \
))
$(eval $(call gb_UnoApiMerge_
add
_reference_rdbfile,types,\
$(eval $(call gb_UnoApiMerge_
set
_reference_rdbfile,types,\
offapi/type_reference/types \
))
...
...
offapi/UnoApi_offapi.mk
Dosyayı görüntüle @
4a271bf4
...
...
@@ -28,7 +28,7 @@
$(eval $(call gb_UnoApi_UnoApi,offapi))
$(eval $(call gb_UnoApi_
add
_api,offapi,\
$(eval $(call gb_UnoApi_
use
_api,offapi,\
udkapi \
))
...
...
oovbaapi/UnoApi_oovbaapi.mk
Dosyayı görüntüle @
4a271bf4
...
...
@@ -28,7 +28,7 @@
$(eval $(call gb_UnoApi_UnoApi,oovbaapi))
$(eval $(call gb_UnoApi_
add
_api,oovbaapi,\
$(eval $(call gb_UnoApi_
use
_api,oovbaapi,\
udkapi \
offapi \
))
...
...
scaddins/InternalUnoApi_scaddins.mk
Dosyayı görüntüle @
4a271bf4
...
...
@@ -27,12 +27,12 @@
$(eval $(call gb_InternalUnoApi_InternalUnoApi,scaddins))
$(eval $(call gb_InternalUnoApi_
add
_api,scaddins,\
$(eval $(call gb_InternalUnoApi_
use
_api,scaddins,\
offapi \
udkapi \
))
$(eval $(call gb_InternalUnoApi_
add
_api_dependencies,scaddins,offapi,\
$(eval $(call gb_InternalUnoApi_
define
_api_dependencies,scaddins,offapi,\
udkapi \
))
...
...
solenv/gbuild/InternalUnoApi.mk
Dosyayı görüntüle @
4a271bf4
...
...
@@ -45,7 +45,7 @@ $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
$(call gb_UnoApiTarget_set_root,$(1)_out,/)
$(call gb_UnoApiTarget_set_root,$(1),UCR)
$(call gb_UnoApiTarget_merge_
rdbfile
,$(1),$(1)_out)
$(call gb_UnoApiTarget_merge_
api
,$(1),$(1)_out)
$(call gb_InternalUnoApi_get_target,$(1)) :| $(dir $(call gb_InternalUnoApi_get_target,$(1))).dir
$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)_out)
...
...
@@ -68,15 +68,23 @@ $(call gb_UnoApiTarget_add_idlfiles,$(1)_out,$(2),$(3))
endef
define gb_InternalUnoApi__
add
_api
$(call gb_UnoApiHeadersTarget_
add_rdbfile
,$(1),$(2))
define gb_InternalUnoApi__
use
_api
$(call gb_UnoApiHeadersTarget_
use_api
,$(1),$(2))
$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2))
endef
define gb_InternalUnoApi_add_api
$(foreach rdb,$(2),$(call gb_InternalUnoApi__add_api,$(1),$(rdb)))
$$(call gb_Output_error,gb_InternalUnoApi_add_api: use gb_InternalUnoApi_use_api instead.)
endef
define gb_InternalUnoApi_use_api
$(foreach rdb,$(2),$(call gb_InternalUnoApi__use_api,$(1),$(rdb)))
endef
define gb_InternalUnoApi_add_api_dependency
$$(call gb_Output_error,gb_InternalUnoApi_add_api_dependency: use gb_InternalUnoApi_define_api_dependency instead.)
endef
# Express that the rdb $(2) depends on rdb $(3).
...
...
@@ -89,13 +97,17 @@ endef
# I suppose it would be possible to store the list of required rdbs for
# a rdb to a file and then load it when headers' generation is requested,
# but it feels like overkill...
define gb_InternalUnoApi_
add
_api_dependency
$(call gb_UnoApiHeadersTarget_
add_rdbfile
,$(2),$(3))
define gb_InternalUnoApi_
define
_api_dependency
$(call gb_UnoApiHeadersTarget_
use_api
,$(2),$(3))
endef
define gb_InternalUnoApi_add_api_dependencies
$(foreach dep,$(3),$(call gb_InternalUnoApi_add_api_dependency,$(1),$(2),$(dep)))
$$(call gb_Output_error,gb_InternalUnoApi_add_api_dependencies: use gb_InternalUnoApi_define_api_dependencies instead.)
endef
define gb_InternalUnoApi_define_api_dependencies
$(foreach dep,$(3),$(call gb_InternalUnoApi_define_api_dependency,$(1),$(2),$(dep)))
endef
...
...
solenv/gbuild/UnoApi.mk
Dosyayı görüntüle @
4a271bf4
...
...
@@ -130,19 +130,28 @@ $(foreach idl,$(3),$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)/$(idl)))
endef
define gb_UnoApi__
add
_api
$(call gb_UnoApiHeadersTarget_
add_rdbfile
,$(1),$(2))
define gb_UnoApi__
use
_api
$(call gb_UnoApiHeadersTarget_
use_api
,$(1),$(2))
$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApi_get_target,$(2))
endef
define gb_UnoApi_add_api
$(foreach rdb,$(2),$(call gb_UnoApi__add_api,$(1),$(rdb)))
$$(call gb_Output_error,gb_UnoApi_add_api: use gb_UnoApi_use_api instead.)
endef
define gb_UnoApi_use_api
$(foreach rdb,$(2),$(call gb_UnoApi__use_api,$(1),$(rdb)))
endef
define gb_UnoApi_add_reference_rdbfile
$(call gb_UnoApiTarget_add_reference_rdbfile,$(1),$(2))
$$(call gb_Output_error,gb_UnoApi_add_reference_rdbfile: use gb_UnoApi_set_reference_rdbfile instead.)
endef
define gb_UnoApi_set_reference_rdbfile
$(call gb_UnoApiTarget_set_reference_rdbfile,$(1),$(2))
endef
...
...
solenv/gbuild/UnoApiMerge.mk
Dosyayı görüntüle @
4a271bf4
...
...
@@ -45,17 +45,30 @@ $$(eval $$(call gb_Module_register_target,$(call gb_UnoApiMerge_get_target,$(1))
endef
define gb_UnoApiMerge_add_rdbfile
$(call gb_UnoApiTarget_merge_rdbfile,$(1),$(2))
$$(call gb_Output_error,gb_UnoApiMerge_add_rdbfile: use gb_UnoApiMerge_use_api instead.)
endef
define gb_UnoApiMerge__use_api
$(call gb_UnoApiTarget_merge_api,$(1),$(2))
endef
define gb_UnoApiMerge_add_rdbfiles
$(foreach rdb,$(2),$(call gb_UnoApiMerge_add_rdbfile,$(1),$(rdb)))
$$(call gb_Output_error,gb_UnoApiMerge_add_rdbfiles: use gb_UnoApiMerge_use_api instead.)
endef
define gb_UnoApiMerge_use_api
$(foreach rdb,$(2),$(call gb_UnoApiMerge__use_api,$(1),$(rdb)))
endef
define gb_UnoApiMerge_add_reference_rdbfile
$(call gb_UnoApiTarget_add_reference_rdbfile,$(1),$(2))
$$(call gb_Output_error,gb_UnoApiMerge_add_reference_rdbfile: use gb_UnoApiMerge_set_reference_rdbfile instead.)
endef
define gb_UnoApiMerge_set_reference_rdbfile
$(call gb_UnoApiTarget_set_reference_rdbfile,$(1),$(2))
endef
...
...
solenv/gbuild/UnoApiTarget.mk
Dosyayı görüntüle @
4a271bf4
...
...
@@ -223,11 +223,19 @@ $(call gb_UnoApiTarget__add_idlfile,$(1),$(2),$(3))
endef
define gb_UnoApiTarget_merge_rdbfiles
$(foreach rdb,$(2),$(call gb_UnoApiTarget_merge_rdbfile,$(1),$(rdb)))
$$(call gb_Output_error,gb_UnoApiTarget_merge_rdbfiles: use gb_UnoApiTarget_merge_api instead.)
endef
define gb_UnoApiTarget_merge_api
$(foreach rdb,$(2),$(call gb_UnoApiTarget__merge_api,$(1),$(rdb)))
endef
define gb_UnoApiTarget_merge_rdbfile
$$(call gb_Output_error,gb_UnoApiTarget_merge_rdbfile: use gb_UnoApiTarget_merge_api instead.)
endef
define gb_UnoApiTarget__merge_api
$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE += $(call gb_UnoApiTarget_get_target,$(2))
$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2))
...
...
@@ -242,6 +250,10 @@ $(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_XMLRDB)
endef
define gb_UnoApiTarget_add_reference_rdbfile
$$(call gb_Output_error,gb_UnoApiTarget_add_reference_rdbfile: use gb_UnoApiTarget_set_reference_rdbfile instead.)
endef
define gb_UnoApiTarget_set_reference_rdbfile
$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(SRCDIR)/$(strip $(2)).rdb
endef
...
...
@@ -311,21 +323,29 @@ define gb_UnoApiHeadersTarget_add_headerfile
endef
define gb_UnoApiHeadersTarget__
add_rdbfile
define gb_UnoApiHeadersTarget__
use_api_for_target
$(call gb_UnoApiHeadersTarget_get_$(3),$(1)) : $(call gb_UnoApiTarget_get_target,$(2))
$(call gb_UnoApiHeadersTarget_get_$(3),$(1)) : UNOAPI_DEPS += -X$(call gb_UnoApiTarget_get_target,$(2))
endef
define gb_UnoApiHeadersTarget_add_rdbfile
$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),target)
$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),bootstrap_target)
$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),comprehensive_target)
$$(call gb_Output_error,gb_UnoApiHeadersTarget_add_rdbfile: use gb_UnoApiHeadersTarget_use_api instead.)
endef
define gb_UnoApiHeadersTarget__use_api
$(call gb_UnoApiHeadersTarget__use_api_for_target,$(1),$(2),target)
$(call gb_UnoApiHeadersTarget__use_api_for_target,$(1),$(2),bootstrap_target)
$(call gb_UnoApiHeadersTarget__use_api_for_target,$(1),$(2),comprehensive_target)
endef
define gb_UnoApiHeadersTarget_add_rdbfiles
$(foreach rdb,$(2),$(call gb_UnoApiHeadersTarget_add_rdbfile,$(1),$(rdb)))
$$(call gb_Output_error,gb_UnoApiHeadersTarget_add_rdbfiles: use gb_UnoApiHeadersTarget_use_api instead.)
endef
define gb_UnoApiHeadersTarget_use_api
$(foreach rdb,$(2),$(call gb_UnoApiHeadersTarget__use_api,$(1),$(rdb)))
endef
...
...
udkapi/UnoApiMerge_uretypes.mk
Dosyayı görüntüle @
4a271bf4
...
...
@@ -28,7 +28,7 @@
$(eval $(call gb_UnoApiMerge_UnoApiMerge,ure/types))
$(eval $(call gb_UnoApiMerge_
add_rdbfiles
,ure/types,\
$(eval $(call gb_UnoApiMerge_
use_api
,ure/types,\
udkapi \
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment