Author: hdu
Date: Tue Nov 5 12:01:05 2013
New Revision: 1538958
URL: http://svn.apache.org/r1538958
Log:
#i123623# removing moz binaries allows the removal of its msvc runtime
dependencies
Removed:
openoffice/branches/Remove_MOZ/main/external/msvcp70/
openoffice/branches/Remove_MOZ/main/external/msvcp71/
openoffice/branches/Remove_MOZ/main/external/msvcp80/
Modified:
openoffice/branches/Remove_MOZ/main/external/prj/d.lst
openoffice/branches/Remove_MOZ/main/postprocess/rebase/no_rebase.txt
openoffice/branches/Remove_MOZ/main/scp2/source/ooo/common_brand.scp
openoffice/branches/Remove_MOZ/main/scp2/source/ooo/module_hidden_ooo.scp
openoffice/branches/Remove_MOZ/main/scp2/source/ooo/ure.scp
openoffice/branches/Remove_MOZ/main/scp2/source/winexplorerext/file_winexplorerext.scp
openoffice/branches/Remove_MOZ/main/scp2/source/winexplorerext/module_winexplorerext.scp
openoffice/branches/Remove_MOZ/main/solenv/bin/modules/installer/control.pm
openoffice/branches/Remove_MOZ/main/solenv/inc/extension_post.mk
Modified: openoffice/branches/Remove_MOZ/main/external/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/external/prj/d.lst?rev=1538958&r1=1538957&r2=1538958&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/external/prj/d.lst (original)
+++ openoffice/branches/Remove_MOZ/main/external/prj/d.lst Tue Nov 5 12:01:05
2013
@@ -17,18 +17,6 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\
..\gdiplus\gdiplus.dll %_DEST%\bin%_EXT%\gdiplus.dll
-..\msvcp70\msvcp70.dll %_DEST%\bin%_EXT%\msvcp70.dll
-..\msvcp70\msvcr70.dll %_DEST%\bin%_EXT%\msvcr70.dll
-
-..\msvcp71\msvcp71*.dll %_DEST%\bin%_EXT%
-..\msvcp71\msvcr71*.dll %_DEST%\bin%_EXT%
-
-..\msvcp80\msvcm80*.dll %_DEST%\bin%_EXT%
-..\msvcp80\msvcp80*.dll %_DEST%\bin%_EXT%
-..\msvcp80\msvcr80*.dll %_DEST%\bin%_EXT%
-..\msvcp80\Microsoft.VC80.CRT.manifest
%_DEST%\bin%_EXT%\Microsoft.VC80.CRT.manifest
-..\msvcp80\Microsoft.VC80.DebugCRT.manifest
%_DEST%\bin%_EXT%\Microsoft.VC80.DebugCRT.manifest
-
..\msvcp90\msvcm90*.dll %_DEST%\bin%_EXT%
..\msvcp90\msvcp90*.dll %_DEST%\bin%_EXT%
..\msvcp90\msvcr90*.dll %_DEST%\bin%_EXT%
Modified: openoffice/branches/Remove_MOZ/main/postprocess/rebase/no_rebase.txt
URL:
http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/postprocess/rebase/no_rebase.txt?rev=1538958&r1=1538957&r2=1538958&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/postprocess/rebase/no_rebase.txt
(original)
+++ openoffice/branches/Remove_MOZ/main/postprocess/rebase/no_rebase.txt Tue
Nov 5 12:01:05 2013
@@ -10,24 +10,10 @@ policy.1.0.cli_cppuhelper.dll
policy.1.0.cli_basetypes.dll
gdiplus.dll
mingwm10.dll
-msvcm80d.dll
-msvcm80.dll
msvcm90d.dll
msvcm90.dll
-msvcp70d.dll
-msvcp70.dll
-msvcp71d.dll
-msvcp71.dll
-msvcp80d.dll
-msvcp80.dll
msvcp90d.dll
msvcp90.dll
-msvcr70d.dll
-msvcr70.dll
-msvcr71d.dll
-msvcr71.dll
-msvcr80d.dll
-msvcr80.dll
msvcr90d.dll
msvcr90.dll
msvcr100.dll
Modified: openoffice/branches/Remove_MOZ/main/scp2/source/ooo/common_brand.scp
URL:
http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/scp2/source/ooo/common_brand.scp?rev=1538958&r1=1538957&r2=1538958&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/scp2/source/ooo/common_brand.scp
(original)
+++ openoffice/branches/Remove_MOZ/main/scp2/source/ooo/common_brand.scp Tue
Nov 5 12:01:05 2013
@@ -57,7 +57,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_Msvcr71,
// gid_Brand_File_Bin_Libxml2,
gid_Brand_File_Bmp_IntroAbout,
gid_Brand_File_Desktophelper_Txt,
@@ -66,12 +65,8 @@ Module gid_Module_Root_Brand
gid_Brand_File_Lib_Mingw_GccS,
gid_Brand_File_Lib_Mingw_Stdcpp,
gid_Brand_File_Lib_Mingwm10,
- gid_Brand_File_Lib_Msvcr80,
- gid_Brand_File_Lib_Msvcp80,
- gid_Brand_File_Lib_Msvcm80,
gid_Brand_File_Lib_Oirm,
gid_Brand_File_Lib_Oirm2,
- gid_Brand_File_Msvcm80crt_Manifest,
gid_Brand_File_Lib_Npsoplugin,
// gid_Brand_File_ServicesRdb,
// gid_Brand_File_Share_Registry_Brand_Xcd,
@@ -425,18 +420,6 @@ File gid_Brand_File_Bin_Unopkg
End
#endif
-#if defined WNT && \
- (defined M1310 || \
- ((defined M1400 || defined M1500) && \
- !(defined SYSTEM_MOZILLA || defined WITHOUT_MOZILLA)))
-File gid_Brand_File_Bin_Msvcr71
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG);
- Styles = (PACKED);
-End
-#endif
-
// 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
@@ -602,23 +585,6 @@ File gid_Brand_File_Lib_Mingwm10
End
#endif
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Lib_Msvcr80
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
- Name = "msvcr80.dll";
-#else
- Name = "msvcr80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
#if defined(WNT) && defined( _gcc3 )
#if defined(MINGW_GCCDLL)
@@ -645,57 +611,6 @@ End
#endif
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Lib_Msvcp80
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
- Name = "msvcp80.dll";
-#else
- Name = "msvcp80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Lib_Msvcm80
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
- Name = "msvcm80.dll";
-#else
- Name = "msvcm80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Msvcm80crt_Manifest
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
- Name = "Microsoft.VC80.CRT.manifest";
-#else
- Name = "Microsoft.VC80.DebugCRT.manifest";
-#endif
-End
-#endif
-#endif
-#endif
-
// Profiles
Profile gid_Brand_Profile_Bootstrap_Ini
Modified:
openoffice/branches/Remove_MOZ/main/scp2/source/ooo/module_hidden_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1538958&r1=1538957&r2=1538958&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/scp2/source/ooo/module_hidden_ooo.scp
(original)
+++ openoffice/branches/Remove_MOZ/main/scp2/source/ooo/module_hidden_ooo.scp
Tue Nov 5 12:01:05 2013
@@ -404,8 +404,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Mingw_GccS,
gid_File_Lib_Mingw_Stdcpp,
gid_File_Lib_Mingwm10,
- gid_File_Lib_Msvcp70,
- gid_File_Lib_Msvcr70,
gid_File_Lib_Ole,
gid_File_Lib_Patchmsi,
gid_File_Lib_Reg4allmsdoc,
@@ -416,8 +414,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Gconfebe,
gid_File_Lib_Wininetbe,
gid_File_Lib_Macbe,
- gid_File_Lib_Msvcp70_So,
- gid_File_Lib_Msvcr70_So,
gid_File_Lib_Gdiplus,
gid_File_Lib_Stlport_Vc6,
gid_File_Lib_Stlport_Vc7,
Modified: openoffice/branches/Remove_MOZ/main/scp2/source/ooo/ure.scp
URL:
http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/scp2/source/ooo/ure.scp?rev=1538958&r1=1538957&r2=1538958&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/scp2/source/ooo/ure.scp (original)
+++ openoffice/branches/Remove_MOZ/main/scp2/source/ooo/ure.scp Tue Nov 5
12:01:05 2013
@@ -195,74 +195,6 @@ End
// Public Dynamic Libraries:
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcr80_Ure
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
- Name = "msvcr80.dll";
-#else
- Name = "msvcr80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcp80_Ure
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
- Name = "msvcp80.dll";
-#else
- Name = "msvcp80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcm80_Ure
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
- Name = "msvcm80.dll";
-#else
- Name = "msvcm80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Msvcm80crt_Manifest_Ure
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
- Name = "Microsoft.VC80.CRT.manifest";
-#else
- Name = "Microsoft.VC80.DebugCRT.manifest";
-#endif
-End
-#endif
-#endif
-#endif
-
File gid_File_Dl_Cppu
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@@ -1042,38 +974,6 @@ End
#endif
-#ifdef WNT
-#if defined(M1310)
-File gid_File_Dl_Msvcr71
- TXT_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
-#if defined _STLP_DEBUG
- Name = SCP2_URE_DL_NORMAL("msvcr71d");
-#else
- Name = SCP2_URE_DL_NORMAL("msvcr71");
-#endif
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "074DE395-C6EB-47F7-A587-6311F89C14B4";
-End
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1310)
-File gid_File_Dl_Msvcp71
- TXT_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
-#if defined _STLP_DEBUG
- Name = SCP2_URE_DL_NORMAL("msvcp71d");
-#else
- Name = SCP2_URE_DL_NORMAL("msvcp71");
-#endif
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "1AF2708A-AAE2-4F25-ADF5-E61A549A51C2";
-End
-#endif
-#endif
-
#if defined WNT
File gid_File_Dl_Uwinapi
TXT_FILE_BODY;
@@ -1249,13 +1149,7 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Lib_Mingw_GccS_Ure,
gid_File_Lib_Mingw_Stdcpp_Ure,
gid_File_Lib_Mingwm10_Ure,
- gid_File_Dl_Msvcr71,
- gid_File_Dl_Msvcp71,
gid_File_Dl_Uwinapi,
- gid_File_Lib_Msvcr80_Ure,
- gid_File_Lib_Msvcp80_Ure,
- gid_File_Lib_Msvcm80_Ure,
- gid_File_Msvcm80crt_Manifest_Ure,
gid_File_Java_UnoloaderJar,
gid_File_Java_JuhJar,
gid_File_Java_JurtJar,
Modified:
openoffice/branches/Remove_MOZ/main/scp2/source/winexplorerext/file_winexplorerext.scp
URL:
http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/scp2/source/winexplorerext/file_winexplorerext.scp?rev=1538958&r1=1538957&r2=1538958&view=diff
==============================================================================
---
openoffice/branches/Remove_MOZ/main/scp2/source/winexplorerext/file_winexplorerext.scp
(original)
+++
openoffice/branches/Remove_MOZ/main/scp2/source/winexplorerext/file_winexplorerext.scp
Tue Nov 5 12:01:05 2013
@@ -89,15 +89,6 @@ End
#endif
-#if defined M1310
-File gid_File_Lib_Shlxthdl_Msvcr71
- TXT_FILE_BODY;
- Dir = gid_Dir_Shlxthdl;
- Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG);
- Styles = (PACKED);
-End
-#endif
-
File gid_File_Lib_Shlxtmsi
TXT_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
Modified:
openoffice/branches/Remove_MOZ/main/scp2/source/winexplorerext/module_winexplorerext.scp
URL:
http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/scp2/source/winexplorerext/module_winexplorerext.scp?rev=1538958&r1=1538957&r2=1538958&view=diff
==============================================================================
---
openoffice/branches/Remove_MOZ/main/scp2/source/winexplorerext/module_winexplorerext.scp
(original)
+++
openoffice/branches/Remove_MOZ/main/scp2/source/winexplorerext/module_winexplorerext.scp
Tue Nov 5 12:01:05 2013
@@ -34,7 +34,6 @@ Module gid_Module_Optional_Winexplorerex
gid_File_Lib_Shlxthdl64,
gid_File_Lib_OOoFilt,
gid_File_Lib_OOoFilt64,
- gid_File_Lib_Shlxthdl_Msvcr71,
gid_File_Lib_Shlxtmsi,
gid_File_Lib_Reg64,
gid_File_Tmp_Userinstall_Winexplorerext_Inf);
Modified:
openoffice/branches/Remove_MOZ/main/solenv/bin/modules/installer/control.pm
URL:
http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/solenv/bin/modules/installer/control.pm?rev=1538958&r1=1538957&r2=1538958&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/solenv/bin/modules/installer/control.pm
(original)
+++ openoffice/branches/Remove_MOZ/main/solenv/bin/modules/installer/control.pm
Tue Nov 5 12:01:05 2013
@@ -73,7 +73,6 @@ sub check_system_path
{
# The following files have to be found in the environment variable PATH
# All platforms: zip
- # Windows only: msvcp70.dll, msvcr70.dll for regcomp.exe
# Windows only: "msiinfo.exe", "msidb.exe", "uuidgen.exe",
"makecab.exe", "msitran.exe", "expand.exe" for msi database and packaging
my $onefile;
@@ -101,19 +100,6 @@ sub check_system_path
if (($installer::globals::iswin) &&
($installer::globals::iswindowsbuild))
{
@needed_files_in_path = ("zip.exe", "msiinfo.exe", "msidb.exe",
"uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe");
-
- if ( $installer::globals::compiler eq "wntmsci8" )
- {
- push(@needed_files_in_path, "msvcp70.dll");
- push(@needed_files_in_path, "msvcr70.dll");
- }
-
- if ( $installer::globals::compiler eq "wntmsci10" )
- {
- push(@needed_files_in_path, "msvcp71.dll");
- push(@needed_files_in_path, "msvcr71.dll");
- }
-
}
elsif ($installer::globals::iswin || $installer::globals::isos2)
{
Modified: openoffice/branches/Remove_MOZ/main/solenv/inc/extension_post.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/solenv/inc/extension_post.mk?rev=1538958&r1=1538957&r2=1538958&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/solenv/inc/extension_post.mk (original)
+++ openoffice/branches/Remove_MOZ/main/solenv/inc/extension_post.mk Tue Nov 5
12:01:05 2013
@@ -92,16 +92,7 @@ $(PACK_RUNTIME_FLAG) : $(EXTENSIONDIR)
.ENDIF
.ELSE
.IF "$(PACKMS)"!=""
-.IF "$(CCNUMVER)" <= "001399999999"
- $(GNUCOPY) $(PACKMS)/msvcr71.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(PACKMS)/msvcp71.dll $(EXTENSIONDIR)
-.ELSE # "$(CCNUMVER)" <= "001399999999"
-.IF "$(CCNUMVER)" <= "001499999999"
- $(GNUCOPY) $(PACKMS)/msvcr80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(PACKMS)/msvcp80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(PACKMS)/msvcm80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(PACKMS)/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR)
-.ELSE # "$(CCNUMVER)" <= "001499999999"
+.IF "$(CCNUMVER)" > "001499999999"
$(GNUCOPY) $(PACKMS)/msvcr90.dll $(EXTENSIONDIR)
$(GNUCOPY) $(PACKMS)/msvcp90.dll $(EXTENSIONDIR)
$(GNUCOPY) $(PACKMS)/msvcm90.dll $(EXTENSIONDIR)
@@ -109,16 +100,7 @@ $(PACK_RUNTIME_FLAG) : $(EXTENSIONDIR)
.ENDIF # "$(CCNUMVER)" <= "001499999999"
.ENDIF # "$(CCNUMVER)" <= "001399999999"
.ELSE # "$(PACKMS)"!=""
-.IF "$(CCNUMVER)" <= "001399999999"
- $(GNUCOPY) $(SOLARBINDIR)/msvcr71.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(SOLARBINDIR)/msvcp71.dll $(EXTENSIONDIR)
-.ELSE # "$(CCNUMVER)" <= "001399999999"
-.IF "$(CCNUMVER)" <= "001499999999"
- $(GNUCOPY) $(SOLARBINDIR)/msvcr80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(SOLARBINDIR)/msvcp80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(SOLARBINDIR)/msvcm80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(SOLARBINDIR)/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR)
-.ELSE # "$(CCNUMVER)" <= "001499999999"
+.IF "$(CCNUMVER)" > "001499999999"
$(GNUCOPY) $(SOLARBINDIR)/msvcr90.dll $(EXTENSIONDIR)
$(GNUCOPY) $(SOLARBINDIR)/msvcp90.dll $(EXTENSIONDIR)
$(GNUCOPY) $(SOLARBINDIR)/msvcm90.dll $(EXTENSIONDIR)
