Author: ydario
Date: Fri Nov 30 08:27:01 2012
New Revision: 1415538
URL: http://svn.apache.org/viewvc?rev=1415538&view=rev
Log:
i118923 - OS/2 port: use of gcc style import libraries.
Modified:
openoffice/trunk/main/RepositoryFixes.mk
openoffice/trunk/main/basic/prj/d.lst
openoffice/trunk/main/dbaccess/util/makefile.mk
openoffice/trunk/main/formula/util/makefile.mk
openoffice/trunk/main/i18npool/source/localedata/data/makefile.mk
openoffice/trunk/main/i18nutil/prj/d.lst
openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.dmake
openoffice/trunk/main/redland/redland/redland-1.0.8.patch.dmake
openoffice/trunk/main/sc/util/makefile.mk
openoffice/trunk/main/solenv/inc/libs.mk
openoffice/trunk/main/writerfilter/source/doctok/makefile.mk
openoffice/trunk/main/writerfilter/source/ooxml/makefile.mk
openoffice/trunk/main/writerfilter/unocomponent/makefile.mk
openoffice/trunk/main/xmlreader/source/makefile.mk
Modified: openoffice/trunk/main/RepositoryFixes.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryFixes.mk?rev=1415538&r1=1415537&r2=1415538&view=diff
==============================================================================
--- openoffice/trunk/main/RepositoryFixes.mk (original)
+++ openoffice/trunk/main/RepositoryFixes.mk Fri Nov 30 08:27:01 2012
@@ -173,14 +173,12 @@ gb_Library_FILENAMES := $(patsubst cppuh
gb_Library_FILENAMES := $(patsubst
cppunit:icppunit%,cppunit:cppunit%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
cui:iicuc%,cui:icuc%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
i18nisolang1:i18nisolang1%,i18nisolang1:i18nisolang1gcc3%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
i18nutil:i18nutil%,i18nutil:i18nutilgcc3%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
jvmaccess:jvmaccess%,jvmaccess:jvmaccess3gcc3%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
jvmfwk:jvmfwk%,jvmfwk:jvmfwk3%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
rdf:rdf%,rdf:librdf%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst tl:itl%,tl:tl%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst sal:sal%,sal:sal3%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
salhelper:salhelper%,salhelper:salhelp3%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst sb:sb%,sb:basic%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst svl:isvl%,svl:svl%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
Modified: openoffice/trunk/main/basic/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basic/prj/d.lst?rev=1415538&r1=1415537&r2=1415538&view=diff
==============================================================================
--- openoffice/trunk/main/basic/prj/d.lst (original)
+++ openoffice/trunk/main/basic/prj/d.lst Fri Nov 30 08:27:01 2012
@@ -16,6 +16,7 @@ mkdir: %COMMON_DEST%\res%_EXT%
..\%__SRC%\bin\sb*.res %_DEST%\bin%_EXT%\sb*.res
..\%__SRC%\lib\sample.lib %_DEST%\lib%_EXT%\sample.lib
..\%__SRC%\lib\libsample.a %_DEST%\lib%_EXT%\libsample.a
+..\%__SRC%\lib\sb.lib %_DEST%\lib%_EXT%\sb.lib
mkdir: %_DEST%\inc%_EXT%\basic
..\inc\basic\*.hxx %_DEST%\inc%_EXT%\basic\*.hxx
Modified: openoffice/trunk/main/dbaccess/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/util/makefile.mk?rev=1415538&r1=1415537&r2=1415538&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/util/makefile.mk (original)
+++ openoffice/trunk/main/dbaccess/util/makefile.mk Fri Nov 30 08:27:01 2012
@@ -126,10 +126,7 @@ SHL2STDLIBS= \
$(VOSLIB) \
$(SALLIB)
-.IF "$(GUI)"=="OS2"
-SHL2STDLIBS+= $(LB)$/i$(TARGET).lib
-SHL2DEPN=$(LB)$/i$(TARGET).lib
-.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
+.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" || "$(GUI)"=="OS2"
SHL2STDLIBS+= \
-l$(TARGET)$(DLLPOSTFIX)
SHL2DEPN=$(SHL1TARGETN)
Modified: openoffice/trunk/main/formula/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/formula/util/makefile.mk?rev=1415538&r1=1415537&r2=1415538&view=diff
==============================================================================
--- openoffice/trunk/main/formula/util/makefile.mk (original)
+++ openoffice/trunk/main/formula/util/makefile.mk Fri Nov 30 08:27:01 2012
@@ -92,11 +92,7 @@ SHL2STDLIBS= \
$(CPPUHELPERLIB) \
$(SALLIB)
-.IF "$(GUI)"=="OS2"
-SHL2STDLIBS+= \
- $(LB)$/ifor.lib
-SHL2DEPN=$(LB)$/i$(TARGET).lib
-.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
+.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
SHL2STDLIBS+= \
-lfor$(DLLPOSTFIX)
SHL2DEPN=$(SHL1TARGETN)
Modified: openoffice/trunk/main/i18npool/source/localedata/data/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/i18npool/source/localedata/data/makefile.mk?rev=1415538&r1=1415537&r2=1415538&view=diff
==============================================================================
--- openoffice/trunk/main/i18npool/source/localedata/data/makefile.mk (original)
+++ openoffice/trunk/main/i18npool/source/localedata/data/makefile.mk Fri Nov
30 08:27:01 2012
@@ -53,9 +53,6 @@ LINK_LOCALEDATA_ES_LIB=-l$(SHL2TARGET)
LINK_LOCALEDATA_EN_LIB=$(LB)$/i$(SHL1TARGET).lib
LINK_LOCALEDATA_ES_LIB=$(LB)$/i$(SHL2TARGET).lib
.ENDIF
-.ELIF "$(GUI)" == "OS2"
-LINK_LOCALEDATA_EN_LIB=$(LB)$/i$(SHL1TARGET).lib
-LINK_LOCALEDATA_ES_LIB=$(LB)$/i$(SHL2TARGET).lib
.ELSE
LINK_LOCALEDATA_EN_LIB=-l$(SHL1TARGET)
LINK_LOCALEDATA_ES_LIB=-l$(SHL2TARGET)
Modified: openoffice/trunk/main/i18nutil/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/i18nutil/prj/d.lst?rev=1415538&r1=1415537&r2=1415538&view=diff
==============================================================================
--- openoffice/trunk/main/i18nutil/prj/d.lst (original)
+++ openoffice/trunk/main/i18nutil/prj/d.lst Fri Nov 30 08:27:01 2012
@@ -11,4 +11,5 @@ mkdir: %_DEST%\inc%_EXT%\i18nutil
..\%__SRC%\lib\libi18nutil*.so %_DEST%\lib%_EXT%\libi18nutil*.so
..\%__SRC%\lib\libi18nutil*.dylib %_DEST%\lib%_EXT%\libi18nutil*.dylib
..\%__SRC%\lib\ii18nutil.lib %_DEST%\lib%_EXT%\ii18nutil.lib
+..\%__SRC%\lib\i18nutil.lib %_DEST%\lib%_EXT%\i18nutil.lib
..\%__SRC%\lib\ii18nutil.lib %_DEST%\lib%_EXT%\i18nutilgcc3.lib
Modified: openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.dmake
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.dmake?rev=1415538&r1=1415537&r2=1415538&view=diff
==============================================================================
--- openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.dmake (original)
+++ openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.dmake Fri Nov 30
08:27:01 2012
@@ -1,6 +1,6 @@
--- misc/rasqal-0.9.16/src/makefile.mk Thu Nov 6 15:56:45 2008
+++ misc/build/rasqal-0.9.16/src/makefile.mk Thu Nov 6 15:55:09 2008
-@@ -1,1 +1,91 @@
+@@ -1,1 +1,96 @@
-dummy
+#**************************************************************
+#
@@ -82,8 +82,13 @@
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+DEF1NAME=$(SHL1TARGET)
+
++.IF "$(GUI)"=="OS2"
++SHL1STDLIBS= \
++ $(PRJ)$/$(INPATH)$/lib$/raptor.lib
++.ELSE
+SHL1STDLIBS= \
-+ $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \
++ $(PRJ)$/$(INPATH)$/lib$/libraptor.lib
++.ENDIF
+
+
+#$(LIBXML2LIB) \
Modified: openoffice/trunk/main/redland/redland/redland-1.0.8.patch.dmake
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/redland/redland/redland-1.0.8.patch.dmake?rev=1415538&r1=1415537&r2=1415538&view=diff
==============================================================================
--- openoffice/trunk/main/redland/redland/redland-1.0.8.patch.dmake (original)
+++ openoffice/trunk/main/redland/redland/redland-1.0.8.patch.dmake Fri Nov 30
08:27:01 2012
@@ -1,6 +1,6 @@
--- misc/redland-1.0.8/librdf/makefile.mk Mon Jun 16 19:32:46 2008
+++ misc/build/redland-1.0.8/librdf/makefile.mk Mon Jun 16 19:26:20 2008
-@@ -1,1 +1,108 @@
+@@ -1,1 +1,115 @@
-dummy
+#**************************************************************
+#
@@ -97,10 +97,17 @@
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+DEF1NAME=$(SHL1TARGET)
+
++.IF "$(GUI)"=="OS2"
++SHL1STDLIBS= \
++ $(OPENSSLLIB) \
++ $(PRJ)$/$(INPATH)$/lib$/raptor.lib \
++ $(PRJ)$/$(INPATH)$/lib$/rasqal.lib
++.ELSE
+SHL1STDLIBS= \
+ $(OPENSSLLIB) \
+ $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \
-+ $(PRJ)$/$(INPATH)$/lib$/librasqal.lib \
++ $(PRJ)$/$(INPATH)$/lib$/librasqal.lib
++.ENDIF
+
+
+#$(LIBXML2LIB) \
Modified: openoffice/trunk/main/sc/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/util/makefile.mk?rev=1415538&r1=1415537&r2=1415538&view=diff
==============================================================================
--- openoffice/trunk/main/sc/util/makefile.mk (original)
+++ openoffice/trunk/main/sc/util/makefile.mk Fri Nov 30 08:27:01 2012
@@ -62,7 +62,9 @@ RESLIB1SRSFILES=\
# --- StarClac DLL
SHL1TARGET= sc$(DLLPOSTFIX)
+.IF "$(GUI)" != "OS2"
SHL1USE_EXPORTS=name
+.ENDIF
SHL1IMPLIB= sci
# dynamic libraries
Modified: openoffice/trunk/main/solenv/inc/libs.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/libs.mk?rev=1415538&r1=1415537&r2=1415538&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/libs.mk (original)
+++ openoffice/trunk/main/solenv/inc/libs.mk Fri Nov 30 08:27:01 2012
@@ -49,7 +49,11 @@ ICULELIB=-licule
ICUUCLIB=-licuuc
ICUDATALIB=-licudata
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(GUI)"=="OS2"
+I18NUTILLIB=-li18nutil
+.ELSE
I18NUTILLIB=-li18nutil$(COMID)
+.ENDIF
.INCLUDE .IGNORE : i18npool/version.mk
I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID)
I18NPAPERLIB=-li18npaper$(DLLPOSTFIX)
@@ -190,11 +194,7 @@ TKTLIB=-ltkt$(DLLPOSTFIX)
SAXLIB=-lsax$(DLLPOSTFIX)
MAILLIB=-lmail
DOCMGRLIB=-ldmg$(DLLPOSTFIX)
-.IF "$(GUI)"=="OS2"
-BASICLIB=-lbasic
-.ELSE
BASICLIB=-lsb$(DLLPOSTFIX)
-.ENDIF
VBAHELPERLIB=-lvbahelper$(DLLPOSTFIX)
DBTOOLSLIB=-ldbtools$(DLLPOSTFIX)
HM2LIBSH=-lhmwrpdll
Modified: openoffice/trunk/main/writerfilter/source/doctok/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/doctok/makefile.mk?rev=1415538&r1=1415537&r2=1415538&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/source/doctok/makefile.mk (original)
+++ openoffice/trunk/main/writerfilter/source/doctok/makefile.mk Fri Nov 30
08:27:01 2012
@@ -65,10 +65,8 @@ SLOFILES= \
SHL1TARGET=$(TARGET)
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
+.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" || "$(GUI)"=="OS2"
RESOURCEMODELLIB=-lresourcemodel
-.ELIF "$(GUI)"=="OS2"
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
.ELIF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
RESOURCEMODELLIB=-lresourcemodel
Modified: openoffice/trunk/main/writerfilter/source/ooxml/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/ooxml/makefile.mk?rev=1415538&r1=1415537&r2=1415538&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/source/ooxml/makefile.mk (original)
+++ openoffice/trunk/main/writerfilter/source/ooxml/makefile.mk Fri Nov 30
08:27:01 2012
@@ -82,10 +82,8 @@ SLOFILES= \
SHL1TARGET=$(TARGET)
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
+.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" || "$(GUI)"=="OS2"
RESOURCEMODELLIB=-lresourcemodel
-.ELIF "$(GUI)"=="OS2"
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
.ELIF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
RESOURCEMODELLIB=-lresourcemodel
Modified: openoffice/trunk/main/writerfilter/unocomponent/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/unocomponent/makefile.mk?rev=1415538&r1=1415537&r2=1415538&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/unocomponent/makefile.mk (original)
+++ openoffice/trunk/main/writerfilter/unocomponent/makefile.mk Fri Nov 30
08:27:01 2012
@@ -40,14 +40,10 @@ SLOFILES=$(SLO)$/component.obj
SHL1TARGET=$(TARGET)
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
+.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" || "$(GUI)"=="OS2"
DOCTOKLIB=-ldoctok
OOXMLLIB=-looxml
RESOURCEMODELLIB=-lresourcemodel
-.ELIF "$(GUI)"=="OS2"
-DOCTOKLIB=$(LB)$/idoctok.lib
-OOXMLLIB=$(LB)$/iooxml.lib
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
.ELIF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
DOCTOKLIB=-ldoctok
Modified: openoffice/trunk/main/xmlreader/source/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlreader/source/makefile.mk?rev=1415538&r1=1415537&r2=1415538&view=diff
==============================================================================
--- openoffice/trunk/main/xmlreader/source/makefile.mk (original)
+++ openoffice/trunk/main/xmlreader/source/makefile.mk Fri Nov 30 08:27:01 2012
@@ -43,9 +43,7 @@ SHL1RPATH = URELIB
SHL1STDLIBS = \
$(SALLIB)
SHL1TARGET = xmlreader
-.IF "$(GUI)" != "OS2"
SHL1USE_EXPORTS = name
-.ENDIF
DEF1NAME = $(SHL1TARGET)
.INCLUDE: target.mk
