You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2011/11/08 11:53:25 UTC
svn commit: r1199180 - in /incubator/ooo/trunk/main: ./ lpsolve/
lpsolve/prj/ postprocess/packcomponents/ postprocess/prj/
postprocess/rebase/ sc/uiconfig/scalc/menubar/ scp2/source/calc/
Author: hdu
Date: Tue Nov 8 10:53:24 2011
New Revision: 1199180
URL: http://svn.apache.org/viewvc?rev=1199180&view=rev
Log:
#i118567# (author=Andre Fischer) remove lp_solver which has an incompatible license
Removed:
incubator/ooo/trunk/main/lpsolve/lp_solve_5.5-windows.patch
incubator/ooo/trunk/main/lpsolve/lp_solve_5.5.patch
incubator/ooo/trunk/main/lpsolve/makefile.mk
incubator/ooo/trunk/main/lpsolve/prj/build.lst
incubator/ooo/trunk/main/lpsolve/prj/d.lst
Modified:
incubator/ooo/trunk/main/configure.in
incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
incubator/ooo/trunk/main/postprocess/prj/build.lst
incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt
incubator/ooo/trunk/main/sc/uiconfig/scalc/menubar/menubar.xml
incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp
incubator/ooo/trunk/main/set_soenv.in
Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1199180&r1=1199179&r2=1199180&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Tue Nov 8 10:53:24 2011
@@ -562,9 +562,6 @@ AC_ARG_WITH(system-mythes,
AC_ARG_WITH(system-altlinuxhyph,
[ --with-system-altlinuxhyph Use ALTLinuxhyph already on system
],,)
-AC_ARG_WITH(system-lpsolve,
-[ --with-system-lpsolve Use lpsolve already on system
-],,)
AC_ARG_WITH(system-libtextcat,
[ --with-system-libtextcat Use libtextcat already on system
],,)
@@ -5276,28 +5273,6 @@ AC_SUBST(MYTHES_LIBS)
fi
dnl ===================================================================
-dnl Checking for lpsolve
-dnl ===================================================================
-AC_MSG_CHECKING([which lpsolve to use])
-if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
- test "$with_system_lpsolve" != "no"; then
- AC_MSG_RESULT([external])
- SYSTEM_LPSOLVE=YES
- AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
- [ AC_MSG_ERROR(lpsolve headers not found.)], [])
- # some systems need this. Like Ubuntu....
- AC_CHECK_LIB(m, floor)
- AC_CHECK_LIB(dl, dlopen)
- AC_CHECK_LIB(lpsolve55, make_lp, ,
- [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
-else
- AC_MSG_RESULT([internal])
- SYSTEM_LPSOLVE=NO
- BUILD_TYPE="$BUILD_TYPE LPSOLVE"
-fi
-AC_SUBST(SYSTEM_LPSOLVE)
-
-dnl ===================================================================
dnl Checking for libtextcat
dnl ===================================================================
AC_MSG_CHECKING([which libtextcat to use])
Modified: incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk?rev=1199180&r1=1199179&r2=1199180&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk Tue Nov 8 10:53:24 2011
@@ -145,7 +145,6 @@ my_components = \
slideshow \
sm \
smd \
- solver \
spl \
srtrs1 \
stringresource \
Modified: incubator/ooo/trunk/main/postprocess/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/prj/build.lst?rev=1199180&r1=1199179&r2=1199180&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/prj/build.lst (original)
+++ incubator/ooo/trunk/main/postprocess/prj/build.lst Tue Nov 8 10:53:24 2011
@@ -1,4 +1,4 @@
-po postprocess :: 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 librsvg 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 DICTIONARIES:dictionaries 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 :: 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 librsvg 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 DICTIONARIES:dictionaries 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
Modified: incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt?rev=1199180&r1=1199179&r2=1199180&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt (original)
+++ incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt Tue Nov 8 10:53:24 2011
@@ -176,7 +176,6 @@ localedata_es.dll 0x0000000061c10000 0x0
localedata_euro.dll 0x0000000061b60000 0x000a0000
localedata_others.dll 0x0000000061aa0000 0x000b0000
logmi.dll 0x0000000061a70000 0x00020000
-lpsolve55.dll 0x0000000061970000 0x00070000
mcnttype.dll 0x0000000061950000 0x00010000
mozabmi.dll 0x00000000597a0000 0x00020000
mozabdrvmi.dll 0x00000000597d0000 0x00070000
Modified: incubator/ooo/trunk/main/sc/uiconfig/scalc/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/uiconfig/scalc/menubar/menubar.xml?rev=1199180&r1=1199179&r2=1199180&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/uiconfig/scalc/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/sc/uiconfig/scalc/menubar/menubar.xml Tue Nov 8 10:53:24 2011
@@ -339,7 +339,6 @@
</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"/>
Modified: incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp?rev=1199180&r1=1199179&r2=1199180&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp Tue Nov 8 10:53:24 2011
@@ -27,15 +27,6 @@
#include "macros.inc"
-STD_LIB_FILE( gid_File_Lib_Solver, solver)
-
-#ifndef SYSTEM_LPSOLVE
-File gid_File_Lib_Lpsolve
- Name = SPECIAL_NAME(lpsolve55);
- PACKED_LIB_FILE_BODY;
-End
-#endif
-
STD_LIB_FILE( gid_File_Lib_Analysis, analysis)
File gid_File_Share_Registry_Calc_Xcd
@@ -57,8 +48,6 @@ STD_LIB_FILE( gid_File_Lib_Scfilt, scfil
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)
Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1199180&r1=1199179&r2=1199180&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Tue Nov 8 10:53:24 2011
@@ -1970,7 +1970,6 @@ ToFile( "REDLAND_LIBS", "@REDLAND_L
ToFile( "SYSTEM_HUNSPELL", "@SYSTEM_HUNSPELL@", "e" );
ToFile( "HUNSPELL_CFLAGS", "@HUNSPELL_CFLAGS@", "e" );
ToFile( "HUNSPELL_LIBS", "@HUNSPELL_LIBS@", "e" );
-ToFile( "SYSTEM_LPSOLVE", "@SYSTEM_LPSOLVE@", "e" );
ToFile( "HAVE_GETOPT", "@HAVE_GETOPT@", "e" );
ToFile( "HAVE_READDIR_R", "@HAVE_READDIR_R@", "e" );
ToFile( "SYSTEM_LIBC", "@SYSTEM_LIBC@", "e" );