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
4bab1f2d
Kaydet (Commit)
4bab1f2d
authored
Agu 02, 2014
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
scp2: move activex libs to AutoInstall
Change-Id: I08fac26859d97e3d7a60d3ba443c2d2ca039789b
üst
544fa45e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
47 deletions
+26
-47
Repository.mk
Repository.mk
+14
-2
AutoInstall.mk
scp2/AutoInstall.mk
+2
-0
InstallModule_activex.mk
scp2/InstallModule_activex.mk
+4
-6
file_activex.scp
scp2/source/activex/file_activex.scp
+0
-36
module_activex.scp
scp2/source/activex/module_activex.scp
+6
-3
No files found.
Repository.mk
Dosyayı görüntüle @
4bab1f2d
...
...
@@ -607,6 +607,20 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexbina
) \
))
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activex, \
$(if $(DISABLE_ACTIVEX),,\
so_activex \
) \
))
ifneq ($(BUILD_X64),)
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexwin64, \
$(if $(DISABLE_ACTIVEX),,\
so_activex_x64 \
) \
))
endif
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooobinarytable, \
$(if $(WINDOWS_SDK_HOME),\
instooofiltmsi \
...
...
@@ -636,8 +650,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
fop \
jfregca \
regpatchactivex \
so_activex \
so_activex_x64 \
thidxmsi \
))
endif
...
...
scp2/AutoInstall.mk
Dosyayı görüntüle @
4bab1f2d
...
...
@@ -10,6 +10,8 @@
$(eval $(call gb_AutoInstall_AutoInstall))
$(eval $(call gb_AutoInstall_add_module,activexbinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,activex,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,activexwin64,LIBO_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64"))
$(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
...
...
scp2/InstallModule_activex.mk
Dosyayı görüntüle @
4bab1f2d
...
...
@@ -9,12 +9,10 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/activex))
$(eval $(call gb_InstallModule_define_if_set,scp2/activex,\
BUILD_X64 \
))
$(eval $(call gb_InstallModule_add_scpfiles,scp2/activex,\
scp2/source/activex/file_activex \
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/activex,\
activexbinarytable \
activex \
activexwin64 \
))
$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/activex,\
...
...
scp2/source/activex/file_activex.scp
deleted
100644 → 0
Dosyayı görüntüle @
544fa45e
/*
* 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/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "macros.inc"
File gid_File_Lib_Soactivex
LIB_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
Name = "so_activex.dll";
End
#ifdef BUILD_X64
File gid_File_Lib_Soactivex64
LIB_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
Name = "so_activex_x64.dll";
ComponentCondition = "VersionNT64";
End
#endif
scp2/source/activex/module_activex.scp
Dosyayı görüntüle @
4bab1f2d
...
...
@@ -17,7 +17,10 @@
*/
#include "macros.inc"
#include "AutoInstall/activexbinarytable"
#include "AutoInstall/activex"
#include "AutoInstall/activexwin64"
Module gid_Module_Optional_Activexcontrol
PackageInfo = "packinfo_office.txt";
...
...
@@ -26,8 +29,8 @@ Module gid_Module_Optional_Activexcontrol
Default = NO;
Minimal = NO;
ParentID = gid_Module_Optional;
Files = (auto_activexbinarytable_ALL
gid_File_Lib_Soactivex
,
gid_File_Lib_Soactivex64
,
Files = (auto_activexbinarytable_ALL
,
auto_activex_ALL
,
auto_activexwin64_ALL
,
gid_File_Lib_Regpatchactivex_Msi);
End
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