diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-03-14 11:48:24 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-03-14 12:29:47 +0100 |
| commit | 64ea9944cfc441504915da37f6b2dff7a394d797 (patch) | |
| tree | 695ccb34f82213ae9df2f51323bea19266c10b49 /scp2 | |
| parent | e759269e373fa02d3e8566d1edc9fb9526de6640 (diff) | |
scp2: move libxml2 to AutoInstall
Change-Id: I62f2f654ac661ebf266b7b5cf70728a616c9b50f
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 19 | ||||
| -rw-r--r-- | scp2/source/ooo/ure.scp | 20 |
2 files changed, 0 insertions, 39 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 2498822f2440..e731d8f9dae9 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -61,7 +61,6 @@ Module gid_Module_Root_Brand gid_Brand_File_Bin_Unopkgcom, gid_Brand_File_Bin_Unopkgexe, gid_Brand_File_Bin_Unopkg, - gid_Brand_File_Bin_Libxml2, gid_Brand_File_Bmp_IntroAboutShell, gid_Brand_File_Bmp_IntroAboutShell_custom, gid_Brand_File_Desktophelper_Txt, @@ -616,24 +615,6 @@ File gid_Brand_File_Bin_Unopkg Name = "unopkg.bin"; End -// Due to Windows DLL search order, OOo executables might pick up a libxml2 DLL -// from a Windows system directory instead of the one from the URE; to avoid -// problems, as a HACK, for now a copy of the URE libxml2 DLL is placed next to -// the OOo executables (where it takes precedence even over DLLs from the -// Windows system directory): -#if defined WNT && !defined SYSTEM_LIBXML -File gid_Brand_File_Bin_Libxml2 - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program; -#if defined _gcc3 - Name = SCP2_URE_DL_NORMAL("libxml2-2"); -#else - Name = SCP2_URE_DL_NORMAL("libxml2"); -#endif - Styles = (PACKED); -End -#endif - #if defined ENABLE_NPAPI_INTO_BROWSER File gid_Brand_File_Lib_Npsoplugin BIN_FILE_BODY; diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 00263a9b0286..fb5aaba50d4b 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -370,25 +370,6 @@ End #endif -#if !defined SYSTEM_LIBXML -File gid_File_Dl_Libxml2 - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; -#if defined WNT -#if defined _gcc3 - Name = SCP2_URE_DL_NORMAL("libxml2-2"); -#else - Name = SCP2_URE_DL_NORMAL("libxml2"); -#endif -#elif defined MACOSX - Name = SCP2_URE_DL_NORMAL("xml2.2"); -#else - Name = SCP2_URE_DL_VER("xml2", "2"); -#endif - Styles = (PACKED); -End -#endif - #ifdef AIX Unixlink gid_Unixlink_File_Dl_Libxml2 BIN_FILE_BODY; @@ -488,7 +469,6 @@ Module gid_Module_Root_Ure_Hidden gid_Unixlink_File_Dl_Salhelper, gid_File_Dl_Profile_Uno, gid_Unixlink_File_Dl_Rmcxt, - gid_File_Dl_Libxml2, gid_File_Lib_Mingw_GccS_Ure, gid_File_Lib_Mingw_Stdcpp_Ure, gid_File_Dl_Uwinapi, |