incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1202442 - in /incubator/ooo/trunk/main: agg/source/ basebmp/test/ binaryurp/prj/ l10ntools/prj/ remotebridges/prj/ sal/osl/os2/ stlport/ vcl/ vcl/workben/
Date Tue, 15 Nov 2011 22:06:23 GMT
Author: pfg
Date: Tue Nov 15 22:06:23 2011
New Revision: 1202442

URL: http://svn.apache.org/viewvc?rev=1202442&view=rev
Log:
i118582 - OS/2 Port: misc build fixes. By ydario@.

Modified:
    incubator/ooo/trunk/main/agg/source/makefile.mk
    incubator/ooo/trunk/main/basebmp/test/makefile.mk
    incubator/ooo/trunk/main/binaryurp/prj/d.lst
    incubator/ooo/trunk/main/l10ntools/prj/d.lst
    incubator/ooo/trunk/main/remotebridges/prj/d.lst
    incubator/ooo/trunk/main/sal/osl/os2/file.cxx
    incubator/ooo/trunk/main/sal/osl/os2/module.c
    incubator/ooo/trunk/main/stlport/STLport-4.5.patch
    incubator/ooo/trunk/main/vcl/Library_vcl.mk
    incubator/ooo/trunk/main/vcl/workben/svdem.cxx

Modified: incubator/ooo/trunk/main/agg/source/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/agg/source/makefile.mk?rev=1202442&r1=1202441&r2=1202442&view=diff
==============================================================================
--- incubator/ooo/trunk/main/agg/source/makefile.mk (original)
+++ incubator/ooo/trunk/main/agg/source/makefile.mk Tue Nov 15 22:06:23 2011
@@ -68,6 +68,9 @@ SLOFILES= \
 		$(SLO)$/agg_vpgen_clip_polyline.obj		\
 		$(SLO)$/agg_vpgen_segmentator.obj
 
+.IF "$(GUI)" == "OS2"
+SHL1OBJS = $(SLOFILES)
+.ENDIF
 SHL1TARGET = $(TARGET)$(DLLPOSTFIX)
 SHL1IMPLIB = i$(TARGET)
 SHL1LIBS = $(SLB)$/$(TARGET).lib

Modified: incubator/ooo/trunk/main/basebmp/test/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basebmp/test/makefile.mk?rev=1202442&r1=1202441&r2=1202442&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basebmp/test/makefile.mk (original)
+++ incubator/ooo/trunk/main/basebmp/test/makefile.mk Tue Nov 15 22:06:23 2011
@@ -33,6 +33,13 @@ TARGETTYPE=GUI
 
 ENABLE_EXCEPTIONS=TRUE
 
+.IF "$(GUI)" == "OS2"
+
+@all:
+	@echo "Skipping, cppunit broken."
+
+.ELSE
+
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
@@ -130,3 +137,5 @@ SLOFILES=$(SHL1OBJS)
 .IF "$(L10N_framework)"==""
 .INCLUDE : _cppunit.mk
 .ENDIF
+
+.ENDIF # "$(GUI)" == "OS2"

Modified: incubator/ooo/trunk/main/binaryurp/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/binaryurp/prj/d.lst?rev=1202442&r1=1202441&r2=1202442&view=diff
==============================================================================
--- incubator/ooo/trunk/main/binaryurp/prj/d.lst (original)
+++ incubator/ooo/trunk/main/binaryurp/prj/d.lst Tue Nov 15 22:06:23 2011
@@ -1,4 +1,4 @@
-..\%__SRC%\bin\binaryurp.uno.dll %_DEST%\bin%_EXT%\binaryurp.uno.dll
+..\%__SRC%\bin\binaryur*.dll %_DEST%\bin%_EXT%\binaryur*.dll
 ..\%__SRC%\lib\binaryurp.uno.dylib %_DEST%\lib%_EXT%\binaryurp.uno.dylib
 ..\%__SRC%\lib\binaryurp.uno.so %_DEST%\lib%_EXT%\binaryurp.uno.so
 ..\%__SRC%\misc\binaryurp.component %_DEST%\xml%_EXT%\binaryurp.component

Modified: incubator/ooo/trunk/main/l10ntools/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/l10ntools/prj/d.lst?rev=1202442&r1=1202441&r2=1202442&view=diff
==============================================================================
--- incubator/ooo/trunk/main/l10ntools/prj/d.lst (original)
+++ incubator/ooo/trunk/main/l10ntools/prj/d.lst Tue Nov 15 22:06:23 2011
@@ -34,7 +34,7 @@ mkdir: %_DEST%\bin%_EXT%\help\com\sun\st
 ..\%__SRC%\bin\HelpCompiler %_DEST%\bin%_EXT%\HelpCompiler
 ..\%__SRC%\bin\HelpCompiler.exe %_DEST%\bin%_EXT%\HelpCompiler.exe
 ..\%__SRC%\bin\HelpLinker.exe %_DEST%\bin%_EXT%\HelpLinker.exe
-..\%__SRC%\bin\HelpLinker* %_DEST%\bin%_EXT%
+..\%__SRC%\bin\HelpLink* %_DEST%\bin%_EXT%
 
 ..\%__SRC%\class\converter\converter.jar %_DEST%\bin%_EXT%\converter.jar
 ..\%__SRC%\doc\converter_javadoc.zip %_DEST%\bin%_EXT%\converter_javadoc.zip

Modified: incubator/ooo/trunk/main/remotebridges/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/remotebridges/prj/d.lst?rev=1202442&r1=1202441&r2=1202442&view=diff
==============================================================================
--- incubator/ooo/trunk/main/remotebridges/prj/d.lst (original)
+++ incubator/ooo/trunk/main/remotebridges/prj/d.lst Tue Nov 15 22:06:23 2011
@@ -1,4 +1,4 @@
-..\%__SRC%\bin\uuresolver.uno.dll %_DEST%\bin%_EXT%\uuresolver.uno.dll
+..\%__SRC%\bin\uuresolv*.dll %_DEST%\bin%_EXT%\uuresolv*.dll
 ..\%__SRC%\lib\uuresolver.uno.dylib %_DEST%\lib%_EXT%\uuresolver.uno.dylib
 ..\%__SRC%\lib\uuresolver.uno.so %_DEST%\lib%_EXT%\uuresolver.uno.so
 ..\%__SRC%\misc\uuresolver.component %_DEST%\xml%_EXT%\uuresolver.component

Modified: incubator/ooo/trunk/main/sal/osl/os2/file.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sal/osl/os2/file.cxx?rev=1202442&r1=1202441&r2=1202442&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sal/osl/os2/file.cxx (original)
+++ incubator/ooo/trunk/main/sal/osl/os2/file.cxx Tue Nov 15 22:06:23 2011
@@ -2864,6 +2864,8 @@ oslFileError osl_removeDirectory( rtl_uS
 int path_make_parent(sal_Unicode* path)
 {
 	int i = rtl_ustr_lastIndexOfChar(path, '/');
+	if (i == -1)
+		i = rtl_ustr_lastIndexOfChar(path, '\\');
 	
 	if (i > 0)
 	{

Modified: incubator/ooo/trunk/main/sal/osl/os2/module.c
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sal/osl/os2/module.c?rev=1202442&r1=1202441&r2=1202442&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sal/osl/os2/module.c (original)
+++ incubator/ooo/trunk/main/sal/osl/os2/module.c Tue Nov 15 22:06:23 2011
@@ -99,7 +99,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uS
 			_makepath( buffer, drive, dir, fname, ext);
 
 #if OSL_DEBUG_LEVEL>0
-			debug_printf("osl_loadModule module %s\n", buffer);
+			debug_printf("osl_loadModule module %s", buffer);
 #endif
             //rc = _DosLoadModule( szErrorMessage, sizeof( szErrorMessage), (PCSZ)buffer,
&hModule);
 	    //if (rc == NO_ERROR )

Modified: incubator/ooo/trunk/main/stlport/STLport-4.5.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/stlport/STLport-4.5.patch?rev=1202442&r1=1202441&r2=1202442&view=diff
==============================================================================
--- incubator/ooo/trunk/main/stlport/STLport-4.5.patch (original)
+++ incubator/ooo/trunk/main/stlport/STLport-4.5.patch Tue Nov 15 22:06:23 2011
@@ -300,7 +300,7 @@
 + 
 --- misc/STLport-4.5/src/gcc-3.0-os2.def	2008-11-26 12:40:40.000000000 +0100
 +++ misc/build/STLport-4.5/src/gcc-3.0-os2.def	2008-10-10 15:05:36.000000000 +0200
-@@ -1 +1,40 @@
+@@ -1 +1,42 @@
 -dummy
 +LIBRARY stlp45 INITINSTANCE TERMINSTANCE
 +DATA MULTIPLE
@@ -342,6 +342,8 @@
 +
 +;comphelper
 +__ZTVN4_STL13runtime_errorE
++;sw
++__ZN4_STL10_Sl_globalIbE10__previousEPNS_16_Slist_node_baseEPKS2_
 --- misc/STLport-4.5/src/gcc-3.0-os2.mak	2008-11-26 12:40:40.000000000 +0100
 +++ misc/build/STLport-4.5/src/gcc-3.0-os2.mak	2008-11-03 15:56:24.000000000 +0100
 @@ -1 +1,79 @@
@@ -367,7 +369,7 @@
 +#
 +#
 +LINK=emxomfar cr
-+DYN_LINK=$(CXX) -Zlinker "DISABLE 1121" -Zomf -Zmap -Zhigh-mem -Zbin-files -Zdll gcc-3.0-os2.def
-o
++DYN_LINK=$(CXX) -g -Zlinker "DISABLE 1121" -Zomf -Zmap -Zhigh-mem -Zdll gcc-3.0-os2.def
-o
 +
 +OBJEXT=o
 +DYNEXT=so
@@ -379,8 +381,8 @@
 +COMP=GCC$(ARCH)
 +INSTALL_STEP = install_unix 
 +LN_S = cp
-+LDLIBS_RELEASE_dynamic = -lgcc_eh
-+LDLIBS_RELEASE_static = -lgcc_eh
++LDLIBS_RELEASE_dynamic = -lstdc444 -lgcc_eh
++LDLIBS_RELEASE_static = -lstdc444 -lgcc_eh
 +
 +#all_static symbolic_links 
 +all: all_dynamic all_import
@@ -393,8 +395,8 @@
 +CXXFLAGS_COMMON = -Zomf -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions
-I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
 +CFLAGS_COMMON = -Zomf -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR}
${WARNING_FLAGS} ${ARCH_FLAGS}
 +
-+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
-+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -g -DOS2 -DSTL_OS2_BUILDING -O3 -march=pentium
-mtune=pentium4
++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -g -DOS2 -DSTL_OS2_BUILDING -O3 -march=pentium
-mtune=pentium4
 +
 +CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
 +CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g
@@ -1045,3 +1047,45 @@
  # elif defined (__FreeBSD__)
  
  # define _Locale_CNTRL _CTYPE_C
+--- misc/STLport-4.5/stlport/stl/_iosfwd.h	2001-03-28 03:19:00.000000000 +0200
++++ misc/build/STLport-4.5/stlport/stl/_iosfwd.h	2011-11-15 18:03:16.000000000 +0100
+@@ -100,21 +100,39 @@
+ template <class _CharT> class collate;
+ template <class _CharT> class collate_byname;
+ 
++#ifdef OS2
++_STLP_TEMPLATE_NULL class ctype<char>;
++_STLP_TEMPLATE_NULL class ctype_byname<char>;
++_STLP_TEMPLATE_NULL class collate<char>;
++_STLP_TEMPLATE_NULL class collate_byname<char>;
++#else
+ _STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC ctype<char>;
+ _STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC ctype_byname<char>;
+ _STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC collate<char>;
+ _STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC collate_byname<char>;
++#endif
+ 
+ #  ifndef _STLP_NO_WCHAR_T
++#ifdef OS2
++_STLP_TEMPLATE_NULL class ctype<wchar_t>;
++_STLP_TEMPLATE_NULL class ctype_byname<wchar_t>;
++_STLP_TEMPLATE_NULL class collate<wchar_t>;
++_STLP_TEMPLATE_NULL class collate_byname<wchar_t>;
++#else
+ _STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC ctype<wchar_t>;
+ _STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC ctype_byname<wchar_t>;
+ _STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC collate<wchar_t>;
+ _STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC collate_byname<wchar_t>;
++#endif
+ #  endif
+ 
+ # if !(defined (__SUNPRO_CC) && __SUNPRO_CC < 0x500 )
+ // Typedefs for ordinary (narrow-character) streams.
++#ifdef OS2
++_STLP_TEMPLATE_NULL class basic_streambuf<char, char_traits<char> >;
++#else
+ _STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC basic_streambuf<char, char_traits<char>
>;
++#endif
+ # endif
+ 
+ typedef basic_istream<char, char_traits<char> >   istream;

Modified: incubator/ooo/trunk/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/Library_vcl.mk?rev=1202442&r1=1202441&r2=1202442&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/Library_vcl.mk (original)
+++ incubator/ooo/trunk/main/vcl/Library_vcl.mk Tue Nov 15 22:06:23 2011
@@ -263,12 +263,6 @@ $(eval $(call gb_Library_add_exception_o
     vcl/os2/source/window/salobj \
 ))
 
-ifeq ($(gb_DEBUGLEVEL),2)
-$(eval $(call gb_Library_add_cobjects,vcl,\
-    vcl/os2/source/app/printf \
-))
-endif
-
 $(eval $(call gb_Library_add_nativeres,vcl,src))
 
 endif

Modified: incubator/ooo/trunk/main/vcl/workben/svdem.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/workben/svdem.cxx?rev=1202442&r1=1202441&r2=1202442&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/workben/svdem.cxx (original)
+++ incubator/ooo/trunk/main/vcl/workben/svdem.cxx Tue Nov 15 22:06:23 2011
@@ -52,7 +52,7 @@ SAL_IMPLEMENT_MAIN()
 
     Reference< XMultiServiceFactory > xMS;
     xMS = cppu::createRegistryServiceFactory( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"types.rdb" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True
);
-    
+
     InitVCL( xMS );
     ::Main();
     DeInitVCL();



Mime
View raw message