Skip to content

C
core
Kaydet (Commit) 270bd2f3 authored tarafından Pedro Giffuni's avatar Pedro Giffuni
Dosyalara gözat
Seçenekler

i118582: OS/2 port - pyuno, readlicense, svtools, toolkit and tools build patches by Yuri Dario.

üst 9bb4e9b2
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 50 deletions
readlicense_oo/docs/readme.dtd
Dosyayı görüntüle @ 270bd2f3
......@@ -11,8 +11,8 @@
<!ELEMENT Paragraph (Text | List)*>
<!ATTLIST Paragraph
id CDATA #REQUIRED
gui (all | UNX | WNT) "all"
os (none | all | SOLARIS | LINUX | WNT | MACOSX) "all"
gui (all |OS2 | UNX | WNT) "all"
os (none | all | OS2 | SOLARIS | LINUX | WNT | MACOSX) "all"
cpuname (all | SPARC | INTEL | POWERPC) "all"
com (all | C50 | C52 | GCC | MSC) "all"
localized (true | false) "true"
......@@ -30,4 +30,4 @@
<!ELEMENT List (Text | Paragraph)+>
<!ATTLIST List
Enum (true | false) "false"
>
\ No newline at end of file
>
readlicense_oo/docs/readme/eval.xsl
Dosyayı görüntüle @ 270bd2f3
......@@ -21,7 +21,7 @@
<body>
<table border='1' style='border-collapse:collapse;' cellpadding='5'>
<tr>
<th>attribs</th><th class="wnt">WNT</th><th class="mac">MAC</th><th class="soli">SOLI</th><th class="solx">SOLX</th><th class="unx">UNX</th><th>none</th><th>all</th><th>Content</th>
<th>attribs</th><th class="wnt">WNT</th><th class="os2">OS2</th><th class="mac">MAC</th><th class="soli">SOLI</th><th class="solx">SOLX</th><th class="unx">UNX</th><th>none</th><th>all</th><th>Content</th>
</tr>
<xsl:apply-templates />
</table>
......@@ -42,6 +42,7 @@
<xsl:if test="@os">os=<xsl:value-of select="@os"/></xsl:if><xsl:text> </xsl:text><xsl:if test="@gui">gui=<xsl:value-of select="@gui"/></xsl:if>
</td>
<th class="wnt"><xsl:if test="@os='WNT' or @gui='WNT'">WNT</xsl:if></th>
<th class="os2"><xsl:if test="@os='OS2' or @gui='WNT'">OS2</xsl:if></th>
<th class="mac"><xsl:if test="@os='MACOSX'">MAC</xsl:if></th>
<th class="soli"><xsl:if test="@os='SOLARIS' and @cpuname='INTEL'">SOLI</xsl:if></th>
<th class="solx"><xsl:if test="@os='SOLARIS' and @cpuname='SPARC'">SOLX</xsl:if></th>
......
readlicense_oo/makefile.mk
Dosyayı görüntüle @ 270bd2f3
......@@ -9,6 +9,9 @@ TARGET=source
.IF "$(GUI)"=="WNT"
SYSLICBASE=license.txt license.html license.rtf
SYSLICDEST=$(MISC)$/license$/wnt
.ELIF "$(GUI)"=="OS2"
SYSLICBASE=license.txt license.html license.rtf
SYSLICDEST=$(MISC)$/license$/os2
.ELSE # "$(GUI)"=="WNT"
SYSLICBASE=LICENSE LICENSE.html
SYSLICDEST=$(MISC)$/license$/unx
......
readlicense_oo/prj/d.lst
Dosyayı görüntüle @ 270bd2f3
......@@ -13,12 +13,17 @@ dos: echo =====================================================================
..\%__SRC%\misc\license\wnt\license*.txt %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\wnt\license*.html %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\wnt\license*.rtf %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\os2\license*.txt %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\os2\license*.html %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\os2\license*.rtf %_DEST%\bin%_EXT%\osl
# URE:
mkdir: %_DEST%\bin%_EXT%\ure
..\%__SRC%\misc\license\unx\LICENSE_en-US %_DEST%\bin%_EXT%\ure\LICENSE
..\%__SRC%\misc\license\wnt\license_en-US.txt %_DEST%\bin%_EXT%\ure\LICENSE
..\%__SRC%\misc\license\wnt\license_en-US.rtf %_DEST%\bin%_EXT%\ure\license_en-US.rtf
..\%__SRC%\misc\license\os2\license_en-US.txt %_DEST%\bin%_EXT%\ure\LICENSE
..\%__SRC%\misc\license\os2\license_en-US.rtf %_DEST%\bin%_EXT%\ure\license_en-US.rtf
# RTF only for Windows?
# Why? It comes from cws_src680_langsupporter.
......@@ -30,6 +35,8 @@ dos: echo =====================================================================
..\%__SRC%\misc\WNT\readme_*.txt %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\WNT\readme_*.html %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\OS2\readme_*.txt %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\OS2\readme_*.html %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\UNX\README_* %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\UNX\README_*.html %_DEST%\bin%_EXT%\osl
svtools/source/contnr/svtreebx.cxx
Dosyayı görüntüle @ 270bd2f3
......@@ -1508,9 +1508,6 @@ void SvTreeListBox::ImplInitStyle()
GetModel()->SetSortMode( SortNone );
GetModel()->SetCompareHdl( Link() );
}
#ifdef OS2
nWindowStyle |= WB_VSCROLL;
#endif
pImp->SetStyle( nWindowStyle );
pImp->Resize();
Invalidate();
......
svtools/source/svhtml/htmlkywd.cxx
Dosyayı görüntüle @ 270bd2f3
......@@ -201,9 +201,6 @@ extern "C"
static int
#if defined( WNT )
__cdecl
#endif
#if defined( ICC ) && defined( OS2 )
_Optlink
#endif
HTMLKeyCompare( const void *pFirst, const void *pSecond)
{
......@@ -556,9 +553,6 @@ extern "C"
static int
#if defined( WNT )
__cdecl
#endif
#if defined( ICC ) && defined( OS2 )
_Optlink
#endif
HTMLCharNameCompare( const void *pFirst, const void *pSecond)
{
......@@ -1017,9 +1011,6 @@ extern "C"
static int
#if defined( WNT )
__cdecl
#endif
#if defined( ICC ) && defined( OS2 )
_Optlink
#endif
HTMLColorNameCompare( const void *pFirst, const void *pSecond)
{
......
svtools/source/svrtf/rtfkeywd.cxx
Dosyayı görüntüle @ 270bd2f3
......@@ -1185,9 +1185,6 @@ extern "C" {
static int
#if defined( WNT )
__cdecl
#endif
#if defined( ICC ) && defined( OS2 )
_Optlink
#endif
RTFKeyCompare( const void *pFirst, const void *pSecond)
{
......
toolkit/source/awt/vclxdialog.cxx
Dosyayı görüntüle @ 270bd2f3
......@@ -37,6 +37,8 @@
#include <tools/prewin.h>
#include <windows.h>
#include <tools/postwin.h>
#elif defined ( OS2 )
#include <svpm.h>
#elif defined ( QUARTZ )
#include "premac.h"
#include <Cocoa/Cocoa.h>
......
toolkit/source/awt/vclxsystemdependentwindow.cxx
Dosyayı görüntüle @ 270bd2f3
......@@ -39,6 +39,8 @@
#include <tools/prewin.h>
#include <windows.h>
#include <tools/postwin.h>
#elif defined ( OS2 )
#include <svpm.h>
#elif defined ( QUARTZ )
#include "premac.h"
#include <Cocoa/Cocoa.h>
......
toolkit/source/awt/vclxtoolkit.cxx
Dosyayı görüntüle @ 270bd2f3
......@@ -54,6 +54,8 @@
#include <tools/prewin.h>
#include <windows.h>
#include <tools/postwin.h>
#elif defined ( OS2 )
#include <svpm.h>
#elif (defined QUARTZ)
#include "premac.h"
#include <Cocoa/Cocoa.h>
......
toolkit/source/awt/vclxtopwindow.cxx
Dosyayı görüntüle @ 270bd2f3
......@@ -30,6 +30,8 @@
#include <tools/prewin.h>
#include <windows.h>
#include <tools/postwin.h>
#elif defined ( OS2 )
#include <svpm.h>
#elif defined ( QUARTZ )
#include "premac.h"
#include <Cocoa/Cocoa.h>
......
toolkit/source/awt/vclxwindow1.cxx
Dosyayı görüntüle @ 270bd2f3
......@@ -36,6 +36,8 @@
#include <tools/prewin.h>
#include <windows.h>
#include <tools/postwin.h>
#elif defined ( OS2 )
#include <svpm.h>
#elif defined ( QUARTZ )
#include "premac.h"
#include <Cocoa/Cocoa.h>
......
tools/Library_tl.mk
Dosyayı görüntüle @ 270bd2f3
......@@ -126,6 +126,12 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
))
endif
ifeq ($(GUI),OS2)
$(eval $(call gb_Library_add_exception_objects,tl,\
tools/os2/source/dll/toolsdll \
))
endif
ifeq ($(SYSTEM_ZLIB),YES)
$(eval $(call gb_Library_set_cxxflags,tl,\
$$(CXXFLAGS) \
......
tools/bootstrp/rscdep.cxx
Dosyayı görüntüle @ 270bd2f3
......@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_tools.hxx"
#ifdef UNX
#if defined(UNX) || defined(OS2)
#include <unistd.h>
#endif
......
tools/os2/source/dll/toolsdll.cxx
Dosyayı görüntüle @ 270bd2f3
......@@ -21,13 +21,7 @@
#ifndef _SHL_HXX
#include <tools/shl.hxx>
#endif
#ifndef _DLL_HXX
#include <dll.hxx>
#endif
// =======================================================================
......@@ -35,7 +29,7 @@ static void* aAppData[SHL_COUNT];
// -----------------------------------------------------------------------
void** GetAppData( USHORT nSharedLib )
void** GetAppData( sal_uInt16 nSharedLib )
{
return &(aAppData[nSharedLib]);
}
......
tools/source/datetime/tdate.cxx
Dosyayı görüntüle @ 270bd2f3
......@@ -142,7 +142,7 @@ static void DaysToDate( long nDays,
Date::Date()
{
#if defined( OS2 )
DATETIME aDateTime;
PM_DATETIME aDateTime;
DosGetDateTime( &aDateTime );
// Datum zusammenbauen
......
tools/source/datetime/ttime.cxx
Dosyayı görüntüle @ 270bd2f3
......@@ -96,7 +96,7 @@ static Time Sec100ToTime( sal_Int32 nSec100 )
Time::Time()
{
#if defined( OS2 )
DATETIME aDateTime;
PM_DATETIME aDateTime;
DosGetDateTime( &aDateTime );
// Zeit zusammenbauen
......@@ -316,7 +316,7 @@ Time Time::GetUTCOffset()
{
#if defined( OS2 )
#undef timezone
DATETIME aDateTime;
PM_DATETIME aDateTime;
DosGetDateTime( &aDateTime );
// Zeit zusammenbauen
......
tools/source/fsys/os2.cxx
Dosyayı görüntüle @ 270bd2f3
......@@ -49,8 +49,8 @@ DECLARE_LIST( FSysSortList, FSysSort* );
DECLARE_LIST( FileStatList, FileStat* );
static char sCaseMap[256];
static BOOL bCaseMap = FALSE;
static BOOL bDriveMap = FALSE;
static sal_Bool bCaseMap = FALSE;
static sal_Bool bDriveMap = FALSE;
struct DriveMapItem
{
......@@ -64,7 +64,7 @@ void CreateDriveMapImpl();
static DriveMapItem aDriveMap[26];
static BOOL bLastCaseSensitive = FALSE;
static sal_Bool bLastCaseSensitive = FALSE;
//====================================================================
......@@ -146,7 +146,7 @@ char* volumeid( const char* pPfad )
|*
*************************************************************************/
BOOL DirEntry::ToAbs()
sal_Bool DirEntry::ToAbs()
{
DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
......@@ -207,7 +207,7 @@ String DirEntry::GetVolume() const
|*
*************************************************************************/
BOOL DirEntry::SetCWD( BOOL bSloppy ) const
sal_Bool DirEntry::SetCWD( sal_Bool bSloppy ) const
{
DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
......@@ -242,7 +242,7 @@ BOOL DirEntry::SetCWD( BOOL bSloppy ) const
*************************************************************************/
#if 0 // YD see dirent.cxx
BOOL createLongNameEA( const PCSZ pszPath, ULONG ulAttributes, const String& aLongName );
sal_Bool createLongNameEA( const PCSZ pszPath, ULONG ulAttributes, const String& aLongName );
FSysError DirEntry::MoveTo( const DirEntry& rDest ) const
{
......@@ -450,7 +450,7 @@ struct _FSYS_FSQBUFFER
UCHAR sBuf[256];
};
BOOL FileStat::Update( const DirEntry& rDirEntry, BOOL bAccessRemovableDevice )
sal_Bool FileStat::Update( const DirEntry& rDirEntry, sal_Bool bAccessRemovableDevice )
{
nSize = 0;
FSysPathStyle eStyle = FSYS_STYLE_UNKNOWN;
......@@ -604,7 +604,7 @@ BOOL FileStat::Update( const DirEntry& rDirEntry, BOOL bAccessRemovableDevice )
return TRUE;
}
BOOL IsRedirectable_Impl( const ByteString &rPath )
sal_Bool IsRedirectable_Impl( const ByteString &rPath )
{
if ( rPath.Len() >= 3 && ':' == rPath.GetBuffer()[1] )
{
......@@ -616,7 +616,7 @@ BOOL IsRedirectable_Impl( const ByteString &rPath )
}
#if 0
BOOL IsRedirectable_Impl( const String &rPath )
sal_Bool IsRedirectable_Impl( const String &rPath )
{
if ( rPath.Len() >= 3 && ':' == rPath.GetStr()[1] )
{
......@@ -643,7 +643,7 @@ const char* TempDirImpl( char *pBuf )
{
PSZ pVar;
USHORT nRet;
BOOL bAppendTemp = FALSE; // mu\s noch \\temp angeh"angt werden
sal_Bool bAppendTemp = FALSE; // mu\s noch \\temp angeh"angt werden
// Erstmal sehen, ob TEMP oder TMP gesetzt sind
nRet = DosScanEnv( (PSZ)"TEMP", &pVar );
......@@ -659,7 +659,7 @@ const char* TempDirImpl( char *pBuf )
// falls das geklappt hat, und ein Backslash dranhaengt,
// oder falls es bisher nicht geklappt hat,
// muessen wir nachher einen Backslash entfernen
BOOL bRemoveBS = nRet || *(pVar+strlen(pVar)-1) == '\\';
sal_Bool bRemoveBS = nRet || *(pVar+strlen(pVar)-1) == '\\';
// Keine temp-Variable gefunden, dann gehen wir mal auf die Suche
// nach dem System-Laufwerk
......@@ -790,7 +790,7 @@ void CreateDriveMapImpl()
DosError(FERR_DISABLEHARDERR);
// determine number of floppy-drives
BYTE nFloppies;
PM_BYTE nFloppies;
nRet = DosDevConfig( (void*) &nFloppies, DEVINFO_FLOPPY );
// reset the map
......@@ -812,7 +812,7 @@ void CreateDriveMapImpl()
for ( nDrive = 2; nDrive < 26; ++nDrive )
{
// open drive
BOOL bFixed;
sal_Bool bFixed;
HFILE nDevHandle;
char pDriveName[3] = "#:";
pDriveName[0] = nDrive+'a';
......@@ -826,7 +826,7 @@ void CreateDriveMapImpl()
if ( !nRet )
{
// removeable?
BYTE nDriveId = nDrive;
PM_BYTE nDriveId = nDrive;
ULONG nParaOutLen, nDataOutLen;
nRet = DosDevIOCtl(nDevHandle, 8, 0x20,
&nDriveId, sizeof(nDriveId), &nParaOutLen,
......@@ -932,7 +932,7 @@ FSysPathStyle DirEntry::GetPathStyle( const String &rDevice )
|*
*************************************************************************/
BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
sal_Bool DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
{
if (eFormatter==FSYS_STYLE_HOST)
{
......@@ -947,7 +947,7 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
}
else
{
BOOL isCaseSensitive = FALSE; // ich bin unter OS2, also ist der default im Zweifelsfall case insensitiv
sal_Bool isCaseSensitive = FALSE; // ich bin unter OS2, also ist der default im Zweifelsfall case insensitiv
switch ( eFormatter )
{
case FSYS_STYLE_MAC:
......@@ -1003,7 +1003,7 @@ ErrCode FileStat::QueryDiskSpace( const String &rPath,
//=========================================================================
void FSysEnableSysErrorBox( BOOL bEnable )
void FSysEnableSysErrorBox( sal_Bool bEnable )
{
DosError( bEnable ? 0 : FERR_DISABLEHARDERR );
}
......
tools/source/fsys/os2.hxx
Dosyayı görüntüle @ 270bd2f3
......@@ -59,7 +59,7 @@ String ToLowerImpl( const String& );
#define START_DRV 'a'
inline BOOL DRIVE_EXISTS( char c )
inline PM_BOOL DRIVE_EXISTS( char c )
{
ULONG nCur, nMap;
APIRET nRet = DosQueryCurrentDisk( &nCur, &nMap );
......
tools/source/generic/toolsin.cxx
Dosyayı görüntüle @ 270bd2f3
......@@ -85,7 +85,7 @@ void GlobalDeInitTools()
#if defined WNT
ImpDeInitWinTools();
#endif
#ifdef OS2
#ifdef OS2_YD_REMOVEME
ImpDeInitOS2Tools();
#endif
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment