incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1201398 - in /incubator/ooo/trunk/main: basegfx/test/ binaryurp/qa/ bridges/source/cpp_uno/gcc3_os2_intel/ connectivity/source/drivers/hsqldb/ desktop/qa/deployment_misc/ desktop/util/ javaunohelper/source/ o3tl/qa/ sax/qa/cppunit/ sc/addi...
Date Sun, 13 Nov 2011 03:19:05 GMT
Author: pfg
Date: Sun Nov 13 03:19:04 2011
New Revision: 1201398

URL: http://svn.apache.org/viewvc?rev=1201398&view=rev
Log:
i118582: OS/2 port - more misc. changes by ydario.

Modified:
    incubator/ooo/trunk/main/basegfx/test/makefile.mk
    incubator/ooo/trunk/main/binaryurp/qa/makefile.mk
    incubator/ooo/trunk/main/bridges/source/cpp_uno/gcc3_os2_intel/makefile.mk
    incubator/ooo/trunk/main/connectivity/source/drivers/hsqldb/makefile.mk
    incubator/ooo/trunk/main/desktop/qa/deployment_misc/makefile.mk
    incubator/ooo/trunk/main/desktop/util/ooverinfo2.rc
    incubator/ooo/trunk/main/javaunohelper/source/makefile.mk
    incubator/ooo/trunk/main/o3tl/qa/makefile.mk
    incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk
    incubator/ooo/trunk/main/sc/addin/datefunc/makefile.mk
    incubator/ooo/trunk/main/xmlreader/source/makefile.mk

Modified: incubator/ooo/trunk/main/basegfx/test/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basegfx/test/makefile.mk?rev=1201398&r1=1201397&r2=1201398&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basegfx/test/makefile.mk (original)
+++ incubator/ooo/trunk/main/basegfx/test/makefile.mk Sun Nov 13 03:19:04 2011
@@ -36,6 +36,13 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(GUI)" == "OS2"
+
+@all:
+	@echo "Skipping, cppunit broken."
+
+.ELSE
+
 #building with stlport, but cppunit was not built with stlport
 .IF "$(USE_SYSTEM_STL)"!="YES"
 .IF "$(SYSTEM_CPPUNIT)"=="YES"
@@ -79,6 +86,8 @@ SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
+.ENDIF # "$(GUI)" == "OS2"
+
 .INCLUDE : target.mk
 .INCLUDE : _cppunit.mk
 

Modified: incubator/ooo/trunk/main/binaryurp/qa/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/binaryurp/qa/makefile.mk?rev=1201398&r1=1201397&r2=1201398&view=diff
==============================================================================
--- incubator/ooo/trunk/main/binaryurp/qa/makefile.mk (original)
+++ incubator/ooo/trunk/main/binaryurp/qa/makefile.mk Sun Nov 13 03:19:04 2011
@@ -33,17 +33,30 @@ ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(GUI)" == "OS2"
+
+@all:
+	@echo "Skipping, cppunit broken."
+
+.ELSE
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 DLLPRE =
 
+.IF "$(GUI)" != "OS2"
 SLOFILES = $(SLO)/test-cache.obj $(SLO)/test-unmarshal.obj
+.ENDIF
 
 SHL1IMPLIB = i$(SHL1TARGET)
 SHL1OBJS = $(SLO)/test-cache.obj
 SHL1RPATH = NONE
 SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB)
+.IF "$(GUI)" != "OS2"
 SHL1TARGET = test-cache
+.ELSE
+SHL1TARGET = test-c
+.ENDIF
 SHL1VERSIONMAP = version.map
 DEF1NAME = $(SHL1TARGET)
 
@@ -69,9 +82,16 @@ SHL2STDLIBS = \
     $(CPPUNITLIB) \
     $(SALHELPERLIB) \
     $(SALLIB)
+.IF "$(GUI)" != "OS2"
 SHL2TARGET = test-unmarshal
+.ELSE
+SHL2TARGET = test-u
+.ENDIF
 SHL2VERSIONMAP = version.map
 DEF2NAME = $(SHL2TARGET)
 
+.ENDIF # "$(GUI)" == "OS2"
+
 .INCLUDE: target.mk
 .INCLUDE: _cppunit.mk
+

Modified: incubator/ooo/trunk/main/bridges/source/cpp_uno/gcc3_os2_intel/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/bridges/source/cpp_uno/gcc3_os2_intel/makefile.mk?rev=1201398&r1=1201397&r2=1201398&view=diff
==============================================================================
--- incubator/ooo/trunk/main/bridges/source/cpp_uno/gcc3_os2_intel/makefile.mk (original)
+++ incubator/ooo/trunk/main/bridges/source/cpp_uno/gcc3_os2_intel/makefile.mk Sun Nov 13
03:19:04 2011
@@ -55,6 +55,7 @@ SLOFILES= \
 SHL1TARGET= $(TARGET)
 
 SHL1DEF=defs$/gcc3_uno.def
+SHL1USE_EXPORTS=name
 SHL1IMPLIB=i$(TARGET)
 SHL1VERSIONMAP=..$/..$/bridge_exports.map
 

Modified: incubator/ooo/trunk/main/connectivity/source/drivers/hsqldb/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/connectivity/source/drivers/hsqldb/makefile.mk?rev=1201398&r1=1201397&r2=1201398&view=diff
==============================================================================
--- incubator/ooo/trunk/main/connectivity/source/drivers/hsqldb/makefile.mk (original)
+++ incubator/ooo/trunk/main/connectivity/source/drivers/hsqldb/makefile.mk Sun Nov 13 03:19:04
2011
@@ -85,7 +85,9 @@ SLOFILES=\
 		$(SLO)$/HTools.obj                      \
 		$(SLO)$/accesslog.obj
 
+.IF "$(GUI)" != "OS2"
 SHL1VERSIONMAP=$(HSQLDB_TARGET).map
+.ENDIF
 
 # --- Library -----------------------------------
 # NO $(DLLPOSTFIX) otherwise we have to find on which plattform we are for the java files
@@ -109,7 +111,9 @@ SHL1IMPLIB=	i$(HSQLDB_TARGET)
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME=	$(SHL1TARGET)
+.IF "$(GUI)" != "OS2"
 DEF1EXPORTFILE=	exports.dxp
+.ENDIF
 
 # --- Targets ----------------------------------
 

Modified: incubator/ooo/trunk/main/desktop/qa/deployment_misc/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/qa/deployment_misc/makefile.mk?rev=1201398&r1=1201397&r2=1201398&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/qa/deployment_misc/makefile.mk (original)
+++ incubator/ooo/trunk/main/desktop/qa/deployment_misc/makefile.mk Sun Nov 13 03:19:04 2011
@@ -25,6 +25,13 @@
 #
 #*************************************************************************
 
+.IF "$(GUI)" == "OS2"
+
+@all:
+	@echo "Skipping, cppunit broken."
+
+.ENDIF # "$(GUI)" == "OS2"
+
 PRJ := ..$/..
 PRJNAME := desktop
 TARGET := qa_deployment_misc

Modified: incubator/ooo/trunk/main/desktop/util/ooverinfo2.rc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/util/ooverinfo2.rc?rev=1201398&r1=1201397&r2=1201398&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/util/ooverinfo2.rc (original)
+++ incubator/ooo/trunk/main/desktop/util/ooverinfo2.rc Sun Nov 13 03:19:04 2011
@@ -25,52 +25,42 @@
  *
  *************************************************************************/
 
-#include "version.hrc"
-
-// -----------------------------------------------------------------------
-
-// -----------------------------------------------------------------------
-//                  language/character set specification table
-// -----------------------------------------------------------------------
-
-
-ICON 2 "icons/oasis-text.ico"
-ICON 3 "icons/oasis-text-template.ico"
-ICON 4 "icons/oasis-spreadsheet.ico"
-ICON 5 "icons/oasis-spreadsheet-template.ico"
-ICON 6 "icons/oasis-drawing.ico"
-ICON 7 "icons/oasis-drawing-template.ico"
-ICON 8 "icons/oasis-presentation.ico"
-ICON 9 "icons/oasis-presentation-template.ico"
-ICON 10 "icons/oasis-presentation-template.ico"
-// ICON 11 "icons/oasis-master-document.ico"
-// ICON 12 "icons/oasis-web-template.ico"
-ICON 13 "icons/oasis-empty-document.ico"
-ICON 14 "icons/oasis-database.ico"
-ICON 15 "icons/oasis-formula.ico"
-ICON 16 "icons/oasis-web-template.ico"
-ICON 17 "icons/empty-document.ico"
-ICON 18 "icons/empty-document.ico"
+ICON 2 "icons/ooo-writer-doc.ico"
+ICON 3 "icons/ooo-writer-tem.ico"
+ICON 4 "icons/ooo-calc-doc.ico"
+ICON 5  "icons/ooo-calc-tem.ico"
+ICON 6 "icons/ooo-draw-doc.ico"
+ICON 7 "icons/ooo-draw-tem.ico"
+ICON 8 "icons/ooo-impress-doc.ico"
+ICON 9 "icons/ooo-impress-tem.ico"
+ICON 10 "icons/ooo-impress-doc.ico"
+//ICON 11 "icons/ooo-global-doc.ico"
+//ICON 12 "icons/ooo-html-doc.ico"
+ICON 13 "icons/ooo-chart-doc.ico"
+ICON 14 "icons/ooo-base-doc.ico"
+ICON 15 "icons/ooo-math-doc.ico"
+ICON 16 "icons/ooo-empty-tem.ico"
+ICON 17 "icons/ooo-macro-doc.ico"
+ICON 18 "icons/ooo-configuration.ico"
 ICON 19 "icons/ooo-open.ico"
-ICON 20 "icons/empty-document.ico"
+ICON 20 "icons/ooo-image-doc.ico"
 ICON 21 "icons/ooo-writer-app.ico"
 ICON 22 "icons/ooo-calc-app.ico"
 ICON 23 "icons/ooo-draw-app.ico"
 ICON 24 "icons/ooo-impress-app.ico"
 ICON 25 "icons/ooo-math-app.ico"
 ICON 26 "icons/ooo-base-app.ico"
-ICON 27 "icons/oasis-empty-document.ico"
-ICON 28 "icons/text.ico"
-ICON 29 "icons/text-template.ico"
-ICON 30 "icons/spreadsheet.ico"
-ICON 31 "icons/spreadsheet-template.ico"
-ICON 32 "icons/drawing.ico"
-ICON 33 "icons/drawing-template.ico"
-ICON 34 "icons/presentation.ico"
-ICON 35 "icons/presentation-template.ico"
-ICON 36 "icons/master-document.ico"
-ICON 37 "icons/empty-document.ico"
-ICON 38 "icons/database.ico"
-ICON 39 "icons/formula.ico"
-ICON 40 "icons/oxt-extension.ico"
+ICON 27 "icons/ooo-empty-doc.ico"
+ICON 28 "icons/ooo11-writer-doc.ico"
+ICON 29 "icons/ooo11-writer-tem.ico"
+ICON 30 "icons/ooo11-calc-doc.ico"
+ICON 31 "icons/ooo11-calc-tem.ico"
+ICON 32 "icons/ooo11-draw-doc.ico"
+ICON 33 "icons/ooo11-draw-tem.ico"
+ICON 34 "icons/ooo11-impress-doc.ico"
+ICON 35 "icons/ooo11-impress-tem.ico"
+ICON 36 "icons/ooo11-master-doc.ico"
+ICON 37 "icons/ooo11-chart-doc.ico"
+ICON 38 "icons/ooo11-base-doc.ico"
+ICON 39 "icons/ooo11-math-doc.ico"
 

Modified: incubator/ooo/trunk/main/javaunohelper/source/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/javaunohelper/source/makefile.mk?rev=1201398&r1=1201397&r2=1201398&view=diff
==============================================================================
--- incubator/ooo/trunk/main/javaunohelper/source/makefile.mk (original)
+++ incubator/ooo/trunk/main/javaunohelper/source/makefile.mk Sun Nov 13 03:19:04 2011
@@ -82,11 +82,19 @@ SLOFILES= \
 
 # ------------------------------------------------------------------
 
+.IF "$(GUI)" == "OS2"
+SHL1OBJS=\
+		$(SLO)$/javaunohelper.obj				\
+        $(SLO)$/bootstrap.obj \
+        $(SLO)$/vm.obj
+.ELSE
 LIB1TARGET=$(SLB)$/$(SHL1TARGET).lib
 LIB1OBJFILES=\
 		$(SLO)$/javaunohelper.obj				\
         $(SLO)$/bootstrap.obj \
         $(SLO)$/vm.obj
+SHL1VERSIONMAP = javaunohelper.map
+.ENDIF
 
 SHL1TARGET=juhx
 
@@ -97,8 +105,6 @@ SHL1STDLIBS= \
 		$(CPPULIB)		\
 		$(CPPUHELPERLIB)
 
-SHL1VERSIONMAP = javaunohelper.map
-
 SHL1DEPN=
 SHL1IMPLIB=i$(SHL1TARGET)
 SHL1LIBS=$(LIB1TARGET)
@@ -109,16 +115,21 @@ DEF1NAME=$(SHL1TARGET)
 
 # ------------------------------------------------------------------
 
+.IF "$(GUI)" == "OS2"
+SHL2OBJS=\
+		$(SLO)$/preload.obj
+.ELSE
 LIB2TARGET=$(SLB)$/$(SHL2TARGET).lib
 LIB2OBJFILES=\
 		$(SLO)$/preload.obj
+SHL2VERSIONMAP = javaunohelper.map
+.ENDIF
 
 SHL2TARGET=juh
 
 SHL2STDLIBS= \
 		$(SALLIB)
 
-SHL2VERSIONMAP = javaunohelper.map
 
 SHL2DEPN=
 SHL2IMPLIB=i$(SHL2TARGET)

Modified: incubator/ooo/trunk/main/o3tl/qa/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/o3tl/qa/makefile.mk?rev=1201398&r1=1201397&r2=1201398&view=diff
==============================================================================
--- incubator/ooo/trunk/main/o3tl/qa/makefile.mk (original)
+++ incubator/ooo/trunk/main/o3tl/qa/makefile.mk Sun Nov 13 03:19:04 2011
@@ -25,6 +25,13 @@
 #
 #*************************************************************************
 
+.IF "$(GUI)" == "OS2"
+
+@all:
+	@echo "Skipping, cppunit broken."
+
+.ENDIF # "$(GUI)" == "OS2"
+
 PRJ=..
 
 PRJNAME=o3tl

Modified: incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk?rev=1201398&r1=1201397&r2=1201398&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk (original)
+++ incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk Sun Nov 13 03:19:04 2011
@@ -35,6 +35,13 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(GUI)" == "OS2"
+
+@all:
+	@echo "Skipping, cppunit broken."
+
+.ELSE
+
 #building with stlport, but cppunit was not built with stlport
 .IF "$(USE_SYSTEM_STL)"!="YES"
 .IF "$(SYSTEM_CPPUNIT)"=="YES"
@@ -73,6 +80,8 @@ SLOFILES= \
 
 # --- Targets ------------------------------------------------------
 
+.ENDIF # "$(GUI)" == "OS2"
+
 .INCLUDE :  target.mk
 .INCLUDE : _cppunit.mk
 

Modified: incubator/ooo/trunk/main/sc/addin/datefunc/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/addin/datefunc/makefile.mk?rev=1201398&r1=1201397&r2=1201398&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/addin/datefunc/makefile.mk (original)
+++ incubator/ooo/trunk/main/sc/addin/datefunc/makefile.mk Sun Nov 13 03:19:04 2011
@@ -125,7 +125,6 @@ $(MISC)$/$(SHL1TARGET).def: makefile.mk
     @echo ------------------------------
     @echo Making: $@
     @echo LIBRARY     $(SHL1TARGET) INITINSTANCE TERMINSTANCE >$@
-    @echo DESCRIPTION 'DateF StarCalc Addin DLL'>>$@
     @echo DATA        MULTIPLE>>$@
     @echo EXPORTS>>$@
     @echo     _GetFunctionCount>>$@

Modified: incubator/ooo/trunk/main/xmlreader/source/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/xmlreader/source/makefile.mk?rev=1201398&r1=1201397&r2=1201398&view=diff
==============================================================================
--- incubator/ooo/trunk/main/xmlreader/source/makefile.mk (original)
+++ incubator/ooo/trunk/main/xmlreader/source/makefile.mk Sun Nov 13 03:19:04 2011
@@ -47,7 +47,9 @@ SHL1RPATH = URELIB
 SHL1STDLIBS = \
     $(SALLIB)
 SHL1TARGET = xmlreader
+.IF "$(GUI)" != "OS2"
 SHL1USE_EXPORTS = name
+.ENDIF
 DEF1NAME = $(SHL1TARGET)
 
 .INCLUDE: target.mk



Mime
View raw message