i118923 - OS/2 port: use 8.3 names for targets.

desktop/prj/d.lst

@@ -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

desktop/qa/deployment_misc/makefile.mk

@@ -34,7 +34,11 @@
 
 PRJ := ..$/..
 PRJNAME := desktop
+.IF "$(GUI)" == "OS2"
+TARGET := qa_dpl_m
+.ELSE
 TARGET := qa_deployment_misc
+.ENDIF
 
 ENABLE_EXCEPTIONS := TRUE
 

desktop/source/deployment/gui/makefile.mk

@@ -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 = \

desktop/source/deployment/makefile.mk

@@ -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 = \

desktop/source/migration/services/makefile.mk

@@ -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= \

extensions/source/update/check/makefile.mk

@@ -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
 

sax/qa/cppunit/makefile.mk

@@ -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

sax/source/expatwrap/makefile.mk

@@ -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= \

sax/source/fastparser/makefile.mk

@@ -46,7 +46,11 @@ SLOFILES =\
         $(SLO)$/fastparser.obj\
         $(SLO)$/xml2utf.obj
 
+.IF "$(GUI)" == "OS2"
+SHL1TARGET= fastsax
+.ELSE
 SHL1TARGET= $(TARGET)
+.ENDIF
 SHL1IMPLIB= i$(TARGET)
 
 SHL1STDLIBS= \

slideshow/util/makefile.mk

@@ -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
 

writerfilter/unocomponent/makefile.mk

@@ -20,7 +20,11 @@
 #**************************************************************
 PRJ=..
 PRJNAME=writerfilter
+.IF "$(GUI)" == "OS2"
+TARGET=wfltuno
+.ELSE
 TARGET=writerfilter.uno
+.ENDIF
 LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 

writerfilter/util/makefile.mk

@@ -20,7 +20,11 @@
 #**************************************************************
 PRJ=..
 PRJNAME=writerfilter
+.IF "$(GUI)" == "OS2"
+TARGET=wfilt
+.ELSE
 TARGET=writerfilter
+.ENDIF
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------