Revert "remove vc_redist from scp2"

This reverts commit 7a3ef2719e.
Eh, better to stop for now...
This commit is contained in:
Andras Timar 2012-01-06 19:36:54 +01:00
parent 4ff62bf42a
commit c586383617
3 changed files with 62 additions and 0 deletions

View file

@ -343,6 +343,7 @@ PARFILES += \
folder_ooo.par \
folderitem_ooo.par \
registryitem_ooo.par \
vc_redist.par \
mingw_dlls.par \
windowscustomaction_ooo.par
.ENDIF

View file

@ -0,0 +1,60 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#include "macros.inc"
#if defined(WITH_VC_REDIST)
MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86
Feature = gm_Root;
Name = "Microsoft_VC90_CRT_x86.msm";
RootDir = "TARGETDIR";
End
MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86
Feature = gm_Root;
Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm";
RootDir = "TARGETDIR";
End
#if defined(BUILD_X64)
MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86_x64
Feature = gm_Root;
Name = "Microsoft_VC90_CRT_x86_x64.msm";
RootDir = "TARGETDIR";
End
MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86_x64
Feature = gm_Root;
Name = "policy_9_0_Microsoft_VC90_CRT_x86_x64.msm";
RootDir = "TARGETDIR";
End
#endif
#endif

View file

@ -148,6 +148,7 @@ SCP1FILES += \
folder_ooo.par \
folderitem_ooo.par \
windowscustomaction_ooo.par \
vc_redist.par \
mingw_dlls.par \
registryitem_writer.par \
folderitem_writer.par \