You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by yd...@apache.org on 2012/02/28 18:25:16 UTC
svn commit: r1294739 - in /incubator/ooo/trunk/main: RepositoryFixes.mk
packimages/pack/makefile.mk solenv/bin/hicontrast-to-theme.pl
solenv/inc/libs.mk solenv/inc/unitools.mk vcl/os2/source/window/salobj.cxx
Author: ydario
Date: Tue Feb 28 17:25:15 2012
New Revision: 1294739
URL: http://svn.apache.org/viewvc?rev=1294739&view=rev
Log:
i118923 - OS/2 port: minor fixes to build system.
Modified:
incubator/ooo/trunk/main/RepositoryFixes.mk
incubator/ooo/trunk/main/packimages/pack/makefile.mk
incubator/ooo/trunk/main/solenv/bin/hicontrast-to-theme.pl
incubator/ooo/trunk/main/solenv/inc/libs.mk
incubator/ooo/trunk/main/solenv/inc/unitools.mk
incubator/ooo/trunk/main/vcl/os2/source/window/salobj.cxx
Modified: incubator/ooo/trunk/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/RepositoryFixes.mk?rev=1294739&r1=1294738&r2=1294739&view=diff
==============================================================================
--- incubator/ooo/trunk/main/RepositoryFixes.mk (original)
+++ incubator/ooo/trunk/main/RepositoryFixes.mk Tue Feb 28 17:25:15 2012
@@ -183,9 +183,8 @@ gb_Library_FILENAMES := $(patsubst rdf:r
gb_Library_FILENAMES := $(patsubst tl:itl%,tl:tl%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst sal:sal%,sal:sal3%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst salhelper:salhelper%,salhelper:salhelp3%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst sb:sb%,sb:basic%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
-#gb_Library_FILENAMES := $(patsubst sot:sot%,sot:isot%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst svl:isvl%,svl:svl%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
Modified: incubator/ooo/trunk/main/packimages/pack/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/packimages/pack/makefile.mk?rev=1294739&r1=1294738&r2=1294739&view=diff
==============================================================================
--- incubator/ooo/trunk/main/packimages/pack/makefile.mk (original)
+++ incubator/ooo/trunk/main/packimages/pack/makefile.mk Tue Feb 28 17:25:15 2012
@@ -66,11 +66,7 @@ $(COMMONBIN)$/images_brand.zip:
# generate the HiContrast icon set
$(MISC)$/hicontrast.flag .PHONY :
-.IF "$(GUI)"=="OS2"
- touch $(MISC)$/hicontrast.flag
-.ELSE
$(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(SOLARSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@
-.ENDIF
# unpack the classic icon set
$(MISC)$/classic.flag : $(CLASSIC_TARBALL)
Modified: incubator/ooo/trunk/main/solenv/bin/hicontrast-to-theme.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/hicontrast-to-theme.pl?rev=1294739&r1=1294738&r2=1294739&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/hicontrast-to-theme.pl (original)
+++ incubator/ooo/trunk/main/solenv/bin/hicontrast-to-theme.pl Tue Feb 28 17:25:15 2012
@@ -108,6 +108,9 @@ sub copy_normalized {
@from_stat = stat($file);
@to_stat = stat($copy);
if ( $from_stat[9] > $to_stat[9] ) {
+ if ( $^O eq 'os2' ) {
+ $rc = unlink($copy);
+ }
copy( $file, $copy ) || die $!;
utime( $from_stat[9], $from_stat[9], $copy );
}
Modified: incubator/ooo/trunk/main/solenv/inc/libs.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/libs.mk?rev=1294739&r1=1294738&r2=1294739&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/libs.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/libs.mk Tue Feb 28 17:25:15 2012
@@ -190,7 +190,11 @@ TKTLIB=-ltkt$(DLLPOSTFIX)
SAXLIB=-lsax$(DLLPOSTFIX)
MAILLIB=-lmail
DOCMGRLIB=-ldmg$(DLLPOSTFIX)
+.IF "$(GUI)"=="OS2"
+BASICLIB=-lbasic
+.ELSE
BASICLIB=-lsb$(DLLPOSTFIX)
+.ENDIF
VBAHELPERLIB=-lvbahelper$(DLLPOSTFIX)
DBTOOLSLIB=-ldbtools$(DLLPOSTFIX)
HM2LIBSH=-lhmwrpdll
Modified: incubator/ooo/trunk/main/solenv/inc/unitools.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/unitools.mk?rev=1294739&r1=1294738&r2=1294739&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/unitools.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/unitools.mk Tue Feb 28 17:25:15 2012
@@ -144,6 +144,7 @@ LS=ls
ECHON=echo -n
ECHONL=echo
.ELIF "$(GUI)"=="OS2"
+GPERF*=gperf
SED*=sed
SORT*=sort
PERL*=perl
Modified: incubator/ooo/trunk/main/vcl/os2/source/window/salobj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/os2/source/window/salobj.cxx?rev=1294739&r1=1294738&r2=1294739&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/os2/source/window/salobj.cxx (original)
+++ incubator/ooo/trunk/main/vcl/os2/source/window/salobj.cxx Tue Feb 28 17:25:15 2012
@@ -198,7 +198,9 @@ MRESULT EXPENTRY SalSysObjChildWndProc(
MRESULT nRet = 0;
int bDef = TRUE;
+#if OSL_DEBUG_LEVEL>0
debug_printf( "SalSysObjChildWndProc hWnd 0x%x nMsg %d\n", hWnd, nMsg);
+#endif
switch( nMsg )
{
@@ -233,7 +235,9 @@ MRESULT EXPENTRY SalSysObjClipWndProc( H
MRESULT nRet = 0;
int bDef = TRUE;
+#if OSL_DEBUG_LEVEL>0
debug_printf( "SalSysObjClipWndProc hWnd 0x%x nMsg %d\n", hWnd, nMsg);
+#endif
switch( nMsg )
{
@@ -360,8 +364,10 @@ SalObject* ImplSalCreateObject( Os2SalIn
if ( hWnd )
{
+#if OSL_DEBUG_LEVEL>0
debug_printf("ImplSalCreateObject hWndChild %x\n", hWndChild);
debug_printf("ImplSalCreateObject hWnd %x\n", hWnd);
+#endif
pObject->mhWnd = hWnd;
pObject->mhWndChild = hWndChild;
pObject->maSysData.hWnd = hWndChild;
@@ -474,7 +480,9 @@ void Os2SalObject::UnionClipRegion( long
nX, mnHeight-(nY+nHeight), nWidth, nHeight,
mhWnd, mhLastClipWnd,
0, NULL, NULL );
+#if OSL_DEBUG_LEVEL>0
debug_printf("Os2SalObject::UnionClipRegion hClipWnd %x\n", hClipWnd);
+#endif
mhLastClipWnd = hClipWnd;
}