incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yda...@apache.org
Subject svn commit: r1245067 - in /incubator/ooo/trunk/main: desktop/prj/ desktop/qa/deployment_misc/ desktop/source/deployment/ desktop/source/deployment/gui/ desktop/source/migration/services/ extensions/source/update/check/ sax/qa/cppunit/ sax/source/expatw...
Date Thu, 16 Feb 2012 16:28:15 GMT
Author: ydario
Date: Thu Feb 16 16:28:14 2012
New Revision: 1245067

URL: http://svn.apache.org/viewvc?rev=1245067&view=rev
Log:
i118923 - OS/2 port: use 8.3 names for targets.

Modified:
    incubator/ooo/trunk/main/desktop/prj/d.lst
    incubator/ooo/trunk/main/desktop/qa/deployment_misc/makefile.mk
    incubator/ooo/trunk/main/desktop/source/deployment/gui/makefile.mk
    incubator/ooo/trunk/main/desktop/source/deployment/makefile.mk
    incubator/ooo/trunk/main/desktop/source/migration/services/makefile.mk
    incubator/ooo/trunk/main/extensions/source/update/check/makefile.mk
    incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk
    incubator/ooo/trunk/main/sax/source/expatwrap/makefile.mk
    incubator/ooo/trunk/main/sax/source/fastparser/makefile.mk
    incubator/ooo/trunk/main/slideshow/util/makefile.mk
    incubator/ooo/trunk/main/writerfilter/unocomponent/makefile.mk
    incubator/ooo/trunk/main/writerfilter/util/makefile.mk

Modified: incubator/ooo/trunk/main/desktop/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/prj/d.lst?rev=1245067&r1=1245066&r2=1245067&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/prj/d.lst (original)
+++ incubator/ooo/trunk/main/desktop/prj/d.lst Thu Feb 16 16:28:14 2012
@@ -63,7 +63,7 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms
 ..\%__SRC%\bin\offacc*.dll %_DEST%\bin%_EXT%\offacc*.dll
 ..\%__SRC%\lib\liboffacc*.so %_DEST%\lib%_EXT%\liboffacc*.so
 ..\%__SRC%\lib\liboffacc*.dylib %_DEST%\lib%_EXT%\liboffacc*.dylib
-..\%__SRC%\bin\migratio*.dll %_DEST%\bin%_EXT%\migratio*.dll
+..\%__SRC%\bin\migr*.dll %_DEST%\bin%_EXT%\migr*.dll
 ..\%__SRC%\lib\migratio*.uno.so %_DEST%\lib%_EXT%\migratio*.uno.so
 ..\%__SRC%\lib\migratio*.uno.dylib %_DEST%\lib%_EXT%\migratio*.uno.dylib
 
@@ -82,6 +82,7 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms
 ..\%__SRC%\bin\unopkg %_DEST%\bin%_EXT%\unopkg.bin
 ..\%__SRC%\bin\so\unopkg %_DEST%\bin%_EXT%\so\unopkg.bin
 ..\%__SRC%\bin\unopkg.exe %_DEST%\bin%_EXT%\unopkg.bin
+..\%__SRC%\bin\unopkg.exe %_DEST%\bin%_EXT%\unopkg.exe
 ..\%__SRC%\bin\so\unopkg.exe %_DEST%\bin%_EXT%\so\unopkg.bin
 ..\%__SRC%\misc\unopkg.sh %_DEST%\bin%_EXT%\unopkg
 ..\%__SRC%\bin\unopkga*.dll %_DEST%\bin%_EXT%\unopkga*.dll

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=1245067&r1=1245066&r2=1245067&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/qa/deployment_misc/makefile.mk (original)
+++ incubator/ooo/trunk/main/desktop/qa/deployment_misc/makefile.mk Thu Feb 16 16:28:14 2012
@@ -34,7 +34,11 @@
 
 PRJ := ..$/..
 PRJNAME := desktop
+.IF "$(GUI)" == "OS2"
+TARGET := qa_dpl_m
+.ELSE
 TARGET := qa_deployment_misc
+.ENDIF
 
 ENABLE_EXCEPTIONS := TRUE
 

Modified: incubator/ooo/trunk/main/desktop/source/deployment/gui/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/deployment/gui/makefile.mk?rev=1245067&r1=1245066&r2=1245067&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/deployment/gui/makefile.mk (original)
+++ incubator/ooo/trunk/main/desktop/source/deployment/gui/makefile.mk Thu Feb 16 16:28:14
2012
@@ -55,7 +55,11 @@ SLOFILES = \
         $(SLO)$/dp_gui_extensioncmdqueue.obj \
         $(SLO)$/descedit.obj
 
+.IF "$(GUI)"=="OS2"
+SHL1TARGET = $(TARGET)$(DLLPOSTFIX)
+.ELSE
 SHL1TARGET = $(TARGET)$(DLLPOSTFIX).uno
+.ENDIF
 SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 
 SHL1STDLIBS = \

Modified: incubator/ooo/trunk/main/desktop/source/deployment/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/deployment/makefile.mk?rev=1245067&r1=1245066&r2=1245067&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/deployment/makefile.mk (original)
+++ incubator/ooo/trunk/main/desktop/source/deployment/makefile.mk Thu Feb 16 16:28:14 2012
@@ -40,7 +40,11 @@ INCPRE += inc
 
 DLLPRE =
 
+.IF "$(GUI)"=="OS2"
+SHL1TARGET = $(TARGET)$(DLLPOSTFIX)
+.ELSE
 SHL1TARGET = $(TARGET)$(DLLPOSTFIX).uno
+.ENDIF
 SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 
 SHL1LIBS = \

Modified: incubator/ooo/trunk/main/desktop/source/migration/services/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/migration/services/makefile.mk?rev=1245067&r1=1245066&r2=1245067&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/migration/services/makefile.mk (original)
+++ incubator/ooo/trunk/main/desktop/source/migration/services/makefile.mk Thu Feb 16 16:28:14
2012
@@ -24,7 +24,11 @@
 PRJ=..$/..$/..
 
 PRJNAME=desktop
+.IF "$(OS)" == "OS2"
+TARGET = migroo2
+.ELSE
 TARGET = migrationoo2.uno
+.ENDIF
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = migrationoo2
 LIBTARGET=NO
@@ -77,7 +81,11 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
 COMP2TYPELIST = migrationoo3
+.IF "$(OS)" == "OS2"
+SHL2TARGET=migroo3
+.ELSE
 SHL2TARGET=migrationoo3.uno
+.ENDIF
 SHL2VERSIONMAP = $(SOLARENV)/src/component.map
 
 SHL2OBJS= \

Modified: incubator/ooo/trunk/main/extensions/source/update/check/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/extensions/source/update/check/makefile.mk?rev=1245067&r1=1245066&r2=1245067&view=diff
==============================================================================
--- incubator/ooo/trunk/main/extensions/source/update/check/makefile.mk (original)
+++ incubator/ooo/trunk/main/extensions/source/update/check/makefile.mk Thu Feb 16 16:28:14
2012
@@ -65,7 +65,11 @@ SLOFILES=\
 	$(SLO)$/updatehdl.obj
         
 SHL1NOCHECK=TRUE
+.IF "$(GUI)" == "OS2"
+SHL1TARGET=updchkun
+.ELSE
 SHL1TARGET=$(TARGET).uno   
+.ENDIF
 SHL1OBJS=$(SLOFILES)
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 

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=1245067&r1=1245066&r2=1245067&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk (original)
+++ incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk Thu Feb 16 16:28:14 2012
@@ -60,7 +60,11 @@ SHL1STDLIBS= \
 	 $(CPPUNITLIB) \
 
 
+.IF "$(GUI)" == "OS2"
+SHL1TARGET= tst_cnv
+.ELSE
 SHL1TARGET= test_converter
+.ENDIF
 SHL1RPATH = NONE
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF= $(MISC)/$(SHL1TARGET).def

Modified: incubator/ooo/trunk/main/sax/source/expatwrap/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sax/source/expatwrap/makefile.mk?rev=1245067&r1=1245066&r2=1245067&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sax/source/expatwrap/makefile.mk (original)
+++ incubator/ooo/trunk/main/sax/source/expatwrap/makefile.mk Thu Feb 16 16:28:14 2012
@@ -49,7 +49,11 @@ SLOFILES =\
 		$(SLO)$/sax_expat.obj \
 		$(SLO)$/saxwriter.obj
 
+.IF "$(GUI)" == "OS2"
+SHL1TARGET= sax_uno
+.ELSE
 SHL1TARGET= $(TARGET)
+.ENDIF
 SHL1IMPLIB= i$(TARGET)
 
 SHL1STDLIBS= \

Modified: incubator/ooo/trunk/main/sax/source/fastparser/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sax/source/fastparser/makefile.mk?rev=1245067&r1=1245066&r2=1245067&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sax/source/fastparser/makefile.mk (original)
+++ incubator/ooo/trunk/main/sax/source/fastparser/makefile.mk Thu Feb 16 16:28:14 2012
@@ -46,7 +46,11 @@ SLOFILES =\
 		$(SLO)$/fastparser.obj\
 		$(SLO)$/xml2utf.obj
 
+.IF "$(GUI)" == "OS2"
+SHL1TARGET= fastsax
+.ELSE
 SHL1TARGET= $(TARGET)
+.ENDIF
 SHL1IMPLIB= i$(TARGET)
 
 SHL1STDLIBS= \

Modified: incubator/ooo/trunk/main/slideshow/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/slideshow/util/makefile.mk?rev=1245067&r1=1245066&r2=1245067&view=diff
==============================================================================
--- incubator/ooo/trunk/main/slideshow/util/makefile.mk (original)
+++ incubator/ooo/trunk/main/slideshow/util/makefile.mk Thu Feb 16 16:28:14 2012
@@ -47,7 +47,11 @@ LIB1FILES=\
 	$(SLB)$/slide.lib \
 	$(SLB)$/engine.lib
 
+.IF "$(GUI)" == "OS2"
+SHL1TARGET=slidesho
+.ELSE
 SHL1TARGET=$(TARGET).uno
+.ENDIF
 
 SHL1STDLIBS= $(TOOLSLIB) \
 			 $(CPPULIB) \
@@ -73,7 +77,11 @@ DEF1EXPORTFILE=exports.dxp
 
 # ==========================================================================
 
+.IF "$(GUI)" == "OS2"
+TARGET2=slshtest
+.ELSE
 TARGET2=slideshowtest
+.ENDIF
 LIB2TARGET=$(SLB)$/$(TARGET2).lib
 LIB2FILES=$(LIB1FILES)
 
@@ -86,7 +94,11 @@ SHL2LIBS=$(SLB)$/$(TARGET2).lib
 
 DEF2NAME	=$(SHL2TARGET)
 DEF2LIBNAME = $(TARGET2)
+.IF "$(GUI)" == "OS2"
+DEF2DEPN	=$(MISC)$/slideshowtest.flt
+.ELSE
 DEF2DEPN	=$(MISC)$/$(SHL2TARGET).flt
+.ENDIF
 
 DEF2DES		=SlideShowTest
 
@@ -94,10 +106,16 @@ DEF2DES		=SlideShowTest
 
 .INCLUDE :	target.mk
 
+.IF "$(GUI)" == "OS2"
+$(MISC)$/slideshowtest.flt: makefile.mk \
+							slideshowtest.flt
+	+$(TYPE) slideshowtest.flt > $@
+.ELSE
 $(MISC)$/$(SHL2TARGET).flt: makefile.mk \
 							$(TARGET2).flt
 	+$(TYPE) $(TARGET2).flt > $@
 
+.ENDIF
 
 ALLTAR : $(MISC)/slideshow.component
 

Modified: incubator/ooo/trunk/main/writerfilter/unocomponent/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/writerfilter/unocomponent/makefile.mk?rev=1245067&r1=1245066&r2=1245067&view=diff
==============================================================================
--- incubator/ooo/trunk/main/writerfilter/unocomponent/makefile.mk (original)
+++ incubator/ooo/trunk/main/writerfilter/unocomponent/makefile.mk Thu Feb 16 16:28:14 2012
@@ -20,7 +20,11 @@
 #**************************************************************
 PRJ=..
 PRJNAME=writerfilter
+.IF "$(GUI)" == "OS2"
+TARGET=wfltuno
+.ELSE
 TARGET=writerfilter.uno
+.ENDIF
 LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 

Modified: incubator/ooo/trunk/main/writerfilter/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/writerfilter/util/makefile.mk?rev=1245067&r1=1245066&r2=1245067&view=diff
==============================================================================
--- incubator/ooo/trunk/main/writerfilter/util/makefile.mk (original)
+++ incubator/ooo/trunk/main/writerfilter/util/makefile.mk Thu Feb 16 16:28:14 2012
@@ -20,7 +20,11 @@
 #**************************************************************
 PRJ=..
 PRJNAME=writerfilter
+.IF "$(GUI)" == "OS2"
+TARGET=wfilt
+.ELSE
 TARGET=writerfilter
+.ENDIF
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------



Mime
View raw message