diff options
| author | Andras Timar <atimar@suse.com> | 2011-11-16 22:06:23 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2011-11-16 22:16:45 +0100 |
| commit | 886acba2a5251be4f1fb5a1d2f1517dc53a85228 (patch) | |
| tree | e604f4d33745b4cebb715160ed64118995d7d34d | |
| parent | 9484286af6b211a4699133cb896f1300be2680ac (diff) | |
leave out redist and readmes from win installdir
and make x64 merge modules optional
| -rw-r--r-- | scp2/source/ooo/scpaction_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/vc_redist.scp | 16 |
2 files changed, 6 insertions, 12 deletions
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp index 8dccba28c7f0..826991b5bd8e 100644 --- a/scp2/source/ooo/scpaction_ooo.scp +++ b/scp2/source/ooo/scpaction_ooo.scp @@ -35,6 +35,7 @@ ScpAction scp_Copy_Thirdpartylicense_Readme_Html End #endif +#ifndef WNT ScpAction scp_Copy_Readme_Txt #ifdef UNX README_ALL_LANG(Copy, README); @@ -50,6 +51,7 @@ ScpAction scp_Copy_Readme_Txt Subdir = "READMEs"; #endif End +#endif #if defined(WNT) && defined(_gcc3) #if defined(MINGW_GCCDLL) diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index c4989a99fdee..a01f891b72b7 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -29,18 +29,6 @@ #if defined(WITH_VC_REDIST) -ScpAction scp_Copy_vcredist_x86 - Copy = "vcredist_x86.exe"; - Name = "vcredist_x86.exe"; - Subdir = "redist"; -End - -ScpAction scp_Copy_vcredist_x64 - Copy = "vcredist_x64.exe"; - Name = "vcredist_x64.exe"; - Subdir = "redist"; -End - MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86 Feature = gm_Root; Name = "Microsoft_VC90_CRT_x86.msm"; @@ -53,6 +41,8 @@ MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86 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"; @@ -66,3 +56,5 @@ MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86_x64 End #endif + +#endif |