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.

3 files changed, 22 insertions, 1 deletions

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