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
b2193386
Kaydet (Commit)
b2193386
authored
Agu 02, 2014
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
scp2: move winexplorerext libs to AutoInstall
Change-Id: I93d08ab46e401a2f37c9ad6e425e8014c7e05db1
üst
625c378b
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
50 additions
and
71 deletions
+50
-71
Repository.mk
Repository.mk
+13
-5
AutoInstall.mk
scp2/AutoInstall.mk
+4
-0
InstallModule_winexplorerext.mk
scp2/InstallModule_winexplorerext.mk
+6
-2
macros.inc
scp2/inc/macros.inc
+17
-0
file_winexplorerext.scp
scp2/source/winexplorerext/file_winexplorerext.scp
+0
-57
module_winexplorerext.scp
scp2/source/winexplorerext/module_winexplorerext.scp
+10
-7
No files found.
Repository.mk
Dosyayı görüntüle @
b2193386
...
...
@@ -632,20 +632,28 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooobinaryta
) \
))
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,winexplorerextbinarytable, \
shlxtmsi \
))
$(eval $(call gb_Helper_register_libraries
,PLAINLIBS_SHLXTHDL
, \
$(eval $(call gb_Helper_register_libraries
_for_install,PLAINLIBS_SHLXTHDL,winexplorerext
, \
ooofilt \
ooofilt_x64 \
propertyhdl \
propertyhdl_x64 \
shlxthdl \
))
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexplorerextnt6, \
propertyhdl \
))
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexplorerextwin64, \
ooofilt_x64 \
shlxthdl_x64 \
))
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexplorerextwin64nt6, \
propertyhdl_x64 \
))
endif # WNT
$(eval $(call gb_Helper_register_libraries_for_install,RTVERLIBS,ure, \
...
...
scp2/AutoInstall.mk
Dosyayı görüntüle @
b2193386
...
...
@@ -33,6 +33,10 @@ $(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,winexplorerextnt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT >= 600"))
$(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64"))
$(eval $(call gb_AutoInstall_add_module,winexplorerextwin64nt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64 >= 600"))
$(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
# vim: set noet sw=4 ts=4:
scp2/InstallModule_winexplorerext.mk
Dosyayı görüntüle @
b2193386
...
...
@@ -9,8 +9,12 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/winexplorerext))
$(eval $(call gb_InstallModule_define_if_set,scp2/winexplorerext,\
BUILD_X64 \
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/winexplorerext,\
winexplorerextbinarytable \
winexplorerext \
winexplorerextnt6 \
winexplorerextwin64 \
winexplorerextwin64nt6 \
))
$(eval $(call gb_InstallModule_add_scpfiles,scp2/winexplorerext,\
...
...
scp2/inc/macros.inc
Dosyayı görüntüle @
b2193386
...
...
@@ -172,6 +172,23 @@ End
ComponentCondition
=
cond
;
\
End
#define SHLXTHDL_LIB_FILE(id,name) \
File
id
\
Name
=
name
;
\
LIB_FILE_BODY
;
\
Styles
=
(
PACKED
);
\
Dir
=
gid_Dir_Shlxthdl
;
\
End
#define SHLXTHDL_LIB_FILE_COMPONENTCONDITION(id,name,cond) \
File
id
\
Name
=
name
;
\
LIB_FILE_BODY
;
\
Styles
=
(
PACKED
);
\
Dir
=
gid_Dir_Shlxthdl
;
\
ComponentCondition
=
cond
;
\
End
#ifdef MACOSX
// links are craeted at configure time by odk/config/setsdkenv_unix.sh.in
#define SDK_LIBRARY_LINK(id,name,target)
...
...
scp2/source/winexplorerext/file_winexplorerext.scp
Dosyayı görüntüle @
b2193386
...
...
@@ -23,63 +23,6 @@ Directory gid_Dir_Shlxthdl
DosName = "shlxthdl";
End
File gid_File_Lib_OOoFilt
LIB_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Shlxthdl;
Name = "ooofilt.dll";
End
#ifdef BUILD_X64
File gid_File_Lib_OOoFilt64
LIB_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Shlxthdl;
Name = "ooofilt_x64.dll";
ComponentCondition = "VersionNT64";
End
#endif
File gid_File_Lib_Shlxthdl
LIB_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Shlxthdl;
Name = "shlxthdl.dll";
End
#ifdef BUILD_X64
File gid_File_Lib_Shlxthdl64
LIB_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Shlxthdl;
Name = "shlxthdl_x64.dll";
ComponentCondition = "VersionNT64";
End
#endif
File gid_File_Lib_PropertyHdl
LIB_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Shlxthdl;
Name = "propertyhdl.dll";
ComponentCondition = "VersionNT >= 600";
End
#ifdef BUILD_X64
File gid_File_Lib_PropertyHdl64
LIB_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Shlxthdl;
Name = "propertyhdl_x64.dll";
ComponentCondition = "VersionNT64 >= 600";
End
#endif
#ifdef BUILD_X64
#if defined(WITH_VC100_REDIST)
...
...
scp2/source/winexplorerext/module_winexplorerext.scp
Dosyayı görüntüle @
b2193386
...
...
@@ -17,7 +17,12 @@
*/
#include "macros.inc"
#include "AutoInstall/winexplorerextbinarytable"
#include "AutoInstall/winexplorerext"
#include "AutoInstall/winexplorerextnt6"
#include "AutoInstall/winexplorerextwin64"
#include "AutoInstall/winexplorerextwin64nt6"
Module gid_Module_Optional_Winexplorerext
MOD_NAME_DESC ( MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS );
...
...
@@ -26,10 +31,9 @@ Module gid_Module_Optional_Winexplorerext
Minimal = YES;
ParentID = gid_Module_Optional;
Dirs = (gid_Dir_Shlxthdl);
Files = (auto_winexplorerextbinarytable_ALL
gid_File_Lib_Shlxthdl,
gid_File_Lib_OOoFilt,
gid_File_Lib_PropertyHdl,
Files = (auto_winexplorerextbinarytable_ALL,
auto_winexplorerext_ALL,
auto_winexplorerextnt6_ALL,
gid_File_Tmp_Userinstall_Winexplorerext_Inf);
End
...
...
@@ -41,9 +45,8 @@ Module gid_Module_Optional_Winexplorerext_x64
Default = YES;
Styles = (HIDDEN_ROOT);
Dirs = (gid_Dir_Shlxthdl);
Files = (gid_File_Lib_Shlxthdl64,
gid_File_Lib_OOoFilt64,
gid_File_Lib_PropertyHdl64,
Files = (auto_winexplorerextwin64_ALL,
auto_winexplorerextwin64nt6_ALL,
gid_File_Lib_Msvcp100,
gid_File_Lib_Msvcr100,
gid_File_Lib_Msvcp110,
...
...
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