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
85c6f801
Kaydet (Commit)
85c6f801
authored
May 23, 2013
tarafından
Matúš Kukan
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
use .component files directly from workdir
Change-Id: Idaf2e1c33dcdf060756b5739c4a8d904dbdc699b
üst
c154f180
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
36 additions
and
41 deletions
+36
-41
RepositoryExternal.mk
RepositoryExternal.mk
+2
-2
CustomTarget_localedata.mk
i18npool/CustomTarget_localedata.mk
+6
-21
Module_i18npool.mk
i18npool/Module_i18npool.mk
+1
-0
Rdb_saxparser.mk
i18npool/Rdb_saxparser.mk
+16
-0
ComponentTarget.mk
solenv/gbuild/ComponentTarget.mk
+1
-6
CppunitTest.mk
solenv/gbuild/CppunitTest.mk
+2
-2
Gallery.mk
solenv/gbuild/Gallery.mk
+2
-2
Jar.mk
solenv/gbuild/Jar.mk
+1
-2
Library.mk
solenv/gbuild/Library.mk
+1
-1
Pyuno.mk
solenv/gbuild/Pyuno.mk
+1
-1
Rdb.mk
solenv/gbuild/Rdb.mk
+2
-2
TargetLocations.mk
solenv/gbuild/TargetLocations.mk
+1
-2
No files found.
RepositoryExternal.mk
Dosyayı görüntüle @
85c6f801
...
...
@@ -2966,7 +2966,7 @@ $(call gb_Executable_add_runtime_dependencies,$(1),\
ucb/source/core/ucb1 \
ucb/source/ucp/file/ucpfile1 \
unoxml/source/service/unoxml \
,$(call gb_ComponentTarget_get_
outdir_
target_for_build,$(component))) \
,$(call gb_ComponentTarget_get_target_for_build,$(component))) \
$(call gb_AllLangResTarget_get_target,ofa) \
$(call gb_Configuration_get_target,registry) \
$(call gb_Configuration_get_target,fcfg_langpack) \
...
...
@@ -3016,9 +3016,9 @@ endef
# FIXME: the library target should be for build too
define gb_Executable__register_saxparser
$(call gb_Executable_add_runtime_dependencies,saxparser,\
$(call gb_ComponentTarget_get_outdir_target,sax/source/expatwrap/expwrap) \
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
$(call gb_Rdb_get_outdir_target_for_build,saxparser) \
$(call gb_Rdb_get_outdir_target_for_build,ure/services) \
$(call gb_UnoApi_get_target,udkapi) \
)
...
...
i18npool/CustomTarget_localedata.mk
Dosyayı görüntüle @
85c6f801
...
...
@@ -9,24 +9,21 @@
$(eval $(call gb_CustomTarget_CustomTarget,i18npool/localedata))
i18npool_LDDIR := $(call gb_CustomTarget_get_workdir,i18npool/localedata)
i18npool_LD_NAMES := $(basename $(notdir $(wildcard $(SRCDIR)/i18npool/source/localedata/data/*.xml)))
$(call gb_CustomTarget_get_target,i18npool/localedata) : \
$(foreach name,$(i18npool_LD_NAMES),$(i18npool_LDDIR)/localedata_$(name).cxx)
$(eval $(call gb_CustomTarget_register_targets,i18npool/localedata,\
$(foreach name,$(i18npool_LD_NAMES),localedata_$(name).cxx) \
))
define i18npool_LD_RULE
$(
i18npool_LDDIR
)/localedata_$(1).cxx : \
$(
call gb_CustomTarget_get_workdir,i18npool/localedata
)/localedata_$(1).cxx : \
$(SRCDIR)/i18npool/source/localedata/data/$(1).xml \
$(i18npool_LDDIR)/saxparser.rdb \
| $(call gb_Executable_get_runtime_dependencies,saxparser)
$$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),$(true),SAX,1)
$$(call gb_Helper_abbreviate_dirs, \
$(call gb_Helper_execute,saxparser) $(1) $$< $$@.tmp \
$(call gb_Helper_make_url,$(i18npool_LDDIR)/saxparser.rdb) \
-env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR) \
-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(i18npool_LDDIR)/saxparser.rdb)) \
-env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \
-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target_for_build,saxparser)) \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \
sed 's/\(^.*get[^;]*$$$$\)/SAL_DLLPUBLIC_EXPORT \1/' $$@.tmp > $$@ && \
rm $$@.tmp)
...
...
@@ -35,16 +32,4 @@ endef
$(foreach name,$(i18npool_LD_NAMES),$(eval $(call i18npool_LD_RULE,$(name))))
$(i18npool_LDDIR)/saxparser.rdb : $(i18npool_LDDIR)/saxparser.input \
$(SOLARENV)/bin/packcomponents.xslt \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),RDB,1)
$(call gb_Helper_abbreviate_dirs, \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet --stringparam prefix $(OUTDIR_FOR_BUILD)/xml/ \
-o $@ $(SOLARENV)/bin/packcomponents.xslt $<)
$(i18npool_LDDIR)/saxparser.input : $(call gb_ComponentTarget_get_outdir_target,sax/source/expatwrap/expwrap) | $(i18npool_LDDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
echo '<list><filename>component/sax/source/expatwrap/expwrap.component</filename></list>' > $@
# vim: set noet sw=4 ts=4:
i18npool/Module_i18npool.mk
Dosyayı görüntüle @
85c6f801
...
...
@@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_targets_for_build,i18npool,\
Executable_gendict \
Executable_genindex_data \
Executable_saxparser \
Rdb_saxparser \
))
$(eval $(call gb_Module_add_check_targets,i18npool,\
...
...
i18npool/Rdb_saxparser.mk
0 → 100644
Dosyayı görüntüle @
85c6f801
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Rdb_Rdb,saxparser))
$(eval $(call gb_Rdb_add_components,saxparser,\
sax/source/expatwrap/expwrap \
))
# vim:set noet sw=4 ts=4:
solenv/gbuild/ComponentTarget.mk
Dosyayı görüntüle @
85c6f801
...
...
@@ -38,8 +38,7 @@ endef
$(call gb_ComponentTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),CMP,1)
rm -f $(call gb_ComponentTarget_get_outdir_target,$*) \
$(call gb_ComponentTarget_get_target,$*) \
rm -f $(call gb_ComponentTarget_get_target,$*) \
# when a library is renamed, the component file needs to be rebuilt to match.
...
...
@@ -54,10 +53,6 @@ $(call gb_ComponentTarget_get_target,%) : \
define gb_ComponentTarget_ComponentTarget
$(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2)
$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3)
$(call gb_ComponentTarget_get_outdir_target,$(1)) : \
$(call gb_ComponentTarget_get_target,$(1)) \
| $(dir $(call gb_ComponentTarget_get_outdir_target,$(1))).dir
$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)),$(1))
endef
...
...
solenv/gbuild/CppunitTest.mk
Dosyayı görüntüle @
85c6f801
...
...
@@ -243,9 +243,9 @@ endef
define gb_CppunitTest_use_component
$(call gb_CppunitTest_get_target,$(1)) : \
$(call gb_ComponentTarget_get_
outdir_
target,$(2))
$(call gb_ComponentTarget_get_target,$(2))
$(call gb_CppunitTest_get_target,$(1)) : \
UNO_SERVICES += $(call gb_ComponentTarget_get_
outdir_
target,$(2))
UNO_SERVICES += $(call gb_ComponentTarget_get_target,$(2))
endef
...
...
solenv/gbuild/Gallery.mk
Dosyayı görüntüle @
85c6f801
...
...
@@ -35,7 +35,7 @@ gb_Gallery_TRANSLATE := $(SOLARENV)/bin/desktop-translate.pl
# TODO: this should be in RepositoryExternal.mk, but it would lead to
# duplication. Fix.
gb_Gallery_EXTRA_DEPENCENCIES := \
$(foreach component,$(gb_Gallery__UNO_COMPONENTS),$(call gb_ComponentTarget_get_
outdir_
target_for_build,$(component))) \
$(foreach component,$(gb_Gallery__UNO_COMPONENTS),$(call gb_ComponentTarget_get_target_for_build,$(component))) \
$(foreach api,$(gb_Gallery__UNO_TYPES),$(call gb_UnoApi_get_target,$(api)))
gb_Gallery_INSTDIR := share/gallery
...
...
@@ -47,7 +47,7 @@ define gb_Gallery__make_env_args
module:$(call gb_Helper_make_url,$(gb_Configuration_registry)/spool)" \
"-env:UNO_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target_for_build,ure/services)) \
$(foreach item,$(gb_Gallery__UNO_COMPONENTS),\
$(call gb_Helper_make_url,$(call gb_ComponentTarget_get_
outdir_
target_for_build,$(item))))" \
$(call gb_Helper_make_url,$(call gb_ComponentTarget_get_target_for_build,$(item))))" \
"-env:UNO_TYPES=$(foreach item,$(gb_Gallery__UNO_TYPES),\
$(call gb_Helper_make_url,$(call gb_UnoApi_get_target,$(item))))" \
$(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\
...
...
solenv/gbuild/Jar.mk
Dosyayı görüntüle @
85c6f801
...
...
@@ -301,8 +301,7 @@ gb_Jar__get_componentprefix = \
# layer must be specified explicitly in this macro (different to libraries)
define gb_Jar_set_componentfile
$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Jar__get_componentprefix,$(3)),$(notdir $(call gb_Jar_get_target,$(1))))
$(call gb_Jar_get_target,$(1)) : \
$(call gb_ComponentTarget_get_outdir_target,$(2))
$(call gb_Jar_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2))
$(call gb_Jar_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2))
endef
...
...
solenv/gbuild/Library.mk
Dosyayı görüntüle @
85c6f801
...
...
@@ -151,7 +151,7 @@ $(call gb_ComponentTarget_ComponentTarget,$(2),\
$(call gb_Library__get_componentprefix,$(gb_Library__get_name)),\
$(call gb_Library_get_runtime_filename,$(gb_Library__get_name)))
$(call gb_Library__get_final_target,$(gb_Library__get_name)) : \
$(call gb_ComponentTarget_get_
outdir_
target,$(2))
$(call gb_ComponentTarget_get_target,$(2))
$(call gb_ComponentTarget_get_target,$(2)) :| \
$(call gb_Library_get_target,$(gb_Library__get_name))
$(call gb_Library_get_clean_target,$(gb_Library__get_name)) : \
...
...
solenv/gbuild/Pyuno.mk
Dosyayı görüntüle @
85c6f801
...
...
@@ -60,7 +60,7 @@ gb_Pyuno__COMPONENTPREFIX := vnd.openoffice.pymodule:
define gb_Pyuno_set_componentfile_full
$(call gb_ComponentTarget_ComponentTarget,$(2),$(3),$(4))
$(call gb_Pyuno_get_target,$(1)) : $(call gb_ComponentTarget_get_
outdir_
target,$(2))
$(call gb_Pyuno_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2))
$(call gb_Pyuno_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2))
endef
...
...
solenv/gbuild/Rdb.mk
Dosyayı görüntüle @
85c6f801
...
...
@@ -12,7 +12,7 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
(\
echo '<list>' && \
$(foreach component,$(COMPONENTS),echo "<filename>$(call gb_ComponentTarget_get_
outdir_
target,$(component))</filename>" &&) \
$(foreach component,$(COMPONENTS),echo "<filename>$(call gb_ComponentTarget_get_target,$(component))</filename>" &&) \
echo '</list>' \
) > $(1).input && \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $(1) $(SOLARENV)/bin/packcomponents.xslt $(1).input && \
...
...
@@ -40,7 +40,7 @@ $(call gb_Helper_make_userfriendly_targets,$(1),Rdb,$(call gb_Rdb_get_outdir_tar
endef
define gb_Rdb_add_component
$(call gb_Rdb_get_target,$(1)) : $(call gb_ComponentTarget_get_
outdir_
target,$(2))
$(call gb_Rdb_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2))
$(call gb_Rdb_get_target,$(1)) : COMPONENTS += $(2)
endef
...
...
solenv/gbuild/TargetLocations.mk
Dosyayı görüntüle @
85c6f801
...
...
@@ -22,8 +22,6 @@
gb_CliLibrary_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliLibrary_EXT)
gb_CliNativeLibrary_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliNativeLibrary_EXT)
gb_CliUnoApi_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliUnoApi_EXT)
gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
gb_ComponentTarget_get_outdir_target_for_build = $(OUTDIR_FOR_BUILD)/xml/component/$(1).component
gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
gb_Executable_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT_for_build)
gb_Extension_get_target = $(OUTDIR)/bin/$(1).oxt
...
...
@@ -86,6 +84,7 @@ gb_CliNativeLibraryTarget_get_external_target = $(WORKDIR)/CliNativeLibraryTarge
gb_CliNativeLibraryTarget_get_target = $(WORKDIR)/CliNativeLibraryTarget/$(1)$(gb_CliNativeLibraryTarget_EXT)
gb_CliUnoApiTarget_get_target = $(WORKDIR)/CliUnoApiTarget/$(1)$(gb_CliUnoApiTarget_EXT)
gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component
gb_ComponentTarget_get_target_for_build = $(WORKDIR_FOR_BUILD)/ComponentTarget/$(1).component
gb_Configuration_get_preparation_target = $(WORKDIR)/Configuration/$(1).prepared
gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test
gb_CppunitTestFakeExecutable_get_target = \
...
...
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