strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sb120: merged in DEV300_m76 via cws/sb118

Browse source
This commit is contained in:
sb 2010-04-11 17:43:39 +02:00
commit 2c7ff00675
4 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scp2/source/ooo/file_ooo.scp
View file

@ -1151,6 +1151,17 @@ File gid_File_Share_Registry_Main_Xcd
Name = "main.xcd";
End
#ifdef WNT
File gid_File_Share_Registry_Forcedefault_Xcd
TXT_FILE_BODY;
Styles = (PACKED, SCPZIP_REPLACE, SET_OFFICE_LANGUAGE);
Dir = gid_Dir_Share_Registry;
Name = "forcedefault.xcd";
End
#endif
File gid_File_Oo_Ldap_Xcd_Sample
TXT_FILE_BODY;
Styles = (PACKED);

1
scp2/source/ooo/module_hidden_ooo.scp
View file

@ -623,6 +623,7 @@ Module gid_Module_Root_Files_6
gid_File_Oo_Ldap_Xcd_Sample,
gid_File_Oo_Ad_Ldap_Xcd_Sample,
gid_File_Share_Registry_Main_Xcd,
gid_File_Share_Registry_Forcedefault_Xcd,
gid_File_Pymailmerge,
gid_File_Xsl_Common_Measure_Conversion,
gid_File_Xsl_Common_Math_Functions,

26
solenv/config/sdev300.ini
View file

@ -2354,7 +2354,7 @@ wntgcci1
COPY_PACKED TRUE
DEVROOT %SOL_TMP%$/r
FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
PCLEAN_PATH %SOLARROOT%$/etw
PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
PSDK %SOL_TMP%$/r$/MinGW$/w32api
@ -2370,7 +2370,7 @@ wntgcci1
COMPATH %SOL_TMP%$/r$/MinGW
COPYALL FALSE
FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
PCLEAN_PATH %SOL_TMP%$/r$/etw
PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
PSDK %SOL_TMP%$/r$/MinGW$/w32api
@ -2867,10 +2867,10 @@ wntmsci12
COPY_PACKED TRUE
DEVROOT %SOL_TMP%$/r
DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
PCLEAN_PATH %SOLARROOT%$/etw
PERL %SOL_TMP%$/r$/%PERLDIR%
PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
@ -2885,15 +2885,15 @@ wntmsci12
}
cax
{
BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
COMPATH %SOL_TMP%$/r$/msvc9p
COMPROOT %SOL_TMP%$/r$/msvc9p
COPYALL FALSE
DSDK %COMPATH%$/DirectXSDK
ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
FSDK %COMPATH%$/Sdk$/v3.5
F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
PCLEAN_PATH %SOL_TMP%$/r$/etw
PERL %SOL_TMP%$/r$/%PERLDIR%
PSDK %COMPATH%$/PlatformSDK$/V6.1
@ -3201,17 +3201,17 @@ wntmsci13
}
cap
{
BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
COMPATH %SOL_TMP%$/r$/msvc9p
COMPROOT %SOL_TMP%$/r$/msvc9p
COPYALL TRUE
COPY_PACKED TRUE
DEVROOT %SOL_TMP%$/r
DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
PCLEAN_PATH %SOLARROOT%$/etw
PERL %SOL_TMP%$/r$/%PERLDIR%
PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
@ -3226,15 +3226,15 @@ wntmsci13
}
cax
{
BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
COMPATH %SOL_TMP%$/r$/msvc9p
COMPROOT %SOL_TMP%$/r$/msvc9p
COPYALL FALSE
DSDK %COMPATH%$/DirectXSDK
ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
FSDK %COMPATH%$/Sdk$/v3.5
F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
PCLEAN_PATH %SOL_TMP%$/r$/etw
PERL %SOL_TMP%$/r$/%PERLDIR%
PSDK %COMPATH%$/PlatformSDK$/V6.1

6
solenv/inc/minor.mk
View file

@ -1,5 +1,5 @@
RSCVERSION=300
RSCREVISION=300m75(Build:9488)
BUILD=9488
LAST_MINOR=m75
RSCREVISION=300m76(Build:9491)
BUILD=9491
LAST_MINOR=m76
SOURCEVERSION=DEV300