diff options
author | Niklas Nebel <nn@openoffice.org> | 2007-11-23 20:29:22 +0000 |
---|---|---|
committer | Niklas Nebel <nn@openoffice.org> | 2007-11-23 20:29:22 +0000 |
commit | 1addee99991a24eb8f3e47dde027e8f05241eef3 (patch) | |
tree | 1fdb38450ca2defe2a8179e6cf7c1c561ef305d3 | |
parent | 6735c822ef7b298d770873c7468e4b6ce23ba94d (diff) |
commit new module lpsolve to head
-rw-r--r-- | lpsolve/lp_solve_5.5-windows.patch | 19 | ||||
-rw-r--r-- | lpsolve/lp_solve_5.5.patch | 31 | ||||
-rw-r--r-- | lpsolve/makefile.mk | 81 | ||||
-rw-r--r-- | lpsolve/prj/build.lst | 3 | ||||
-rw-r--r-- | lpsolve/prj/d.lst | 7 |
5 files changed, 141 insertions, 0 deletions
diff --git a/lpsolve/lp_solve_5.5-windows.patch b/lpsolve/lp_solve_5.5-windows.patch new file mode 100644 index 000000000000..2bb270ab0671 --- /dev/null +++ b/lpsolve/lp_solve_5.5-windows.patch @@ -0,0 +1,19 @@ +*** misc/lp_solve_5.5/lpsolve55/lpsolve.rc Sun Jun 4 00:15:24 2006 +--- misc/build/lp_solve_5.5/lpsolve55/lpsolve.rc Fri Nov 23 16:34:22 2007 +*************** +*** 7,13 **** + // + // Generated from the TEXTINCLUDE 2 resource. + // +! #include "afxres.h" + + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS +--- 7,13 ---- + // + // Generated from the TEXTINCLUDE 2 resource. + // +! #include "winresrc.h" + + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch new file mode 100644 index 000000000000..26876699fdf6 --- /dev/null +++ b/lpsolve/lp_solve_5.5.patch @@ -0,0 +1,31 @@ +*** misc/lp_solve_5.5/lpsolve55/ccc.solaris Fri Nov 23 21:38:12 2007 +--- misc/build/lp_solve_5.5/lpsolve55/ccc.solaris Fri Nov 23 21:58:29 2007 +*************** +*** 1 **** +! dummy +--- 1,25 ---- +! 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= +! if [ "$PLATFORM" = "SCO_UNIX" ] +! then def='-dy -K PIC -DNOLONGLONG' +! dl=-lc +! else dl=-ldl +! so=y +! fi +! +! opts='-xO3' +! +! $c -s -c -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 +! ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` +! ranlib liblpsolve55.a +! +! if [ "$so" != "" ] +! then +! $c -K pic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src +! $c -G -Bsymbolic -h liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl +! fi +! +! rm *.o 2>/dev/null diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk new file mode 100644 index 000000000000..7cbf9f1c08a5 --- /dev/null +++ b/lpsolve/makefile.mk @@ -0,0 +1,81 @@ +#************************************************************************* +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: makefile.mk,v $ +# +# $Revision: 1.2 $ +# +# last change: $Author: nn $ $Date: 2007-11-23 21:29:22 $ +# +# The Contents of this file are made available subject to +# the terms of GNU Lesser General Public License Version 2.1. +# +# +# GNU Lesser General Public License Version 2.1 +# ============================================= +# Copyright 2005 by Sun Microsystems, Inc. +# 901 San Antonio Road, Palo Alto, CA 94303, USA +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License version 2.1, as published by the Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# +#************************************************************************* + +PRJ=. + +PRJNAME=lpsolve +TARGET=lpsolve + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +# --- Files -------------------------------------------------------- + +TARFILE_NAME=lp_solve_5.5 + +.IF "$(GUI)"=="WNT" +PATCH_FILE_NAME=lp_solve_5.5-windows.patch +.ELSE +PATCH_FILE_NAME=lp_solve_5.5.patch +ADDITIONAL_FILES=lpsolve55$/ccc.solaris +.ENDIF + +CONFIGURE_DIR= +CONFIGURE_ACTION= +CONFIGURE_FLAGS= + +BUILD_DIR=lpsolve55 +.IF "$(GUI)"=="WNT" +BUILD_ACTION=cmd /c cvc6.bat +OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll +OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib +.ELSE +.IF "$(COMNAME)"=="sunpro5" +BUILD_ACTION=sh ccc.solaris +.ELSE +BUILD_ACTION=sh ccc +.ENDIF +OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so +.ENDIF + +OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk +.INCLUDE : tg_ext.mk + diff --git a/lpsolve/prj/build.lst b/lpsolve/prj/build.lst new file mode 100644 index 000000000000..516f37ae9f1c --- /dev/null +++ b/lpsolve/prj/build.lst @@ -0,0 +1,3 @@ +lps lpsolve : sal NULL +lps lpsolve usr1 - all lps_mkout NULL +lps lpsolve nmake - all lps_lpsolve NULL diff --git a/lpsolve/prj/d.lst b/lpsolve/prj/d.lst new file mode 100644 index 000000000000..d094968a6100 --- /dev/null +++ b/lpsolve/prj/d.lst @@ -0,0 +1,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\lpsolve55.lib %_DEST%\lib%_EXT%\lpsolve55.lib +..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin%_EXT%\lpsolve55.dll + |