diff options
| -rw-r--r-- | configure.in | 29 | ||||
| -rw-r--r-- | ooo.lst | 1 | ||||
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 1 | ||||
| -rw-r--r-- | postprocess/prj/build.lst | 2 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/menubar/menubar.xml | 1 | ||||
| -rw-r--r-- | sccomp/prj/build.lst | 2 | ||||
| -rw-r--r-- | sccomp/source/solver/makefile.mk | 3 | ||||
| -rwxr-xr-x | scp2/inc/macros.inc | 5 | ||||
| -rw-r--r-- | scp2/source/calc/file_calc.scp | 51 | ||||
| -rw-r--r-- | scp2/source/calc/makefile.mk | 9 | ||||
| -rw-r--r-- | set_soenv.in | 1 | ||||
| -rw-r--r-- | solenv/inc/libs.mk | 10 |
12 files changed, 103 insertions, 12 deletions
diff --git a/configure.in b/configure.in index 793a44ebb61c..b11f9dc87960 100644 --- a/configure.in +++ b/configure.in @@ -736,6 +736,9 @@ AC_ARG_WITH(local-solver, AC_ARG_ENABLE(javascript, [ --disable-javascript Disables support for JavaScript macros. ],,) +AC_ARG_ENABLE(coinmp, +[ --disable-coinmp Do not use CoinMP as the Calc solver. +],,) AC_ARG_ENABLE(check-only, [ --enable-check-only Use this option option if you just want to check your environment. This option stops the generation of an @@ -858,7 +861,7 @@ AC_ARG_ENABLE(category-b, [ --enable-category-b Activate components under a category B license (see http://www.apache.org/legal/3party.html#category-b): MPL (seamonkey, hunspell, hyphen, nss, saxon, rhino), - CPL (silgraphite), SPL (beanshell). + CPL (silgraphite), CPL/EPL (CoinMP), SPL (beanshell). Flags for individual libraries override this one. ],,) AC_ARG_WITH(arm-target, @@ -873,7 +876,7 @@ AC_ARG_WITH(arm-target, ],with_arm_target=$withval,with_arm_target=4) BUILD_TYPE="OOo" -ADDITIONAL_REPOSITORIES="" +ADDITIONAL_REPOSITORIES="../ext_libraries" dnl =================================================================== dnl Message. @@ -1295,8 +1298,9 @@ if test "$enable_category_b" == "yes"; then enable_javascript="yes" enable_beanshell="yes" enable_graphite="yes" + enable_coinmp="yes" - AC_MSG_RESULT([yes: allow modules moz, nss, hunspell, hyphen, saxon, rhino, beanshell, graphite to be built]) + AC_MSG_RESULT([yes: allow modules moz, nss, hunspell, hyphen, saxon, rhino, beanshell, graphite, coinmp to be built]) else # Disable libaries. enable_mozilla="no" @@ -1307,8 +1311,9 @@ else enable_javascript="no" enable_beanshell="no" enable_graphite="no" + enable_coinmp="no" - AC_MSG_RESULT([no: disabled modules moz, nss, hunspell, hyphen, saxon, rhino, beanshell, graphite]) + AC_MSG_RESULT([no: disabled modules moz, nss, hunspell, hyphen, saxon, rhino, beanshell, graphite, coinmp]) fi # gstreamer is used only via pre-installed libraries: not a problem @@ -4320,6 +4325,22 @@ AC_SUBST(ENABLE_JAVASCRIPT) dnl =================================================================== +dnl Check for CoinMP +dnl =================================================================== +ENABLE_COINMP= +AC_MSG_CHECKING([whether to enable support for CoinMP]) +if test "x$enable_coinmp" = "xyes"; then + BUILD_TYPE="$BUILD_TYPE COINMP" + AC_MSG_RESULT([yes]) + ENABLE_COINMP=YES +else + AC_MSG_RESULT([no]) + ENABLE_COINMP=NO +fi +AC_SUBST(ENABLE_COINMP) + + +dnl =================================================================== dnl Check for system curl dnl =================================================================== if test "$_os" = "Darwin" && test "$with_system_curl" != "no"; then @@ -61,3 +61,4 @@ fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt 377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz +3ac29d92c880e0bc703d66213f559c8b-CoinMP-1.6.tar.bz2 diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index b01c8f394d05..c134a4d36621 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -144,6 +144,7 @@ my_components = \ slideshow \ sm \ smd \ + solver \ spl \ srtrs1 \ stringresource \ diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index 4503e6806306..e1c2a72950e0 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: svgio accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext smoketestdoc uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL +po postprocess :: svgio accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext smoketestdoc uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL po postprocess usr1 - all po_mkout NULL po postprocess\checkxml nmake - all po_checkxml NULL po postprocess\checkdeliver nmake - all po_checkdlv NULL diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 392cfd5cf3ca..a6b772cca012 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -339,6 +339,7 @@ </menu:menupopup> </menu:menu> <menu:menuitem menu:id=".uno:GoalSeekDialog"/> + <menu:menuitem menu:id=".uno:SolverDialog"/> <menu:menuitem menu:id=".uno:ScenarioManager"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShareDocument"/> diff --git a/sccomp/prj/build.lst b/sccomp/prj/build.lst index a16408723fa8..163fa858a8a1 100644 --- a/sccomp/prj/build.lst +++ b/sccomp/prj/build.lst @@ -1,4 +1,4 @@ -scc sccomp : L10N:l10n offuh comphelper LPSOLVE:lpsolve tools rsc LIBXSLT:libxslt NULL +scc sccomp : L10N:l10n offuh comphelper COINMP:coinmp tools rsc LIBXSLT:libxslt NULL scc sccomp usr1 - all scc_mkout NULL scc sccomp\prj get - all scc_prj NULL scc sccomp\source\solver nmake - all scc_solver NULL diff --git a/sccomp/source/solver/makefile.mk b/sccomp/source/solver/makefile.mk index 299932b7f7f0..d746de7e596e 100644 --- a/sccomp/source/solver/makefile.mk +++ b/sccomp/source/solver/makefile.mk @@ -52,7 +52,7 @@ SHL1STDLIBS= $(COMPHELPERLIB) \ $(CPPULIB) \ $(SALLIB) \ $(TOOLSLIB) \ - CoinMP.lib + $(COINMPLIB) SHL1DEPN= makefile.mk SHL1DEF= $(MISC)$/$(SHL1TARGET).def @@ -79,3 +79,4 @@ $(MISC)/solver.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ $(XSLTPROC) --nonet --stringparam uri \ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ $(SOLARENV)/bin/createcomponent.xslt solver.component + diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 52d8f845af43..4f2fc7ffb1d7 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -88,6 +88,11 @@ #define EXENAME(name) STRING(name) #define PROFILENAME(name) STRING(CONCAT2(name,rc)) #define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX)) + #ifdef MACOSX + #define SPECIAL_NAME_VER(name,version) STRING(CONCAT5(lib,name,.,version,UNXSUFFIX)) + #else + #define SPECIAL_NAME_VER(name,version) STRING(CONCAT5(lib,name,UNXSUFFIX,.,version)) + #endif #define SPECIAL_COMPONENT_LIB_NAME(name) STRING(CONCAT2(name,UNXSUFFIX)) #else #define LIBNAME(name) STRING(CONCAT3(name,DLLPOSTFIX,.dll)) diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index 8131aff663bf..193fd6640976 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -23,6 +23,55 @@ #include "macros.inc" + +#ifdef ENABLE_COINMP +STD_LIB_FILE( gid_File_Lib_Solver, solver) + +#ifdef ADD_ALL_COINMP_LIBRARIES +File gid_File_Lib_CoinMP + Name = SPECIAL_NAME_VER(CoinMP,0); + PACKED_LIB_FILE_BODY; +End +File gid_File_Lib_CoinUtils + Name = SPECIAL_NAME_VER(CoinUtils,0); + PACKED_LIB_FILE_BODY; +End +File gid_File_Lib_Clp + Name = SPECIAL_NAME_VER(Clp,0); + PACKED_LIB_FILE_BODY; +End +File gid_File_Lib_Cbc + Name = SPECIAL_NAME_VER(Cbc,0); + PACKED_LIB_FILE_BODY; +End +File gid_File_Lib_Osi + Name = SPECIAL_NAME_VER(Osi,0); + PACKED_LIB_FILE_BODY; +End +File gid_File_Lib_OsiClp + Name = SPECIAL_NAME_VER(OsiClp,0); + PACKED_LIB_FILE_BODY; +End +File gid_File_Lib_Cgl + Name = SPECIAL_NAME_VER(Cgl,0); + PACKED_LIB_FILE_BODY; +End +File gid_File_Lib_CbcSolver + Name = SPECIAL_NAME_VER(CbcSolver,0); + PACKED_LIB_FILE_BODY; +End +#else +# On Windows only the CoinMP library is built and used. +# Version numbering is not used either. +File gid_File_Lib_CoinMP + Name = SPECIAL_NAME(CoinMP); + PACKED_LIB_FILE_BODY; +End +#endif + +#endif + + STD_LIB_FILE( gid_File_Lib_Analysis, analysis) File gid_File_Share_Registry_Calc_Xcd @@ -44,6 +93,8 @@ STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt) STD_LIB_FILE( gid_File_Lib_Scd, scd) +STD_RES_FILE( gid_File_Res_Solver, solver) + STD_RES_FILE( gid_File_Res_Analysis, analysis) STD_RES_FILE( gid_File_Res_Date, date) diff --git a/scp2/source/calc/makefile.mk b/scp2/source/calc/makefile.mk index 318ee24576c8..cf4db62c5f93 100644 --- a/scp2/source/calc/makefile.mk +++ b/scp2/source/calc/makefile.mk @@ -33,8 +33,13 @@ TARGETTYPE=CUI .INCLUDE : settings.mk -.IF "$(SYSTEM_LPSOLVE)" == "YES" -SCPDEFS+=-DSYSTEM_LPSOLVE +.IF "$(ENABLE_COINMP)" == "YES" +SCPDEFS+=-DENABLE_COINMP +.IF "$(GUI)"!="WNT" +# For the non-Windows platforms all libraries related to CoinMP have to be +# added explicitly. +SCPDEFS+=-DADD_ALL_COINMP_LIBRARIES +.ENDIF .ENDIF SCP_PRODUCT_TYPE=osl diff --git a/set_soenv.in b/set_soenv.in index 950733074fa6..0011ccee316f 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1948,6 +1948,7 @@ ToFile( "SYSTEM_SAXON", "@SYSTEM_SAXON@", "e" ); ToFile( "SAXON_JAR", "@SAXON_JAR@", "e" ); ToFile( "DISABLE_SAXON", "@DISABLE_SAXON@", "e" ); ToFile( "ENABLE_JAVASCRIPT", "@ENABLE_JAVASCRIPT@","e" ); +ToFile( "ENABLE_COINMP", "@ENABLE_COINMP@", "e" ); ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" ); ToFile( "SYSTEM_LIBXSLT", "@SYSTEM_LIBXSLT@", "e" ); ToFile( "LIBXSLT_CFLAGS", "@LIBXSLT_CFLAGS@", "e" ); diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index fc708895fff4..254796143abe 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -19,7 +19,6 @@ # #************************************************************** - LIBSMKREV!:="$$Revision: 1.134.2.3 $$" .IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" @@ -335,7 +334,12 @@ MYTHESLIB=$(MYTHES_LIBS) MYTHESLIB=-lmythes-1.2 .ENDIF PYUNOLIB=-lpyuno -LPSOLVELIB=-llpsolve55 +COINMPLIB=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver +.IF "$(OS)" == "MACOSX" +COINMPLIB+=-lbz2 +.ELSE +COINMPLIB+=-lz +.ENDIF SOFFICELIB=-lsofficeapp UNOPKGAPPLIB=-lunopkgapp TESTLIB=-ltest @@ -517,7 +521,7 @@ HUNSPELLLIB=$(LIBPRE) libhunspell.lib .ENDIF MYTHESLIB=libmythes.lib PYUNOLIB=ipyuno.lib -LPSOLVELIB=lpsolve55.lib +COINMPLIB=CoinMP.lib SOFFICELIB=isofficeapp.lib UNOPKGAPPLIB=iunopkgapp.lib TESTLIB=itest.lib |