[ooo-build-commit] Branch 'ooo/master' - 4 commits - scp2/source soldep/bootstrp soldep/inc solenv/bin solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Jun 4 17:03:19 PDT 2009
scp2/source/ooo/windowscustomaction_ooo.scp | 2
soldep/bootstrp/XmlBuildList.cxx | 4 +
soldep/bootstrp/prj.cxx | 61 +++++++++++++++++++-------
soldep/inc/soldep/prj.hxx | 4 -
solenv/bin/modules/installer/control.pm | 3 -
solenv/bin/modules/installer/simplepackage.pm | 9 +++
solenv/inc/unxlngx6.mk | 1
7 files changed, 62 insertions(+), 22 deletions(-)
New commits:
commit f38da9f59046e4b1fd55c89fef6b87faca7fd110
Author: Kurt Zenker <kz at openoffice.org>
Date: Thu Jun 4 20:20:11 2009 +0000
CWS-TOOLING: integrate CWS extmgr02
2009-05-28 09:06:03 +0200 ericb r272377 : #i102274# add a comment
2009-05-28 08:17:04 +0200 dv r272376 : #i102274# Performance optimization for cygwin accidentally removed setting of access rights for all other unix plattforms
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 77e4b9e..bbce941 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -404,6 +404,15 @@ sub create_simple_package
else
{
installer::systemactions::copy_one_file($source, $destination);
+ # see issue 102274
+ my $unixrights = "";
+ if ( $onefile->{'UnixRights'} )
+ {
+ $unixrights = $onefile->{'UnixRights'};
+
+ my $localcall = "$installer::globals::wrapcmd chmod $unixrights \'$destination\' \>\/dev\/null 2\>\&1";
+ system($localcall);
+ }
}
}
commit b832064f24c3e57f5ee56f376be16ecdb82c71c8
Author: Kurt Zenker <kz at openoffice.org>
Date: Thu Jun 4 15:47:31 2009 +0000
CWS-TOOLING: integrate CWS cmcfixes59
2009-05-18 10:10:11 +0200 cmc r272001 : #i102012# remove extensions warnings, and set as warnings-free
2009-05-16 17:29:59 +0200 cmc r271981 : #i101990# silence warning, logic is unchanged
2009-05-16 17:13:59 +0200 cmc r271980 : #i100412 remove warning, logic is unchanged
2009-05-16 17:08:57 +0200 cmc r271979 : #i100412 remove warning, logic is unchanged, matches comments for intent
2009-05-16 17:01:08 +0200 cmc r271978 : #i86576# remove uncallable code
2009-05-16 15:41:46 +0200 cmc r271977 : #i101988# fix up consts for warning-free
diff --git a/solenv/inc/unxlngx6.mk b/solenv/inc/unxlngx6.mk
index 49efccb..073293c 100644
--- a/solenv/inc/unxlngx6.mk
+++ b/solenv/inc/unxlngx6.mk
@@ -133,7 +133,6 @@ CFLAGSWERRCC=-Werror
# settings.mk):
MODULES_WITH_WARNINGS := \
- extensions \
soldep \
svx
commit 6cce8d34140097b24b5d8ecdcb60007d729705bf
Author: Kurt Zenker <kz at openoffice.org>
Date: Thu Jun 4 15:28:09 2009 +0000
CWS-TOOLING: integrate CWS bserver46
2009-05-19 18:25:49 +0200 kz r272093 : #159768# fixes
2009-05-18 16:17:53 +0200 kz r272031 : #i10000# define mac specials
2009-05-18 16:14:03 +0200 kz r272030 : #159768# allow a seperate directory for each module
2009-05-08 19:44:40 +0200 kz r271730 : #159767# handle .link projects
diff --git a/soldep/bootstrp/XmlBuildList.cxx b/soldep/bootstrp/XmlBuildList.cxx
index 4bd5291..875723a 100644
--- a/soldep/bootstrp/XmlBuildList.cxx
+++ b/soldep/bootstrp/XmlBuildList.cxx
@@ -75,8 +75,10 @@ static void dl_init(pTHX)
targ=sv_newmortal();
FREETMPS;
/* end Dynamic bootstrapping code */
- *file=0;
+#ifdef MACOSX
+ *file=0; // how does this works???
sp=0;
+#endif
}
FullByteStringList::FullByteStringList()
diff --git a/soldep/bootstrp/prj.cxx b/soldep/bootstrp/prj.cxx
index 311f40e..822bc20 100644
--- a/soldep/bootstrp/prj.cxx
+++ b/soldep/bootstrp/prj.cxx
@@ -1233,14 +1233,25 @@ void Star::UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersi
sSourceRoot = aEntry.GetFull();
GenericInformationList *pProjects = pProjectsKey->GetSubList();
if ( pProjects ) {
- for ( ULONG k = 0; k < pProjects->Count(); k++ ) {
- ByteString sProject( *pProjects->GetObject( k ));
+ GenericInformation * pProject = pProjects->First();
+ while (pProject) {
+ String sLocalSourceRoot = sSourceRoot;
+ ByteString sProject( *pProject );
String ssProject( sProject, RTL_TEXTENCODING_ASCII_US );
- String aBuildListPath = CreateFileName(ssProject);
+ ByteString aDirStr ("Directory");
+ GenericInformation * pDir = pProject->GetSubInfo (aDirStr);
+ if (pDir) {
+ ByteString aDir = pDir->GetValue();
+ DirEntry aRootEntry = aEntry.GetPath() + DirEntry(aDir);
+ sLocalSourceRoot = aRootEntry.GetFull();
+ }
+
+ String aBuildListPath = CreateFileName(ssProject, sLocalSourceRoot);
pFileList->Insert( new String( aBuildListPath ), LIST_APPEND );
ByteString sFile( aBuildListPath, RTL_TEXTENCODING_ASCII_US );
+ pProject = pProjects->Next();
}
}
}
@@ -1483,22 +1494,28 @@ void Star::Read( SolarFileList *pSolarFiles )
}
/*****************************************************************************/
-String Star::CreateFileName( String sProject )
+String Star::CreateFileName( String& rProject, String& rSourceRoot )
/*****************************************************************************/
{
// this method is used to find solarlist parts of nabours (other projects)
String sPrjDir( String::CreateFromAscii( "prj" ));
String sBuildList( String::CreateFromAscii( "build.lst" ));
String sXmlBuildList( String::CreateFromAscii( "build.xlist" ));
-
- DirEntry aEntry( sSourceRoot );
- aEntry += DirEntry( sProject );
+
+ DirEntry aEntry( rSourceRoot );
+ aEntry += DirEntry( rProject );
// if this project not exists, maybe it's a not added project of a CWS
- aEntry.SetExtension(String::CreateFromAscii( "lnk" ));
- if ( !aEntry.Exists() )
- aEntry.CutExtension();
+ if ( !aEntry.Exists() ) {
+ aEntry.SetExtension(String::CreateFromAscii( "lnk" ));
+ if ( !aEntry.Exists() )
+ aEntry.CutExtension();
+
+ aEntry.SetExtension(String::CreateFromAscii( "link" ));
+ if ( !aEntry.Exists() )
+ aEntry.CutExtension();
+ }
aEntry += DirEntry( sPrjDir );
@@ -1511,7 +1528,7 @@ String Star::CreateFileName( String sProject )
if (aPossibleEntry.Exists()) {
aActualEntry = aPossibleEntry;
} else if ( !aActualEntry.Exists() && aDBNotFoundHdl.IsSet())
- aDBNotFoundHdl.Call( &sProject );
+ aDBNotFoundHdl.Call( &rProject );
return aActualEntry.GetFull();
}
@@ -1520,7 +1537,7 @@ void Star::InsertSolarList( String sProject )
/*****************************************************************************/
{
// inserts a new solarlist part of another project
- String sFileName_l( CreateFileName( sProject ));
+ String sFileName_l( CreateFileName( sProject, sSourceRoot ));
for ( ULONG i = 0; i < aFileList.Count(); i++ ) {
if (( *aFileList.GetObject( i )) == sFileName_l )
@@ -1733,10 +1750,12 @@ void Star::InsertToken ( char *yytext )
pPrj->HasHardDependencies( bHardDep );
pPrj->HasFixedDependencies( bFixedDep );
+/*
if ( nStarMode == STAR_MODE_RECURSIVE_PARSE ) {
String sItem( aItem, RTL_TEXTENCODING_ASCII_US );
InsertSolarList( sItem );
}
+ */
}
}
break;
@@ -1782,6 +1801,7 @@ void Star::InsertToken ( char *yytext )
i++;
// und wer raeumt die depLst wieder ab ?
+ // CommandData macht das
}
/*****************************************************************************/
@@ -2363,12 +2383,20 @@ StarWriter::StarWriter( XmlBuildList* pXmlBuildListObj, GenericInformationList *
String sPrjDir( String::CreateFromAscii( "prj" ));
String sSolarFile( String::CreateFromAscii( "build.lst" ));
- for ( ULONG k = 0; k < pProjects->Count(); k++ ) {
- ByteString sProject( *pProjects->GetObject( k ));
+ GenericInformation * pProject = pProjects->First();
+ while (pProject) {
+ ByteString sProject( *pProject);
String ssProject( sProject, RTL_TEXTENCODING_ASCII_US );
DirEntry aPrjEntry( aEntry );
+ ByteString aDirStr ("Directory");
+ GenericInformation * pDir = pProject->GetSubInfo (aDirStr);
+ if (pDir) {
+ ByteString aDir = pDir->GetValue();
+ aPrjEntry = aEntry.GetPath() + DirEntry(aDir);
+ }
+
aPrjEntry += DirEntry( ssProject );
aPrjEntry += DirEntry( sPrjDir );
aPrjEntry += DirEntry( sSolarFile );
@@ -2377,6 +2405,7 @@ StarWriter::StarWriter( XmlBuildList* pXmlBuildListObj, GenericInformationList *
ByteString sFile( aPrjEntry.GetFull(), RTL_TEXTENCODING_ASCII_US );
fprintf( stdout, "%s\n", sFile.GetBuffer());
+ pProject = pProjects->Next();
}
}
}
@@ -2737,7 +2766,6 @@ void StarWriter::InsertTokenLine ( ByteString& rString )
sClientRestriction = aWhatOS.Copy( aWhatOS.GetToken( 0, ',' ).Len() + 1 );
aWhatOS = aWhatOS.GetToken( 0, ',' );
}
- aWhatOS = aWhatOS.GetToken( 0, ',' );
nOSType = GetOSType (aWhatOS);
}
break;
@@ -2801,14 +2829,15 @@ void StarWriter::InsertTokenLine ( ByteString& rString )
pPrj->AddDependencies( aItem, sMode );
else
pPrj->AddDependencies( aItem );
- pPrj->AddDependencies( aItem );
pPrj->HasHardDependencies( bHardDep );
pPrj->HasFixedDependencies( bFixedDep );
+ /*
if ( nStarMode == STAR_MODE_RECURSIVE_PARSE ) {
String sItem( aItem, RTL_TEXTENCODING_ASCII_US );
InsertSolarList( sItem );
}
+ */
}
}
diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx
index 9061b5f..dd05140 100644
--- a/soldep/inc/soldep/prj.hxx
+++ b/soldep/inc/soldep/prj.hxx
@@ -358,7 +358,7 @@ public:
DECLARE_LIST( StarFileList, StarFile * )
#define STAR_MODE_SINGLE_PARSE 0x0000
-#define STAR_MODE_RECURSIVE_PARSE 0x0001
+//#define STAR_MODE_RECURSIVE_PARSE 0x0001 it dosen't work anymore
#define STAR_MODE_MULTIPLE_PARSE 0x0002
class Star : public StarList
@@ -382,7 +382,7 @@ protected:
Link aFileIOErrorHdl; // called with &String as parameter!!!
void InsertSolarList( String sProject );
- String CreateFileName( String sProject );
+ String CreateFileName( String& rProject, String& rSourceRoot );
void Expand_Impl();
void ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj );
commit b7e9d1fcf2ef99fea5c55a2ace46029eec38f9fa
Author: Kurt Zenker <kz at openoffice.org>
Date: Thu Jun 4 12:28:19 2009 +0000
CWS-TOOLING: integrate CWS native247
2009-05-20 16:26:46 +0200 is r272137 : #i100251#
2009-05-14 17:52:39 +0200 is r271914 : #i87869# removal of start menu folder
2009-05-14 17:51:40 +0200 is r271913 : #i100251# no systemintegration for pkgformat native
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index ddf537e..2328cbc 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -153,7 +153,7 @@ WindowsCustomAction gid_Customaction_Shellextensionsdll4
Source = "shlxtmsi.dll";
Target = "DeinstallStartmenuFolderIcon";
Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "qslnkmsidll");
+ Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "MigrateFeatureStates");
End
WindowsCustomAction gid_Customaction_Shellextensionsdll5
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index aaf7c84..532eea1 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -711,9 +711,10 @@ sub set_addsystemintegration
my ($allvariables) = @_;
if ( $allvariables->{'ADDSYSTEMINTEGRATION'} ) { $installer::globals::addsystemintegration = 1; }
-
+
if ( $installer::globals::patch ) { $installer::globals::addsystemintegration = 0; }
if ( $installer::globals::languagepack ) { $installer::globals::addsystemintegration = 0; }
+ if ( $installer::globals::packageformat eq "native" ) { $installer::globals::addsystemintegration = 0; }
my $infoline = "Value of \$installer::globals::addsystemintegration: $installer::globals::addsystemintegration\n";
push( @installer::globals::globallogfileinfo, $infoline);
More information about the ooo-build-commit
mailing list