Repository.mk | 40 ++- scp2/AutoInstall.mk | 6 scp2/InstallModule_activex.mk | 10 scp2/InstallModule_winexplorerext.mk | 8 scp2/inc/macros.inc | 35 +-- scp2/source/activex/file_activex.scp | 36 --- scp2/source/activex/module_activex.scp | 10 scp2/source/ooo/windowscustomaction_ooo.scp | 9 scp2/source/winexplorerext/file_winexplorerext.scp | 57 ---- scp2/source/winexplorerext/module_winexplorerext.scp | 17 - setup_native/Library_regpatchactivex.mk | 39 --- setup_native/Module_setup_native.mk | 1 setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx | 115 ---------- setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.def | 3 14 files changed, 76 insertions(+), 310 deletions(-)
New commits: commit ee24b3b7d82e8a5d737ec545d0eff227f362483b Author: Michael Stahl <mst...@redhat.com> Date: Sat Aug 2 21:16:20 2014 +0200 scp2: remove unused STD_LIB_FILE etc. macros Change-Id: Ib6cf165019d72ba64b5111186ea3fdba076c69ba diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index bfe9b55..2952eff 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -211,18 +211,6 @@ End End #endif -#define STD_LIB_FILE(id,name) \ - File id \ - Name = LIBNAME(name); \ - PACKED_LIB_FILE_BODY; \ - End - -#define SPECIAL_LIB_FILE(id,name) \ - File id \ - Name = SPECIAL_NAME(name); \ - PACKED_LIB_FILE_BODY; \ - End - #define STD_RES_FILE(id,name) \ File id \ TXT_FILE_BODY; \ @@ -276,12 +264,6 @@ End Styles = (PACKED); \ End -#define SPECIAL_COMPONENT_LIB_FILE(id,name) \ - File id \ - Name = SPECIAL_COMPONENT_LIB_NAME(name); \ - PACKED_LIB_FILE_BODY; \ - End - #define STD_PY_FILE(id,name) \ File id \ PACKED_TXT_FILE_BODY; \ commit b2193386ddd6ffbf45ef05f5fcd44db5fe6b4ae9 Author: Michael Stahl <mst...@redhat.com> Date: Sat Aug 2 21:12:09 2014 +0200 scp2: move winexplorerext libs to AutoInstall Change-Id: I93d08ab46e401a2f37c9ad6e425e8014c7e05db1 diff --git a/Repository.mk b/Repository.mk index 1902bc0..e642527 100644 --- a/Repository.mk +++ b/Repository.mk @@ -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, \ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 271d225..bc3e8d8 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -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: diff --git a/scp2/InstallModule_winexplorerext.mk b/scp2/InstallModule_winexplorerext.mk index 2e9239e..9d64cbf 100644 --- a/scp2/InstallModule_winexplorerext.mk +++ b/scp2/InstallModule_winexplorerext.mk @@ -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,\ diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index ac4de16..bfe9b55 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -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) diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp index 65ebc52..c7fcd69 100644 --- a/scp2/source/winexplorerext/file_winexplorerext.scp +++ b/scp2/source/winexplorerext/file_winexplorerext.scp @@ -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) diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp index dbed4cf..2be3523 100644 --- a/scp2/source/winexplorerext/module_winexplorerext.scp +++ b/scp2/source/winexplorerext/module_winexplorerext.scp @@ -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, commit 625c378b0d42bb251c5cabdc84fe92193bd2a8a4 Author: Michael Stahl <mst...@redhat.com> Date: Sat Aug 2 20:45:39 2014 +0200 Repository.mk: remove obsolete libraries These were removed by commits 5142e628b563a9876e8884c5dd4914eff4a2f307, a5783fe922b2419b5b662eb5f544a1f401341dbf and eb6fa6be7500b9110913174552c156b0504ece07. Change-Id: If8b5b5d2241bf66dea4a8376a5303f585559ebdc diff --git a/Repository.mk b/Repository.mk index aa90522..1902bc0 100644 --- a/Repository.mk +++ b/Repository.mk @@ -646,12 +646,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_SHLXTHDL, \ shlxthdl_x64 \ )) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - fop \ - jfregca \ - thidxmsi \ -)) -endif +endif # WNT $(eval $(call gb_Helper_register_libraries_for_install,RTVERLIBS,ure, \ cppuhelper \ commit 677670e46783084891db7405866a3bd1a652cfac Author: Michael Stahl <mst...@redhat.com> Date: Sat Aug 2 20:34:31 2014 +0200 setup_native, scp2: remove "regpatchactivex" MSI custom-action and lib This was effectively omitted from the installation set since commit 26c142ca5f2b405b02ab5701dfaeab7bf281a727, and is apparently related to the obsolete StarOffice patch mechanism. Change-Id: I9a4c113e19e5b2b751e3da64b4dde53320132a35 diff --git a/Repository.mk b/Repository.mk index b203085..aa90522 100644 --- a/Repository.mk +++ b/Repository.mk @@ -649,7 +649,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_SHLXTHDL, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ fop \ jfregca \ - regpatchactivex \ thidxmsi \ )) endif diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp index fbcbaba..9e06ed2 100644 --- a/scp2/source/activex/module_activex.scp +++ b/scp2/source/activex/module_activex.scp @@ -31,6 +31,5 @@ Module gid_Module_Optional_Activexcontrol ParentID = gid_Module_Optional; Files = (auto_activexbinarytable_ALL, auto_activex_ALL, - auto_activexwin64_ALL, - gid_File_Lib_Regpatchactivex_Msi); + auto_activexwin64_ALL); End diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index 0abb306..056fba8 100644 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -142,15 +142,6 @@ WindowsCustomAction gid_Customaction_Check_Install_Directory Assignment3 = ("ControlEvent", "CustomSetup", "Next", "DoAction", "CheckInstallDirectory", "Not Installed", "2"); End -WindowsCustomAction gid_Customaction_Patch_Regpatchactivex_Patchactivexcontrol - Name = "PatchActiveXControl"; - Typ = "65"; - Source = "regpatchactivex.dll"; - Target = "PatchActiveXControl"; - Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=3", "end"); -End - WindowsCustomAction gid_Customaction_CheckPatchList Name = "CheckPatchList"; Typ = "65"; diff --git a/setup_native/Library_regpatchactivex.mk b/setup_native/Library_regpatchactivex.mk deleted file mode 100644 index 30bf07d..0000000 --- a/setup_native/Library_regpatchactivex.mk +++ /dev/null @@ -1,39 +0,0 @@ -# -*- 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_Library_Library,regpatchactivex)) - -$(eval $(call gb_Library_add_defs,regpatchactivex,\ - -U_DLL \ -)) - -$(eval $(call gb_Library_add_cxxflags,regpatchactivex,\ - $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \ -)) - -$(eval $(call gb_Library_add_ldflags,regpatchactivex,\ - /DEF:$(SRCDIR)/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.def \ - /NODEFAULTLIB \ -)) - -$(eval $(call gb_Library_add_exception_objects,regpatchactivex,\ - setup_native/source/win32/customactions/regpatchactivex/regpatchactivex \ -)) - -$(eval $(call gb_Library_use_system_win32_libs,regpatchactivex,\ - libcmt \ - libcpmt \ - msi \ - kernel32 \ - user32 \ - advapi32 \ - shell32 \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk index 19226c2..d0f935e 100644 --- a/setup_native/Module_setup_native.mk +++ b/setup_native/Module_setup_native.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Module_add_targets,setup_native,\ Library_qslnkmsi \ Library_reg4allmsdoc \ $(if $(DISABLE_ACTIVEX),,Library_regactivex) \ - Library_regpatchactivex \ Library_sdqsmsi \ Library_sellangmsi \ Library_shlxtmsi \ diff --git a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx deleted file mode 100644 index b8087af..0000000 --- a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx +++ /dev/null @@ -1,115 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#define UNICODE - -#ifdef _MSC_VER -#pragma warning(push,1) // disable warnings within system headers -#endif -#include <windows.h> -#include <msiquery.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif - -#include <string.h> -#include <malloc.h> -#include <stdio.h> - - -BOOL UnicodeEquals( wchar_t* pStr1, wchar_t* pStr2 ) -{ - if ( pStr1 == NULL && pStr2 == NULL ) - return TRUE; - else if ( pStr1 == NULL || pStr2 == NULL ) - return FALSE; - - while( *pStr1 == *pStr2 && *pStr1 && *pStr2 ) - pStr1++, pStr2++; - - return ( *pStr1 == 0 && *pStr2 == 0 ); -} - - -BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue ) -{ - DWORD sz = 0; - if ( MsiGetProperty( hMSI, pPropName, L"", &sz ) == ERROR_MORE_DATA ) - { - sz++; - DWORD nbytes = sz * sizeof( wchar_t ); - wchar_t* buff = reinterpret_cast<wchar_t*>( malloc( nbytes ) ); - ZeroMemory( buff, nbytes ); - MsiGetProperty( hMSI, pPropName, buff, &sz ); - *ppValue = buff; - - return TRUE; - } - - return FALSE; -} - - -BOOL MakeInstallForAllUsers( MSIHANDLE hMSI ) -{ - BOOL bResult = FALSE; - wchar_t* pVal = NULL; - if ( GetMsiProp( hMSI, L"ALLUSERS", &pVal ) && pVal ) - { - bResult = UnicodeEquals( pVal , L"1" ); - free( pVal ); - } - - return bResult; -} - - -extern "C" UINT __stdcall PatchActiveXControl( MSIHANDLE hMSI ) -{ - // MessageBox(NULL, L"PatchActiveXControl", L"Information", MB_OK | MB_ICONINFORMATION); - - INSTALLSTATE current_state; - INSTALLSTATE future_state; - - if ( ERROR_SUCCESS == MsiGetFeatureState( hMSI, L"gm_o_Activexcontrol", ¤t_state, &future_state ) ) - { - BOOL bInstallForAllUsers = MakeInstallForAllUsers( hMSI ); - - if ( future_state == INSTALLSTATE_LOCAL - || ( current_state == INSTALLSTATE_LOCAL && future_state == INSTALLSTATE_UNKNOWN ) ) - { - HKEY hkey = NULL; - char* aSubKey = "Software\\Classes\\MIME\\DataBase\\Content Type\\application/vnd.sun.xml.base"; - if ( ERROR_SUCCESS == RegCreateKeyA(bInstallForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, &hkey) ) - { - RegDeleteValueA( hkey, "CLSID" ); - RegCloseKey( hkey ), hkey = NULL; - } - } - } - else - { - // assert( FALSE ); - } - - return ERROR_SUCCESS; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.def b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.def deleted file mode 100644 index e5c021d..0000000 --- a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.def +++ /dev/null @@ -1,3 +0,0 @@ -LIBRARY "regpatchactivex.dll" -EXPORTS - PatchActiveXControl \ No newline at end of file commit 4bab1f2dea44e54b72096eba0f5bc7a0a71c5589 Author: Michael Stahl <mst...@redhat.com> Date: Sat Aug 2 20:26:26 2014 +0200 scp2: move activex libs to AutoInstall Change-Id: I08fac26859d97e3d7a60d3ba443c2d2ca039789b diff --git a/Repository.mk b/Repository.mk index 10c8f62..b203085 100644 --- a/Repository.mk +++ b/Repository.mk @@ -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 diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 1fe02e5..271d225 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -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)) diff --git a/scp2/InstallModule_activex.mk b/scp2/InstallModule_activex.mk index 2e3b28f..ea9b473 100644 --- a/scp2/InstallModule_activex.mk +++ b/scp2/InstallModule_activex.mk @@ -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,\ diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp deleted file mode 100644 index e6864b8..0000000 --- a/scp2/source/activex/file_activex.scp +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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 diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp index e56ced7..fbcbaba 100644 --- a/scp2/source/activex/module_activex.scp +++ b/scp2/source/activex/module_activex.scp @@ -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 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits