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
9555b5bd
Kaydet (Commit)
9555b5bd
authored
Haz 14, 2013
tarafından
Matúš Kukan
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Add gengal to RepositoryFixes and autoinstall it.
Change-Id: I935fb9fd2620447f9aba9142b7db896e6fe31133
üst
944f3a6c
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
27 additions
and
48 deletions
+27
-48
Repository.mk
Repository.mk
+4
-2
RepositoryExternal.mk
RepositoryExternal.mk
+1
-7
RepositoryFixes.mk
RepositoryFixes.mk
+1
-0
AutoInstall.mk
scp2/AutoInstall.mk
+1
-1
macros.inc
scp2/inc/macros.inc
+8
-0
file_ooo.scp
scp2/source/ooo/file_ooo.scp
+0
-11
module_hidden_ooo.scp
scp2/source/ooo/module_hidden_ooo.scp
+0
-1
Gallery.mk
solenv/gbuild/Gallery.mk
+2
-2
pre_BuildTools.mk
solenv/gbuild/extensions/pre_BuildTools.mk
+1
-8
Executable_gengal.bin.mk
svx/Executable_gengal.bin.mk
+9
-16
No files found.
Repository.mk
Dosyayı görüntüle @
9555b5bd
...
...
@@ -73,8 +73,11 @@ $(eval $(call gb_Helper_register_executables,SDK, \
) \
))
$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
$(if $(filter DESKTOP,$(BUILD_TYPE)),gengal) \
))
$(eval $(call gb_Helper_register_executables,OOO, \
$(if $(filter DESKTOP,$(BUILD_TYPE)),gengal.bin) \
gnome-open-url.bin \
$(if $(filter YES,$(ENABLE_NPAPI_INTO_BROWSER)),nsplugin) \
$(if $(filter MACOSX,$(OS)),officeloader) \
...
...
@@ -93,7 +96,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg.bin) \
$(if $(filter WNT,$(OS)), \
crashrep_com \
gengal \
gcc-wrapper \
g++-wrapper \
guiloader \
...
...
RepositoryExternal.mk
Dosyayı görüntüle @
9555b5bd
...
...
@@ -2805,7 +2805,7 @@ endef
# Better duplication with gb_Gallery__UNO_COMPONENTS than nothing.
# This is used to determine what we need for 'build' platform.
define gb_Executable__register_gengal
_impl
define gb_Executable__register_gengal
$(call gb_Executable_add_runtime_dependencies,$(1),\
$(foreach component, \
comphelper/util/comphelp \
...
...
@@ -2836,12 +2836,6 @@ $(call gb_Executable_add_runtime_dependencies,$(1),\
)
endef
ifeq ($(OS),WNT)
gb_Executable__register_gengal = $(call gb_Executable__register_gengal_impl,gengal)
else
gb_Executable__register_gengal.bin = $(call gb_Executable__register_gengal_impl,gengal.bin)
endif
ifneq ($(SYSTEM_ICU),YES)
define gb_Executable__register_gendict
...
...
RepositoryFixes.mk
Dosyayı görüntüle @
9555b5bd
...
...
@@ -23,6 +23,7 @@ gb_Executable_FILENAMES := $(foreach group,$(gb_Executable_VALIDGROUPS),\
$(foreach exe,$(gb_Executable_$(group)),$(exe):$(exe)$(gb_Executable_EXT)))
gb_Executable_FILENAMES := $(patsubst uno:uno,uno:uno.bin,$(gb_Executable_FILENAMES))
gb_Executable_FILENAMES := $(patsubst gengal:gengal,gengal:gengal.bin,$(gb_Executable_FILENAMES))
gb_Executable_FILENAMES_FOR_BUILD := $(subst $(gb_Executable_EXT),$(gb_Executable_EXT_for_build),$(gb_Executable_FILENAMES))
...
...
scp2/AutoInstall.mk
Dosyayı görüntüle @
9555b5bd
...
...
@@ -17,7 +17,7 @@ $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE
,LIBO_EXECUTABLE
))
$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
...
...
scp2/inc/macros.inc
Dosyayı görüntüle @
9555b5bd
...
...
@@ -453,6 +453,14 @@ End
Styles
=
(
PACKED
,
VERSION_INDEPENDENT_COMP_ID
);
\
End
#define LIBO_EXECUTABLE(id,name) \
File
id
\
BIN_FILE_BODY
;
\
Dir
=
gid_Brand_Dir_Program
;
\
Name
=
name
;
\
Styles
=
(
PACKED
);
\
End
#define GALLERY_NAME(id) \
#define GALLERY_FILELIST(id) \
...
...
scp2/source/ooo/file_ooo.scp
Dosyayı görüntüle @
9555b5bd
...
...
@@ -128,17 +128,6 @@ File gid_File_Exe_Nsplugin
End
#endif
File gid_File_Bin_Gengal
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
#ifdef UNX
Name = "gengal.bin";
#else
Name = "gengal.exe";
#endif
End
File gid_File_Bin_UIPreviewer
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
...
...
scp2/source/ooo/module_hidden_ooo.scp
Dosyayı görüntüle @
9555b5bd
...
...
@@ -84,7 +84,6 @@ Module gid_Module_Root_Files_2
Files = (gid_File_shell_scripts,
gid_File_Bin_Pluginapp,
gid_File_Bin_Senddoc,
gid_File_Bin_Gengal,
gid_File_Script_Gengal,
gid_File_Bin_Spadmin_Bin,
gid_File_Bin_Uri_Encode,
...
...
solenv/gbuild/Gallery.mk
Dosyayı görüntüle @
9555b5bd
...
...
@@ -65,7 +65,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \
SAL_USE_VCLPLUGIN=svp \
)) \
$(call gb_Executable_get_command,
$(gb_GENGAL)
,$(ICECREAM_RUN)) \
$(call gb_Executable_get_command,
gengal
,$(ICECREAM_RUN)) \
$(call gb_Gallery__make_env_args) \
--build-tree \
--destdir $(GALLERY_BASEDIR) \
...
...
@@ -105,7 +105,7 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(call gb_Gallery_get_target,%) : \
$(call gb_Executable_get_runtime_dependencies,
$(gb_GENGAL)
) \
$(call gb_Executable_get_runtime_dependencies,
gengal
) \
$(gb_Gallery_EXTRA_DEPENCENCIES)
$(call gb_Gallery__command,$@,$*)
...
...
solenv/gbuild/extensions/pre_BuildTools.mk
Dosyayı görüntüle @
9555b5bd
...
...
@@ -7,13 +7,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
ifeq (,$(filter WNT,$(OS_FOR_BUILD)))
gb_GENGAL = gengal.bin
else # windows appends the .exe
gb_GENGAL = gengal
endif
# Tools we need to build for cross-compiling
gb_BUILD_TOOLS = \
$(foreach executable, \
...
...
@@ -44,7 +37,7 @@ gb_BUILD_TOOLS = \
ulfex \
xrmex \
$(call gb_Helper_optional_for_host,DESKTOP, \
$(gb_GENGAL)
\
gengal
\
HelpIndexer \
HelpLinker \
) \
...
...
svx/Executable_gengal.bin.mk
Dosyayı görüntüle @
9555b5bd
...
...
@@ -17,26 +17,19 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
ifeq ($(OS),WNT)
svx_GENGALBIN := gengal
else
svx_GENGALBIN := gengal.bin
endif
$(eval $(call gb_Executable_Executable,$(svx_GENGALBIN)))
$(eval $(call gb_Executable_Executable,gengal))
$(eval $(call gb_Executable_set_include,
$(svx_GENGALBIN)
,\
$(eval $(call gb_Executable_set_include,
gengal
,\
$$(INCLUDE) \
-I$(SRCDIR)/svx/inc/ \
-I$(SRCDIR)/svx/inc/pch \
))
$(eval $(call gb_Executable_use_external,
$(svx_GENGALBIN)
,boost_headers))
$(eval $(call gb_Executable_use_external,
gengal
,boost_headers))
$(eval $(call gb_Executable_use_sdk_api,
$(svx_GENGALBIN)
))
$(eval $(call gb_Executable_use_sdk_api,
gengal
))
$(eval $(call gb_Executable_use_libraries,
$(svx_GENGALBIN)
,\
$(eval $(call gb_Executable_use_libraries,
gengal
,\
basegfx \
sal \
tl \
...
...
@@ -51,16 +44,16 @@ $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\
$(gb_UWINAPI) \
))
$(eval $(call gb_Executable_add_exception_objects,
$(svx_GENGALBIN)
,\
$(eval $(call gb_Executable_add_exception_objects,
gengal
,\
svx/source/gengal/gengal \
))
$(eval $(call gb_Executable_use_static_libraries,
$(svx_GENGALBIN)
,\
$(eval $(call gb_Executable_use_static_libraries,
gengal
,\
vclmain \
))
ifeq ($(OS),WNT)
$(eval $(call gb_Executable_use_system_win32_libs,
$(svx_GENGALBIN)
,\
$(eval $(call gb_Executable_use_system_win32_libs,
gengal
,\
kernel32 \
msvcrt \
oldnames \
...
...
@@ -69,7 +62,7 @@ $(eval $(call gb_Executable_use_system_win32_libs,$(svx_GENGALBIN),\
endif
ifeq ($(OS),LINUX)
$(eval $(call gb_Executable_add_libs,
$(svx_GENGALBIN)
,\
$(eval $(call gb_Executable_add_libs,
gengal
,\
-ldl \
-lpthread \
))
...
...
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