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
c1bd2a25
Kaydet (Commit)
c1bd2a25
authored
Kas 10, 2011
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
New LO_{LIB,JAVA}_DIR make special inbuild component handling superfluous.
üst
32e173b8
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
33 additions
and
37 deletions
+33
-37
makefile.mk
cppuhelper/qa/propertysetmixin/makefile.mk
+2
-2
Makefile
i18npool/source/localedata/Makefile
+3
-3
makefile.mk
pyuno/source/loader/makefile.mk
+1
-1
common_brand.scp
scp2/source/ooo/common_brand.scp
+16
-0
ComponentTarget.mk
solenv/gbuild/ComponentTarget.mk
+0
-12
CppunitTest.mk
solenv/gbuild/CppunitTest.mk
+1
-1
Jar.mk
solenv/gbuild/Jar.mk
+1
-2
Library.mk
solenv/gbuild/Library.mk
+3
-4
RdbTarget.mk
solenv/gbuild/RdbTarget.mk
+2
-4
TargetLocations.mk
solenv/gbuild/TargetLocations.mk
+0
-2
settings.mk
solenv/inc/settings.mk
+4
-6
No files found.
cppuhelper/qa/propertysetmixin/makefile.mk
Dosyayı görüntüle @
c1bd2a25
...
...
@@ -135,7 +135,7 @@ test .PHONY: $(SHL1TARGETN) $(SHL2TARGETN) $(MISC)/$(TARGET)/$(TARGET).uno.jar \
'-env:UNO_SERVICES=$(my_file)$(SOLARXMLDIR)/ure/services.rdb $(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb'
\
-env
:
URE_INTERNAL_LIB_DIR=$(my_file)$(SOLARSHAREDBIN)
\
-env:URE_INTERNAL_JAVA_DIR=$(my_file)$(SOLARBINDIR)
\
-env:
OOO_INBUILD_SHARED
LIB_DIR=$(my_file)$(PWD)/$(DLLDEST)
\
-env:
OOO_INBUILD_JAR
_DIR=$(my_file)$(PWD)/$(MISC)/$(TARGET)
-env:
LO_
LIB_DIR=$(my_file)$(PWD)/$(DLLDEST)
\
-env:
LO_JAVA
_DIR=$(my_file)$(PWD)/$(MISC)/$(TARGET)
.END
i18npool/source/localedata/Makefile
Dosyayı görüntüle @
c1bd2a25
...
...
@@ -31,7 +31,7 @@ all : $(patsubst %.xml,localedata_%.cxx,$(notdir $(wildcard $(SRC_ROOT)/i18npool
include
$(GBUILDDIR)/gbuild_simple.mk
my_file
:=
file://
$
(
if
$
(
filter
$(OS_FOR_BUILD)
,WNT
)
,/
)
my_components
:=
component/sax/source/expatwrap/expwrap.
inbuild.
component
my_components
:=
component/sax/source/expatwrap/expwrap.component
localedata_%.cxx
:
localedata_%_invis.cxx
sed
's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/'
$<
>
$@
...
...
@@ -40,11 +40,11 @@ localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data)
ifeq
($(OS_FOR_BUILD),WNT)
$(gb_Helper_execute)saxparser
$*
`cygpath
-m
$<`
$@
\
$(my_file)`cygpath
-m
$(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb`
`cygpath
-m
$(OUTDIR)/bin/types.rdb`
\
-env
:
OOO_INBUILD_SHARED
LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin`
-env
:
LO_
LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin`
else
$(gb_Helper_execute)saxparser
$*
$<
$@
\
$(my_file)$(WORKDIR_FOR_BUILD)/CustomTarget/i18npool/source/localedata/saxparser.rdb
$(OUTDIR_FOR_BUILD)/bin/types.rdb
\
-env
:
OOO_INBUILD_SHARED
LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib
-env
:
LO_
LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib
endif
saxparser.rdb
:
saxparser.input
...
...
pyuno/source/loader/makefile.mk
Dosyayı görüntüle @
c1bd2a25
...
...
@@ -90,5 +90,5 @@ ALLTAR : $(MISC)/pythonloader.component
$(MISC)/pythonloader.component .ERRREMOVE
:
\
$(SOLARENV)/bin/createcomponent.xslt pythonloader.component
$(XSLTPROC)
--nonet
--stringparam
uri
\
'
vnd.sun.star.expand:$$BRAND_BASE_DIR/program/
$(SHL1TARGETN:f)'
\
'
$(COMPONENTPREFIX_BASIS_NATIVE)
$(SHL1TARGETN:f)'
\
-o
$@
$(SOLARENV)
/bin/createcomponent.xslt pythonloader.component
scp2/source/ooo/common_brand.scp
Dosyayı görüntüle @
c1bd2a25
...
...
@@ -1115,6 +1115,22 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir
Value = "${ORIGIN}/..";
End
ProfileItem gid_Brand_Profileitem_Fundamental_Lo_Lib_Dir
ModuleID = gid_Module_Root_Brand;
ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap";
Key = "LO_LIB_DIR";
Value = "${BRAND_BASE_DIR}/program";
End
ProfileItem gid_Brand_Profileitem_Fundamental_Lo_Java_Dir
ModuleID = gid_Module_Root_Brand;
ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap";
Key = "LO_JAVA_DIR";
Value = "${BRAND_BASE_DIR}/program/classes";
End
ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions
ModuleID = gid_Module_Root_Brand;
ProfileID = gid_Brand_Profile_Fundamental_Ini;
...
...
solenv/gbuild/ComponentTarget.mk
Dosyayı görüntüle @
c1bd2a25
...
...
@@ -43,16 +43,8 @@ $(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,$*) \
$(call gb_ComponentTarget_get_outdir_inbuild_target,$*) \
$(call gb_ComponentTarget_get_inbuild_target,$*) \
# creates 2 componentfiles: the first is for the installation set,
# the second is for using the component during the build.
# bit of a hack, hopefully inbuild can be removed when solver layout is fixed.
$(call gb_ComponentTarget_get_inbuild_target,%) : $(call gb_ComponentTarget_get_source,$(SRCDIR),%) | $(gb_XSLTPROCTARGET)
$(call gb_ComponentTarget__command,$@,$<,$*)
$(call gb_ComponentTarget_get_target,%) : $(call gb_ComponentTarget_get_source,$(SRCDIR),%) | $(gb_XSLTPROCTARGET)
$(call gb_ComponentTarget__command,$@,$<,$*)
...
...
@@ -65,12 +57,8 @@ $(call gb_ComponentTarget_get_outdir_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_inbuild_target,$(1)) : COMPONENTPREFIX := $(call gb_Library__get_layer_componentprefix,NONE)
$(call gb_ComponentTarget_get_inbuild_target,$(1)) : LIBFILENAME := $(3)
$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1))
$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)) : $(call gb_ComponentTarget_get_inbuild_target,$(1))
$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)),$(1))
$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)),$(call gb_ComponentTarget_get_inbuild_target,$(1)),$(1))
endef
...
...
solenv/gbuild/CppunitTest.mk
Dosyayı görüntüle @
c1bd2a25
...
...
@@ -73,7 +73,7 @@ $(if $(strip $(UNO_SERVICES)),\
$(foreach rdb,$(UNO_SERVICES),\
$(call gb_CppunitTarget__make_url,$(call gb_RdbTarget_get_target,$(rdb))))") \
$(if $(URE),\
$(foreach dir,URE_INTERNAL_LIB_DIR
BRAND_BASE
_DIR,\
$(foreach dir,URE_INTERNAL_LIB_DIR
LO_LIB
_DIR,\
-env:$(dir)=$(call gb_CppunitTarget__make_url,$(gb_CppunitTest_LIBDIR))))
endef
...
...
solenv/gbuild/Jar.mk
Dosyayı görüntüle @
c1bd2a25
...
...
@@ -164,10 +164,9 @@ endef
# possible directories for jar files containing UNO services
gb_Jar_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\d
BRAND_BASE_DIR/program/classes
/ \
OOO:vnd.sun.star.expand:\d
LO_JAVA_DIR
/ \
URE:vnd.sun.star.expand:\dURE_INTERNAL_JAVA_DIR/ \
OXT:./ \
INTERN:vnd.sun.star.expand:\dOOO_INBUILD_JAVA_DIR/
# get component prefix from layer name ("OOO", "URE", "OXT", "INTERN")
gb_Jar__get_componentprefix = \
...
...
solenv/gbuild/Library.mk
Dosyayı görüntüle @
c1bd2a25
...
...
@@ -81,8 +81,7 @@ define gb_Library_set_componentfile
$(call gb_ComponentTarget_ComponentTarget,$(or $(strip $(3)),$(strip $(2))),$(call gb_Library__get_componentprefix,$(1)),\
$(call gb_Library_get_runtime_filename,$(if $(MERGELIBS),$(if $(filter $(gb_MERGED_LIBS),$(1)),merged,$(1)),$(1))),$(2))
$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) : \
$(call gb_ComponentTarget_get_outdir_target,$(2)) \
$(call gb_ComponentTarget_get_outdir_inbuild_target,$(2))
$(call gb_ComponentTarget_get_outdir_target,$(2))
$(call gb_Library_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(or $(strip $(3)),$(strip $(2))))
endef
...
...
@@ -97,8 +96,8 @@ gb_Library__get_layer_componentprefix = \
$(call gb_Output_error,no ComponentTarget native prefix for layer '$(1)')))
gb_Library__COMPONENTPREFIXES := \
NONE:vnd.sun.star.expand:\d
OOO_INBUILD_SHARED
LIB_DIR/ \
OOO:vnd.sun.star.expand:\d
BRAND_BASE_DIR/program
/ \
NONE:vnd.sun.star.expand:\d
LO_
LIB_DIR/ \
OOO:vnd.sun.star.expand:\d
LO_LIB_DIR
/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
define gb_Library__forward_to_Linktarget
...
...
solenv/gbuild/RdbTarget.mk
Dosyayı görüntüle @
c1bd2a25
...
...
@@ -41,10 +41,8 @@ $(call gb_RdbTarget_get_target,%) :
$(gb_AWK) -- \
' BEGIN { RS=">"; } \
/^<\?xml version.*/ { next; } \
/.*[^\r\n\t\s].*/ { \
gsub(/vnd.sun.star.expand:\$$BRAND_BASE_DIR\/program/, "vnd.sun.star.expand:$$BRAND_BASE_DIR",$$0); \
print $$0 ">"; \
}' $(call gb_RdbTarget__get_rdbs,$(COMPONENTS),$(OLD_COMPONENTS)) \
/.*[^\r\n\t\s].*/ { print $$0 ">"; }' \
$(call gb_RdbTarget__get_rdbs,$(COMPONENTS),$(OLD_COMPONENTS)) \
>> $@ && \
echo '</components>' >> $@)
...
...
solenv/gbuild/TargetLocations.mk
Dosyayı görüntüle @
c1bd2a25
...
...
@@ -29,7 +29,6 @@
# outdir target pattern
gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
gb_ComponentTarget_get_outdir_inbuild_target = $(OUTDIR)/xml/component/$(1).inbuild.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_outdir_target = $(OUTDIR)/bin/$(1).oxt
...
...
@@ -71,7 +70,6 @@ gb_AsmObject_get_target = $(WORKDIR)/AsmObject/$(1).o
gb_CObject_get_target = $(WORKDIR)/CObject/$(1).o
gb_GenCObject_get_target = $(WORKDIR)/GenCObject/$(1).o
gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component
gb_ComponentTarget_get_inbuild_target = $(WORKDIR)/ComponentTarget/$(1).inbuild.component
gb_ComponentsTarget_get_target = $(WORKDIR)/ComponentsTarget/$(1).components
gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test
gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done
...
...
solenv/inc/settings.mk
Dosyayı görüntüle @
c1bd2a25
...
...
@@ -1358,13 +1358,11 @@ CPPUNIT_CFLAGS =
COMPONENTPREFIX_URE_NATIVE = vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/
COMPONENTPREFIX_URE_JAVA = vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/
COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$BRAND_BASE_DIR/program/
COMPONENTPREFIX_BASIS_JAVA = \
vnd.sun.star.expand:$$BRAND_BASE_DIR/program/classes/
COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$LO_LIB_DIR/
COMPONENTPREFIX_BASIS_JAVA = vnd.sun.star.expand:$$LO_JAVA_DIR/
COMPONENTPREFIX_BASIS_PYTHON = vnd.openoffice.pymodule:
COMPONENTPREFIX_INBUILD_NATIVE = \
vnd.sun.star.expand:$$OOO_INBUILD_SHAREDLIB_DIR/
COMPONENTPREFIX_INBUILD_JAVA = vnd.sun.star.expand:$$OOO_INBUILD_JAR_DIR/
COMPONENTPREFIX_INBUILD_NATIVE = vnd.sun.star.expand:$$LO_LIB_DIR/
COMPONENTPREFIX_INBUILD_JAVA = vnd.sun.star.expand:$$LO_JAVA_DIR/
COMPONENTPREFIX_EXTENSION = ./
# workaround for strange dmake bug:
...
...
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