summaryrefslogtreecommitdiff
path: root/rsc/source/prj/start.cxx
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-09-20 15:34:19 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-09-20 15:34:19 +0000
commit227eca315e8f524b5ef0102e55ba009fb09c8bb7 (patch)
tree8032ff17270eb702981208cdf16255c0ec229e72 /rsc/source/prj/start.cxx
parent93cfdc0c86a41b7c0d923315a0f0272f0c5d0186 (diff)
INTEGRATION: CWS os2port01 (1.5.46); FILE MERGED
2007/09/05 08:36:18 obr 1.5.46.3: RESYNC: (1.9-1.10); FILE MERGED 2007/08/12 15:07:34 obr 1.5.46.2: RESYNC: (1.5-1.9); FILE MERGED 2006/12/28 15:03:41 ydario 1.5.46.1: OS/2 initial import.
Diffstat (limited to 'rsc/source/prj/start.cxx')
-rw-r--r--rsc/source/prj/start.cxx26
1 files changed, 21 insertions, 5 deletions
diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index 1942a7ec945c..5b0e2cfaa75d 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: start.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: hr $ $Date: 2007-07-31 16:02:23 $
+ * last change: $Author: vg $ $Date: 2007-09-20 16:34:19 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -55,7 +55,7 @@
#if defined ( OS2 ) && !defined ( GCC )
#include <direct.h>
#endif
-#ifndef CSET
+#if !defined ( CSET ) && !defined ( OS2 )
#include <dos.h>
#endif
@@ -150,7 +150,11 @@ static BOOL CallPrePro( const ByteString& rPrePro,
pCmdL = &aRespCmdL;
for( i = 0; i < (int)(aNewCmdL.GetCount() -1); i++ )
{
+#ifdef OS2
+ fprintf( fRspFile, "%s\n", (const char *)aNewCmdL.GetEntry( i ) );
+#else
fprintf( fRspFile, "%s ", (const char *)aNewCmdL.GetEntry( i ) );
+#endif
}
fclose( fRspFile );
@@ -163,7 +167,7 @@ static BOOL CallPrePro( const ByteString& rPrePro,
printf( "\n" );
}
-#if ((defined PM2 || defined WNT) && (defined TCPP || defined tcpp)) || defined UNX
+#if ((defined PM2 || defined WNT) && (defined TCPP || defined tcpp)) || defined UNX || defined OS2
nExit = spawnvp( P_WAIT, rPrePro.GetBuffer(), (char* const*)pCmdL->GetBlock() );
#elif defined CSET
nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), char **) (const char**)pCmdL->GetBlock() );
@@ -237,23 +241,35 @@ static BOOL CallRsc2( ByteString aRsc2Name,
{
}
else
+#ifdef OS2
+ fprintf( fRspFile, "%s\n",
+#else
fprintf( fRspFile, "%s ",
+#endif
(const char *)pCmdLine->GetEntry( i ) );
};
+#ifdef OS2
+ fprintf( fRspFile, "%s\n", aSrsName.GetBuffer() );
+#else
fprintf( fRspFile, aSrsName.GetBuffer() );
+#endif
pString = pInputList->First();
while( pString )
{
+#ifdef OS2
+ fprintf( fRspFile, "%s\n", pString->GetBuffer() );
+#else
fprintf( fRspFile, " %s", pString->GetBuffer() );
+#endif
pString = pInputList->Next();
};
fclose( fRspFile );
};
-#if ((defined PM2 || defined WNT) && (defined TCPP || defined tcpp)) || defined UNX
+#if ((defined PM2 || defined WNT) && (defined TCPP || defined tcpp)) || defined UNX || defined OS2
nExit = spawnvp( P_WAIT, aRsc2Name.GetBuffer(), (char* const*)aNewCmdL.GetBlock() );
#elif defined CSET
nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (char **)(const char**)aNewCmdL.GetBlock() );