svn commit: r1244995 - in /incubator/ooo/trunk/main: RepositoryFixes.mk solenv/gbuild/gbuild.mk solenv/gbuild/platform/os2.mk

[yd...@apache.org]

Author: ydario
Date: Thu Feb 16 14:27:48 2012
New Revision: 1244995

URL: http://svn.apache.org/viewvc?rev=1244995&view=rev
Log:
i118923 - OS/2 port: gbuild updates.

Modified:
    incubator/ooo/trunk/main/RepositoryFixes.mk
    incubator/ooo/trunk/main/solenv/gbuild/gbuild.mk
    incubator/ooo/trunk/main/solenv/gbuild/platform/os2.mk

Modified: incubator/ooo/trunk/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/RepositoryFixes.mk?rev=1244995&r1=1244994&r2=1244995&view=diff
==============================================================================
--- incubator/ooo/trunk/main/RepositoryFixes.mk (original)
+++ incubator/ooo/trunk/main/RepositoryFixes.mk Thu Feb 16 14:27:48 2012
@@ -169,7 +169,7 @@ endif
 ifeq ($(OS),OS2)
 gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:cppunit%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst cui:icuc%,cui:iicuc%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cui:iicuc%,cui:icuc%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
@@ -180,10 +180,25 @@ gb_Library_FILENAMES := $(patsubst vbahe
 gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:xml2%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlp45% stl:stdc444.lib,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stdc++%,$(gb_Library_FILENAMES))
 #$(info libnames: $(gb_Library_FILENAMES))
 
+# translate to 8.3 naming
 gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst drawinglayer:drawinglayer%,drawinglayer:drawingl%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst fsstorage:fsstorage.uno%,fsstorage:fsstorag%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst hatchwindowfactory:hatchwindowfactory.uno%,hatchwindowfactory:hatchwin%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst msforms:msforms.uno%,msforms:msforms%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst passwordcontainer:passwordcontainer.uno%,passwordcontainer:password%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst productregistration:productregistration.uno%,productregistration:productr%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst textconversiondlgs:textconversiondlgs%,textconversiondlgs:txcnvdlg%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst vbahelper:vbahelper%,vbahelper:vbahelp%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst vbaswobj:vbaswobj.uno%,vbaswobj:vbaswobj%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst sfx:test_sfx2_metadatable%,sfx:tstsfx2m%,$(gb_Library_DLLFILENAMES))
+
+gb_Library_NOILIBFILENAMES:=\
+	icuuc \
+	icule
 
 endif
 

Modified: incubator/ooo/trunk/main/solenv/gbuild/gbuild.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/gbuild/gbuild.mk?rev=1244995&r1=1244994&r2=1244995&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/gbuild/gbuild.mk (original)
+++ incubator/ooo/trunk/main/solenv/gbuild/gbuild.mk Thu Feb 16 14:27:48 2012
@@ -44,7 +44,11 @@
 # SYSTEM_LIBXML (Linux)
 # USE_SYSTEM_STL (Linux)
 
+ifeq ($(OS),OS2)
+SHELL := /@unixroot/usr/bin/sh
+else
 SHELL := /bin/sh
+endif
 true := T
 false :=
 define NEWLINE

Modified: incubator/ooo/trunk/main/solenv/gbuild/platform/os2.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/gbuild/platform/os2.mk?rev=1244995&r1=1244994&r2=1244995&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/gbuild/platform/os2.mk (original)
+++ incubator/ooo/trunk/main/solenv/gbuild/platform/os2.mk Thu Feb 16 14:27:48 2012
@@ -109,7 +109,8 @@ gb_CXXFLAGS := \
 #
 
 gb_STDLIBS = \
-	stdc444 \
+	z \
+	stdc++ \
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
 gb_CFLAGS_WERROR := -Werror
@@ -307,15 +308,6 @@ DLLBASE8 = $(call substr,$(notdir $(DLLT
 DLLTARGET8 = $(dir $(DLLTARGET))$(DLLBASE8)$(gb_Library_DLLEXT)
 DLLDEF8 = $(dir $(DLLTARGET))$(DLLBASE8).def
 
-	#EMXEXPRSP=$(call var2filecr,$(shell $(gb_MKTEMP)),1, \
-		$(call gb_Helper_convert_native,$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object)))) \
-		) && \
-	emxexp @$${EMXEXPRSP} >> $(DLLDEF8) && \
-	echo EXPORTS		>> $(DLLDEF8) && \
-
-
 define gb_LinkTarget__command_dynamiclinkexecutable
 $(call gb_Output_announce,$(2),$(true),LNK,4)
 $(call gb_Helper_abbreviate_dirs_native,\
@@ -334,6 +326,7 @@ $(call gb_Helper_abbreviate_dirs_native,
 		$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
 		$(LDFLAGS) \
 		@$${RESPONSEFILE} \
+		-L/@unixroot/usr/lib \
 		$(if $(DLLTARGET), $(DLLDEF8)) \
 		$(NATIVERES) \
 		$(patsubst %.lib,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
@@ -406,7 +399,7 @@ gb_Library_DLLEXT := .dll
 gb_Library_MAJORVER :=
 gb_Library_RTEXT := $(gb_Library_DLLEXT)
 ifeq ($(gb_PRODUCT),$(true))
-gb_Library_STLEXT := stlp45$(gb_Library_DLLEXT)
+gb_Library_STLEXT := stdc++$(gb_Library_DLLEXT)
 else
 gb_Library_STLEXT := stlp45_stldebug$(gb_Library_DLLEXT)
 endif