CWS-TOOLING: integrate CWS cmis01
2009-02-03 20:05:24 +0100 tkr r267341 : #i95301# fixed crash due wrong array length + resolve merge conflicts 2009-01-12 08:35:39 +0100 tkr r266134 : #158978# support unescaped whitespaces in webdav 2009-01-12 08:33:10 +0100 tkr r266133 : #i95307# build error after rebasing fixed 2009-01-07 09:47:09 +0100 tkr r265948 : #159046# Add new path to the wntmsci12 search path 2009-01-05 15:34:19 +0100 tkr r265873 : CWS-TOOLING: rebase CWS cmis01 to trunk@265758 (milestone: DEV300:m38) 2008-12-23 09:38:53 +0100 tkr r265774 : #158537# new property 2008-12-23 09:36:25 +0100 tkr r265773 : #158537# new property 2008-10-29 13:08:30 +0100 mav r262791 : #i94273# let the interaction handler be used for authentication 2008-10-24 15:56:26 +0200 tkr r262649 : #i95310# NTLM support 2008-10-22 18:14:02 +0200 mav r262611 : #i94273# fix the http scenario 2008-10-22 12:41:12 +0200 tkr r262596 : #i95310# NTLM support repaired (new neon version) 2008-10-22 12:38:47 +0200 tkr r262595 : #i95310# NTLM support repaired (new neon version) 2008-10-22 12:38:31 +0200 tkr r262594 : #i95310# NTLM support repaired (new neon version) 2008-10-22 12:29:43 +0200 tkr r262593 : #i95307# Add blacklist support 2008-10-22 12:29:24 +0200 tkr r262592 : #i95307# Add blacklist support 2008-10-22 12:29:07 +0200 tkr r262591 : #i95307# Add blacklist support 2008-10-22 12:28:44 +0200 tkr r262590 : #i95307# Add blacklist support 2008-10-22 12:25:01 +0200 tkr r262589 : #i95307# Add blacklist support 2008-10-22 12:24:28 +0200 tkr r262588 : #i95307# Add blacklist support 2008-10-22 12:22:36 +0200 tkr r262587 : #i95307# Add blacklist support 2008-10-21 12:46:34 +0200 mav r262568 : #i94273# allow to specify the suggested on IO SaveAs directory and filename 2008-10-21 12:44:49 +0200 mav r262566 : #i94273# allow to specify the suggested on IO SaveAs directory and filename
This commit is contained in:
parent
394a149aa9
commit
e08618ebd6
3 changed files with 18 additions and 2 deletions
|
@ -395,6 +395,7 @@ BEGIN
|
|||
$msitranpath = "";
|
||||
$insert_file_at_end = 0;
|
||||
$newfilesexist = 0;
|
||||
$usesharepointpath = 0;
|
||||
%newfilescollector = ();
|
||||
|
||||
$saveinstalldir = "";
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#
|
||||
# $RCSfile: directory.pm,v $
|
||||
#
|
||||
# $Revision: 1.31 $
|
||||
# $Revision: 1.30.126.1 $
|
||||
#
|
||||
# This file is part of OpenOffice.org.
|
||||
#
|
||||
|
@ -122,6 +122,11 @@ sub create_unique_directorynames
|
|||
if ( $styles =~ /\bCOMMONAPPDATAFOLDER\b/ ) { $uniqueparentname = $installer::globals::commonappdatafolder; }
|
||||
if ( $styles =~ /\bLOCALAPPDATAFOLDER\b/ ) { $uniqueparentname = $installer::globals::localappdatafolder; }
|
||||
|
||||
if ( $styles =~ /\bSHAREPOINTPATH\b/ )
|
||||
{
|
||||
$uniqueparentname = "SHAREPOINTPATH";
|
||||
$installer::globals::usesharepointpath = 1;
|
||||
}
|
||||
|
||||
$uniquename =~ s/\-/\_/g; # making "-" to "_"
|
||||
$uniqueparentname =~ s/\-/\_/g; # making "-" to "_"
|
||||
|
@ -366,6 +371,12 @@ sub add_root_directories
|
|||
$oneline = "$installer::globals::localappdatafolder\tTARGETDIR\t.\n";
|
||||
push(@{$directorytableref}, $oneline);
|
||||
|
||||
if ( $installer::globals::usesharepointpath )
|
||||
{
|
||||
$oneline = "SHAREPOINTPATH\tTARGETDIR\t.\n";
|
||||
push(@{$directorytableref}, $oneline);
|
||||
}
|
||||
|
||||
$oneline = "$installer::globals::systemfolder\tTARGETDIR\t.\n";
|
||||
push(@{$directorytableref}, $oneline);
|
||||
|
||||
|
|
|
@ -3360,6 +3360,7 @@ wntmsci12
|
|||
DSDK %SOL_TMP%\r\msvc9p\DirectXSDK
|
||||
ENV_TOOLS %SOL_TMP%\etw\%WORK_STAMP%
|
||||
FSDK %SOL_TMP%\r\msvc9p\Sdk\v3.5
|
||||
F20SDK %SOL_TMP%\r\msvc9p\Sdk\v2.0
|
||||
PCLEAN_PATH %SOLARROOT%\etw
|
||||
PERL %SOL_TMP%\r\btw\perl\bin\perl
|
||||
PSDK %SOL_TMP%\r\msvc9p\PlatformSDK\V6.1
|
||||
|
@ -3380,6 +3381,7 @@ wntmsci12
|
|||
DSDK %SOL_TMP%\r\msvc9p\DirectXSDK
|
||||
ENV_TOOLS %SOL_TMP%\etw\%WORK_STAMP%
|
||||
FSDK %SOL_TMP%\r\msvc9p\Sdk\v3.5
|
||||
F20SDK %SOL_TMP%\r\msvc9p\Sdk\v2.0
|
||||
PCLEAN_PATH %SOLARROOT%\etw
|
||||
PERL %SOL_TMP%\r\btw\perl\bin\perl
|
||||
PSDK %SOL_TMP%\r\msvc9p\PlatformSDK\V6.1
|
||||
|
@ -3399,6 +3401,7 @@ wntmsci12
|
|||
DSDK %COMPATH%\DirectXSDK
|
||||
ENV_TOOLS %SOL_TMP%\etw\%WORK_STAMP%
|
||||
FSDK %COMPATH%\Sdk\v3.5
|
||||
F20SDK %COMPATH%\Sdk\v2.0
|
||||
PCLEAN_PATH %SOL_TMP%\r\etw
|
||||
PERL %SOL_TMP%\r\btw\perl\bin\perl
|
||||
PSDK %COMPATH%\PlatformSDK\V6.1
|
||||
|
@ -3441,7 +3444,7 @@ wntmsci12
|
|||
MKOUT %PERL% %SOLARENV%\bin\mkout.pl
|
||||
MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%/mwscommit.pl
|
||||
OJDK16PATH %SOLAR_OJDK16PATH%
|
||||
PATH %PATH%;%SHARED_COM_SDK_PATH%;%COMPATH%/bin;%PSDK%\bin;%FSDK%;%DSDK%\Utilities\bin\x86;%PACKMS%
|
||||
PATH %PATH%;%SHARED_COM_SDK_PATH%;%COMPATH%/bin;%PSDK%\bin;%FSDK%;%F20SDK%\bin;%DSDK%\Utilities\bin\x86;%PACKMS%
|
||||
PROF_EDITION TRUE
|
||||
PSDKINC -I%PSDK%\include
|
||||
SOLAREXTRAINC -I%DSDK%\include
|
||||
|
@ -3467,6 +3470,7 @@ wntmsci12
|
|||
DEVROOT %SOLAR_ENV_ROOT%
|
||||
DSDK %SOLAR_ENV_ROOT%\msvc9p\DirectXSDK
|
||||
FSDK %SOLAR_ENV_ROOT%\msvc9p\Sdk\v3.5
|
||||
F20SDK %SOLAR_ENV_ROOT%\msvc9p\Sdk\v2.0
|
||||
NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_237_unicode
|
||||
PERL %SOLAR_ENV_ROOT%\btw\perl\bin\perl
|
||||
PSDK %SOLAR_ENV_ROOT%\msvc9p\PlatformSDK\V6.1
|
||||
|
|
Loading…
Reference in a new issue