summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2008-10-15 08:43:33 +0000
committerOliver Bolte <obo@openoffice.org>2008-10-15 08:43:33 +0000
commit647d8c8ead7db5860dc8207332e49fc4c912f4da (patch)
tree6300871fce0563f585aa348f3fdf3ea13fe7b016
parentf066a08d62db69668b14d784d5d7355411243ff1 (diff)
CWS-TOOLING: integrate CWS ause098
-rw-r--r--tools/bootstrp/cppdep.cxx22
-rw-r--r--tools/bootstrp/rscdep.cxx16
2 files changed, 35 insertions, 3 deletions
diff --git a/tools/bootstrp/cppdep.cxx b/tools/bootstrp/cppdep.cxx
index e8e4e78b04bb..7733b2f4bcec 100644
--- a/tools/bootstrp/cppdep.cxx
+++ b/tools/bootstrp/cppdep.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: cppdep.cxx,v $
- * $Revision: 1.16 $
+ * $Revision: 1.16.42.1 $
*
* This file is part of OpenOffice.org.
*
@@ -185,6 +185,26 @@ ByteString CppDep::Exists( ByteString aFileName )
ByteString CppDep::IsIncludeStatement( ByteString aLine )
{
ByteString aRetStr;
+ if ( aLine.Search("/*",0) != STRING_NOTFOUND )
+ {
+#ifdef DEBUG_VERBOSE
+ fprintf( stderr, "found starting C comment : %s\n", aLine.GetBuffer() );
+#endif
+ aLine.Erase(aLine.Search("/*",0), aLine.Len() - 1);
+#ifdef DEBUG_VERBOSE
+ fprintf( stderr, "cleaned string : %s\n", aLine.GetBuffer() );
+#endif
+ }
+ if ( aLine.Search("//",0) != STRING_NOTFOUND )
+ {
+#ifdef DEBUG_VERBOSE
+ fprintf( stderr, "found C++ comment : %s\n", aLine.GetBuffer() );
+#endif
+ aLine.Erase(aLine.Search("//",0), aLine.Len() - 1);
+#ifdef DEBUG_VERBOSE
+ fprintf( stderr, "cleaned string : %s\n", aLine.GetBuffer() );
+#endif
+ }
// WhiteSpacesfressen
aLine.EraseAllChars(' ');
aLine.EraseAllChars('\t');
diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx
index 3bdad6839711..7c394dcdaee8 100644
--- a/tools/bootstrp/rscdep.cxx
+++ b/tools/bootstrp/rscdep.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: rscdep.cxx,v $
- * $Revision: 1.25 $
+ * $Revision: 1.25.42.1 $
*
* This file is part of OpenOffice.org.
*
@@ -90,6 +90,7 @@ main( int argc, char **argv )
{
int c;
char aBuf[255];
+ char pFileNamePrefix[255];
char pOutputFileName[255];
char pSrsFileName[255];
String aSrsBaseName;
@@ -105,6 +106,11 @@ main( int argc, char **argv )
for ( int i=1; i<argc; i++)
{
strcpy( aBuf, (const char *)argv[i] );
+ if ( aBuf[0] == '-' && aBuf[1] == 'p' && aBuf[2] == '=' )
+ {
+ strcpy(pFileNamePrefix, &aBuf[3]);
+ //break;
+ }
if ( aBuf[0] == '-' && aBuf[1] == 'f' && aBuf[2] == 'o' && aBuf[3] == '=' )
{
strcpy(pOutputFileName, &aBuf[4]);
@@ -137,6 +143,11 @@ main( int argc, char **argv )
{
char aBuf2[255];
(void) strcpy( aBuf2, aToken.GetBuffer());
+ if ( aBuf[0] == '-' && aBuf[1] == 'p' && aBuf[2] == '=' )
+ {
+ strcpy(pFileNamePrefix, &aBuf[3]);
+ //break;
+ }
if ( aBuf2[0] == '-' && aBuf2[1] == 'f' && aBuf2[2] == 'o' )
{
strcpy(pOutputFileName, &aBuf2[3]);
@@ -212,7 +223,8 @@ main( int argc, char **argv )
DirEntry aEntry(".");
aEntry.ToAbs();
- String aCwd = aEntry.GetName();
+// String aCwd = aEntry.GetName();
+ String aCwd(pFileNamePrefix, gsl_getSystemTextEncoding());
/* USHORT nPos;
#ifndef UNX
while ( (nPos = aCwd.Search('\\') != STRING_NOTFOUND ))