From e3ee495f2b9b5e70f00bb54ea983a77ac0e28550 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Tue, 9 Dec 2008 08:43:20 +0000 Subject: CWS-TOOLING: integrate CWS os2port04 2008-11-27 13:22:38 +0100 ydario r264480 : #i96439#: fix build for unix platforms. 2008-11-26 18:32:42 +0100 ydario r264433 : #i96439#: os2 systemshell code (dummy code). 2008-11-26 16:33:48 +0100 ydario r264421 : #i96439#: vcl fix for pdf export of truetype fonts. 2008-11-26 15:04:44 +0100 ydario r264399 : #i96439#: build macros fix scripts, gcc specific flags. 2008-11-26 15:00:15 +0100 ydario r264398 : #i96439#: vcl source code updates. 2008-11-26 13:21:37 +0100 ydario r264378 : #i96439#: os2 build system fixes. 2008-11-26 13:20:27 +0100 ydario r264377 : #i96439#: configuration and build macros updates. 2008-11-26 13:16:35 +0100 ydario r264375 : #i96439#: new launcher code, build system updates. 2008-11-26 13:12:49 +0100 ydario r264373 : #i96439#: use OSL endian macro. 2008-11-26 12:54:50 +0100 ydario r264371 : #i96439#: os2 build system fixes. 2008-11-26 12:30:46 +0100 ydario r264367 : #i96439#: os2 build system fixes. 2008-11-26 12:09:33 +0100 ydario r264365 : #i96439#: _Export is a reserved keyword under gcc for os2. 2008-11-26 12:08:12 +0100 ydario r264364 : #i96439#: new libpath handling. 2008-11-26 11:57:51 +0100 ydario r264363 : #i96439#: use C call, generates proper stabs; fix rtti names. --- cppunit/source/cppunit/makefile.mk | 4 ++-- hyphen/makefile.mk | 4 ++++ lpsolve/lp_solve_5.5.patch | 17 +++++++++++++++++ lpsolve/makefile.mk | 5 ++++- lpsolve/prj/d.lst | 1 + redland/prj/d.lst | 1 + redland/raptor/makefile.mk | 6 ++++++ redland/rasqal/makefile.mk | 5 +++++ redland/redland/makefile.mk | 4 ++++ 9 files changed, 44 insertions(+), 3 deletions(-) diff --git a/cppunit/source/cppunit/makefile.mk b/cppunit/source/cppunit/makefile.mk index 2441bc600259..a65e32c94e42 100644 --- a/cppunit/source/cppunit/makefile.mk +++ b/cppunit/source/cppunit/makefile.mk @@ -87,7 +87,7 @@ LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a LIB1FILES=$(LB)$/c5t_winstuff.lib .ENDIF -.IF "$(GUI)" == "UNX" +.IF "$(GUI)" == "UNX" || "$(GUI)" == "OS2" LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a .ENDIF @@ -103,7 +103,7 @@ LIB2ARCHIV=$(LB)$/lib$(TARGET2)$(DLLPOSTFIX).a .ENDIF .ENDIF -.IF "$(GUI)" == "UNX" +.IF "$(GUI)" == "UNX" || "$(GUI)" == "OS2" LIB2ARCHIV=$(LB)$/lib$(TARGET2)$(DLLPOSTFIX).a .ENDIF diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk index ad3436a6eeef..62f3b4f4a376 100644 --- a/hyphen/makefile.mk +++ b/hyphen/makefile.mk @@ -95,6 +95,10 @@ BUILD_ACTION=dmake OUT2INC += hyphen.h .ENDIF # "$(GUI)"=="WNT" +.IF "$(GUI)"=="OS2" +BUILD_ACTION=dmake +OUT2INC += hyphen.h +.ENDIF # "$(GUI)"=="OS2" # --- Targets ------------------------------------------------------ diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch index e4c71e2cccce..fc446a4e5727 100644 --- a/lpsolve/lp_solve_5.5.patch +++ b/lpsolve/lp_solve_5.5.patch @@ -7,6 +7,23 @@ def= so= +--- misc/lp_solve_5.5/lpsolve55/ccc.os2 2008-11-26 12:49:36.000000000 +0100 ++++ misc/build/lp_solve_5.5/lpsolve55/ccc.os2 2008-09-25 17:27:48.000000000 +0200 +@@ -1 +1,13 @@ +-dummy ++src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' ++c=$CC ++ ++def= ++so= ++ ++opts='-O3' ++ ++$c -s -c -Zomf -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src ++emxomfar rv liblpsolve55.lib `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` ++echo liblpsolve55.a ++ ++rm *.o 2>/dev/null --- misc/lp_solve_5.5/lpsolve55/ccc.osx Thu Jun 23 22:53:08 2005 +++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx Wed May 21 17:19:56 2008 @@ -3,6 +3,10 @@ diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index 0c319726e298..b36abbebb29b 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -46,7 +46,7 @@ TARFILE_NAME=lp_solve_5.5 PATCH_FILE_NAME=lp_solve_5.5-windows.patch .ELSE PATCH_FILE_NAME=lp_solve_5.5.patch -ADDITIONAL_FILES=lpsolve55$/ccc.solaris +ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 .ENDIF CONFIGURE_DIR= @@ -62,6 +62,9 @@ BUILD_ACTION=cmd /c cvc6.bat OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib .ENDIF OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll +.ELIF "$(GUI)"=="OS2" +BUILD_ACTION=sh ccc.os2 +OUT2LIB=$(BUILD_DIR)$/liblpsolve55.lib .ELSE .IF "$(OS)"=="MACOSX" BUILD_ACTION=sh ccc.osx diff --git a/lpsolve/prj/d.lst b/lpsolve/prj/d.lst index 89980655e68d..64b8c0c97863 100644 --- a/lpsolve/prj/d.lst +++ b/lpsolve/prj/d.lst @@ -3,6 +3,7 @@ mkdir: %_DEST%\inc%_EXT%\lpsolve ..\%__SRC%\inc\lp_*.h %_DEST%\inc%_EXT%\lpsolve\* ..\%__SRC%\lib\liblpsolve55.so %_DEST%\lib%_EXT%\liblpsolve55.so ..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib%_EXT%\liblpsolve55.dylib +..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib%_EXT%\liblpsolve55.lib ..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib%_EXT%\lpsolve55.lib ..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin%_EXT%\lpsolve55.dll diff --git a/redland/prj/d.lst b/redland/prj/d.lst index a5cfec758ae8..1d82c72e7485 100644 --- a/redland/prj/d.lst +++ b/redland/prj/d.lst @@ -3,6 +3,7 @@ ..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT% ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT% +..\%__SRC%\lib\*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\lib*.dll.a %_DEST%\lib%_EXT%\lib*.a ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% ..\redlandversion.mk %_DEST%\inc%_EXT%\redlandversion.mk diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 8c929a9c2e14..4bd548ede802 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -70,6 +70,7 @@ BUILD_DIR=$(CONFIGURE_DIR) BUILD_ACTION=dmake BUILD_DIR=$(CONFIGURE_DIR)$/src .ENDIF + .ELSE # "WNT" .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" @@ -129,6 +130,11 @@ OUT2BIN+=src/raptor-config .ELSE # if we use dmake, this is done automagically .ENDIF + +.ELIF "$(GUI)"=="OS2" +OUT2LIB+=src$/.libs$/*.a +OUT2BIN+=src$/raptor-config + .ELSE OUT2LIB+=src$/.libs$/libraptor*.so* OUT2BIN+=src/raptor-config diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index ddf6a5153ae8..df4b640e6962 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -129,6 +129,11 @@ OUT2BIN+=src/rasqal-config .ELSE # if we use dmake, this is done automagically .ENDIF + +.ELIF "$(OS)"=="OS2" +OUT2LIB+=src$/.libs$/*.a +OUT2BIN+=src$/rasqal-config + .ELSE OUT2LIB+=src$/.libs$/librasqal*.so* OUT2BIN+=src/rasqal-config diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index af3b906d7804..21ac94b388d7 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -131,6 +131,10 @@ OUT2BIN+=librdf$/.libs$/*.dll .ELSE # if we use dmake, this is done automagically .ENDIF + +.ELIF "$(OS)"=="OS2" +OUT2LIB+=librdf$/.libs$/*.a + .ELSE OUT2LIB+=librdf$/.libs$/librdf*.so* .ENDIF -- cgit