desktop/os2/source/applauncher/launcher.cxx | 16 ++++------------ set_soenv.in | 7 +++++++ solenv/gbuild/platform/os2.mk | 6 +----- solenv/inc/os2gcci.mk | 4 ++-- tools/source/generic/toolsin.cxx | 2 +- vcl/os2/source/gdi/salgdi3.cxx | 2 +- 6 files changed, 16 insertions(+), 21 deletions(-)
New commits: commit 051d1cb209bfe64b2f32400d88898c8ee2cde213 Author: Yuri Dario <yda...@apache.org> Date: Sun Oct 27 11:04:32 2013 +0000 i118923 - OS/2 port: remove three layer LIBPATH layout. diff --git a/desktop/os2/source/applauncher/launcher.cxx b/desktop/os2/source/applauncher/launcher.cxx index 3a41ed1..bb3fe02 100644 --- a/desktop/os2/source/applauncher/launcher.cxx +++ b/desktop/os2/source/applauncher/launcher.cxx @@ -42,12 +42,7 @@ int main( int argc, char* argv[]) erridErrorCode = WinGetLastError(hab); // Calculate application name - CHAR szLibpath[_MAX_PATH*2]; CHAR szApplicationName[_MAX_PATH]; - CHAR szDrive[_MAX_PATH]; - CHAR szDir[_MAX_PATH]; - CHAR szFileName[_MAX_PATH]; - CHAR szExt[_MAX_PATH]; // get executable fullpath DosGetInfoBlocks(NULL, &pib); @@ -55,15 +50,13 @@ int main( int argc, char* argv[]) // adjust libpath #if OSL_DEBUG_LEVEL > 0 + CHAR szLibpath[_MAX_PATH*2]; rc = DosQueryExtLIBPATH( (PSZ)szLibpath, BEGIN_LIBPATH); fprintf( stderr, "1 BeginLibPath: %s\n", szLibpath); #endif - _splitpath( szApplicationName, szDrive, szDir, szFileName, szExt ); - char* basedir = strstr( szDir, "\\PROGRAM\\"); + char* basedir = strrchr( szApplicationName, '\\'); if (basedir) *basedir = 0; - sprintf( szLibpath, "\"%s%s\\URE\\BIN\";\"%s%s\\BASIS\\PROGRAM\";%%BeginLIBPATH%%;", - szDrive, szDir, szDrive, szDir); - DosSetExtLIBPATH( (PCSZ)szLibpath, BEGIN_LIBPATH); + DosSetExtLIBPATH( (PCSZ)szApplicationName, BEGIN_LIBPATH); // make sure we load DLL from our path only, so multiple instances/versions // can be loaded. @@ -75,8 +68,7 @@ int main( int argc, char* argv[]) #endif // adjust exe name - _splitpath( szApplicationName, szDrive, szDir, szFileName, szExt ); - _makepath( szApplicationName, szDrive, szDir, OFFICE_IMAGE_NAME, (".bin") ); + strcat( szApplicationName, "\\" OFFICE_IMAGE_NAME ".bin"); // copy command line parameters int i, len; commit ed2aea97b8244dc57b3a699882ef4a6fef2600ab Author: Yuri Dario <yda...@apache.org> Date: Sun Oct 27 10:33:57 2013 +0000 i118923 - OS/2 port: build system updates. diff --git a/set_soenv.in b/set_soenv.in index ef96c7d..a0a351d 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -991,6 +991,12 @@ $PERL_PATH = dirname('@PERL@'); # Perl Path $XLIB = PathFormat('@XLIB@'); # X11 libraries $XINC = PathFormat('@XINC@'); # X11 includes +# YD disable autodetection, use PATH +if ( $platform =~ m/os2/ ) +{ + $PERL = 'perl'; + $PERL_PATH = ''; +} # Mac OS X/Darwin only variables. if ( $platform =~ m/darwin/ ) @@ -2080,6 +2086,7 @@ if ( $platform =~ m/os2/ ) ToFile( "LS", "ls.exe", "e" ); ToFile( "GNUCOPY", "cp.exe", "e" ); ToFile( "TOUCH", "touch", "e" ); + ToFile( "CONFIG_SITE", "/@unixroot/usr/share/config.site", "e" ); } # $perlpre is only used for the following three variables diff --git a/solenv/gbuild/platform/os2.mk b/solenv/gbuild/platform/os2.mk index 565f511..692f98a 100644 --- a/solenv/gbuild/platform/os2.mk +++ b/solenv/gbuild/platform/os2.mk @@ -87,10 +87,6 @@ gb_CFLAGS := \ -I$(JAVA_HOME)/include \ -I$(JAVA_HOME)/include/os2 - -# -fvisibility=hidden \ -# - gb_CXXFLAGS := \ -Zomf \ -Wall \ @@ -108,7 +104,7 @@ gb_CXXFLAGS := \ gb_STDLIBS = \ z \ - stdc++ \ + stdc++ ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) gb_CFLAGS_WERROR := -Werror diff --git a/solenv/inc/os2gcci.mk b/solenv/inc/os2gcci.mk index 28d7453..1c400c6 100644 --- a/solenv/inc/os2gcci.mk +++ b/solenv/inc/os2gcci.mk @@ -259,8 +259,8 @@ STDLIBGUIST=$(STDLIBCPP) STDSHLGUIMT=$(STDLIBCPP) STDSHLCUIMT=$(STDLIBCPP) -LIBSTLPORT=stlp45.lib $(DYNAMIC) -LIBSTLPORTST=stlp45.lib $(STATIC) $(DYNAMIC) +LIBSTLPORT=$(DYNAMIC) +LIBSTLPORTST=$(STATIC) $(DYNAMIC) # name of library manager diff --git a/tools/source/generic/toolsin.cxx b/tools/source/generic/toolsin.cxx index 0f8ba2d..632db62 100644 --- a/tools/source/generic/toolsin.cxx +++ b/tools/source/generic/toolsin.cxx @@ -31,7 +31,7 @@ #include <tools/debug.hxx> #include <toolsin.hxx> -#if defined WNT || defined OS2 +#if defined WNT #include <dll.hxx> #endif diff --git a/vcl/os2/source/gdi/salgdi3.cxx b/vcl/os2/source/gdi/salgdi3.cxx index e9152bd..8e06945 100644 --- a/vcl/os2/source/gdi/salgdi3.cxx +++ b/vcl/os2/source/gdi/salgdi3.cxx @@ -837,7 +837,7 @@ USHORT Os2SalGraphics::SetFont( ImplFontSelectData* pFont, int nFallbackLevel ) return 0; } -#if OSL_DEBUG_LEVEL>1 +#if OSL_DEBUG_LEVEL>10 debug_printf( "Os2SalGraphics::SetFont\n"); #endif _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits