GNOME.org
 

ooo-build r13508 - in trunk: . patches/scsolver

Author: kyoshida
Date: Mon Aug 11 04:04:13 2008
New Revision: 13508
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13508&view=rev

Log:
2008-08-11  Kohei Yoshida  <kyoshida novell com>

	* patches/scsolver/scsolver-config-option.diff:
	* patches/scsolver/scsolver-lpsolve.diff:
	* patches/scsolver/scsolver-sc-build-lst.diff:
	* patches/scsolver/scsolver-scp2.diff:
	* patches/scsolver/scsolver-setup_native.diff: added patches to re-
	enable the real Calc Solver once again.  They are not enabled yet.


Added:
   trunk/patches/scsolver/
   trunk/patches/scsolver/scsolver-config-option.diff
   trunk/patches/scsolver/scsolver-lpsolve.diff
   trunk/patches/scsolver/scsolver-sc-build-lst.diff
   trunk/patches/scsolver/scsolver-scp2.diff
   trunk/patches/scsolver/scsolver-setup_native.diff
Modified:
   trunk/ChangeLog

Added: trunk/patches/scsolver/scsolver-config-option.diff
==============================================================================
--- (empty file)
+++ trunk/patches/scsolver/scsolver-config-option.diff	Mon Aug 11 04:04:13 2008
@@ -0,0 +1,41 @@
+diff --git config_office/configure.in config_office/configure.in
+index 3ba1058..3a63fef 100644
+--- config_office/configure.in
++++ config_office/configure.in
+@@ -125,6 +125,10 @@ AC_ARG_ENABLE(evolution2,
+ [  --enable-evolution2     Allows the built-in evolution 2 addressbook
+                           connectivity build to be enabled.
+ ],,)
++AC_ARG_ENABLE(scsolver,
++[  --enable-scsolver       use the real scsolver module instead of the Sun 
++                          version.
++],,enable_scsolver="yes")
+ AC_ARG_WITH(system-stdlibs,
+ [  --with-system-stdlibs   use libstdc++/libgcc_s already on system
+ ],,checkforprelink=yes)
+@@ -6027,6 +6031,25 @@ else
+ fi
+ AC_SUBST(WITH_FONTOOO)
+ 
++dnl ===================================================================
++dnl Test whether to use scsolver
++dnl ===================================================================
++AC_MSG_CHECKING([whether to use scsolver])
++if test -n "$enable_scsolver"; then
++  if test "$enable_scsolver" = "no"; then
++    AC_MSG_RESULT([no])
++    WITH_SCSOLVER=NO
++  else
++    AC_MSG_RESULT([yes])
++    WITH_SCSOLVER=YES
++    BUILD_TYPE="$BUILD_TYPE SCSOLVER"
++  fi
++else
++  AC_MSG_RESULT([no])
++  WITH_SCSOLVER=NO
++fi
++AC_SUBST(WITH_SCSOLVER)
++
+ if test "$WITH_FONTOOO" = "YES"; then
+   dnl ===============================================================
+   dnl Check whether to use libmspack from system

Added: trunk/patches/scsolver/scsolver-lpsolve.diff
==============================================================================
--- (empty file)
+++ trunk/patches/scsolver/scsolver-lpsolve.diff	Mon Aug 11 04:04:13 2008
@@ -0,0 +1,27 @@
+diff --git lpsolve/makefile.mk lpsolve/makefile.mk
+index 0c31972..26b75b3 100644
+--- lpsolve/makefile.mk
++++ lpsolve/makefile.mk
+@@ -72,7 +72,9 @@ BUILD_ACTION=sh ccc.solaris
+ .ELSE
+ BUILD_ACTION=sh ccc
+ .ENDIF
+-OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
++OUT2LIB= \
++	$(BUILD_DIR)$/liblpsolve55.so \
++	$(BUILD_DIR)$/liblpsolve55.a
+ .ENDIF
+ .ENDIF
+ 
+diff --git lpsolve/prj/d.lst lpsolve/prj/d.lst
+index 8998065..4237414 100644
+--- lpsolve/prj/d.lst
++++ lpsolve/prj/d.lst
+@@ -2,6 +2,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.a %_DEST%\lib%_EXT%\liblpsolve55.a
+ ..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib%_EXT%\liblpsolve55.dylib
+ ..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib%_EXT%\lpsolve55.lib
+ ..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin%_EXT%\lpsolve55.dll

Added: trunk/patches/scsolver/scsolver-sc-build-lst.diff
==============================================================================
--- (empty file)
+++ trunk/patches/scsolver/scsolver-sc-build-lst.diff	Mon Aug 11 04:04:13 2008
@@ -0,0 +1,10 @@
+diff --git sc/prj/build.lst sc/prj/build.lst
+index 5cd2276..32dc51e 100644
+--- sc/prj/build.lst
++++ sc/prj/build.lst
+@@ -1,4 +1,4 @@
+-sc	sc	:	oovbaapi svx stoc uui BOOST:boost NULL
++sc	sc	:	SCSOLVER:scsolver oovbaapi svx stoc uui BOOST:boost NULL
+ sc	sc										usr1	-	all	sc_mkout NULL
+ sc	sc\inc									nmake	-	all	sc_inc NULL
+ sc	sc\uiconfig\layout									nmake	-	all	sc_layout NULL

Added: trunk/patches/scsolver/scsolver-scp2.diff
==============================================================================
--- (empty file)
+++ trunk/patches/scsolver/scsolver-scp2.diff	Mon Aug 11 04:04:13 2008
@@ -0,0 +1,151 @@
+diff --git scp2/prj/build.lst scp2/prj/build.lst
+index 111afe4..1b864f7 100644
+--- scp2/prj/build.lst
++++ scp2/prj/build.lst
+@@ -17,6 +17,7 @@ cp    scp2\source\layout          nmake    -    all    cp_layout cp_langmacros N
+ cp    scp2\source\math            nmake    -    all    cp_math cp_langmacros cp_langtemplates NULL
+ cp    scp2\source\ooo             nmake    -    all    cp_ooo cp_langmacros cp_langtemplates NULL
+ cp    scp2\source\python          nmake    -    all    cp_python cp_langmacros cp_langtemplates NULL
++cp    scp2\source\scsolver        nmake    -    all    cp_scsolver cp_langmacros NULL
+ cp    scp2\source\quickstart      nmake    -    all    cp_quickstart cp_langmacros cp_langtemplates NULL
+ cp    scp2\source\sdkoo           nmake    -    all    cp_sdkoo cp_langmacros cp_langtemplates NULL
+ cp    scp2\source\testtool        nmake    -    all    cp_testtool cp_langmacros cp_langtemplates NULL
+diff --git scp2/source/scsolver/file_scsolver.scp scp2/source/scsolver/file_scsolver.scp
+new file mode 100644
+index 0000000..4c7a813
+--- /dev/null
++++ scp2/source/scsolver/file_scsolver.scp
+@@ -0,0 +1,8 @@
++#include "macros.inc"
++
++File gid_File_Oxt_ScSolver
++    TXT_FILE_BODY;
++    Styles = (PACKED);
++    Dir = gid_Brand_Dir_Share_Extension_Install;
++    Name = STRING(scsolver.uno.oxt);
++End
+diff --git scp2/source/scsolver/makefile.mk scp2/source/scsolver/makefile.mk
+new file mode 100644
+index 0000000..7f6b86e
+--- /dev/null
++++ scp2/source/scsolver/makefile.mk
+@@ -0,0 +1,62 @@
++#*************************************************************************
++#
++#   OpenOffice.org - a multi-platform office productivity suite
++#
++#   $RCSfile: makefile.mk,v $
++#
++#   $Revision: 1.13 $
++#
++#   last change: $Author: rt $ $Date: 2006/01/10 15:34:10 $
++#
++#   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=..$/..
++
++PRJPCH=
++
++PRJNAME=scp2
++TARGET=scsolver
++TARGETTYPE=CUI
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :	settings.mk
++
++.IF "$(SYSTEM_LPSOLVE)" == "YES"
++SCPDEFS+=-DSYSTEM_LPSOLVE
++.ENDIF
++
++SCP_PRODUCT_TYPE=osl
++
++PARFILES=\
++        module_scsolver.par              \
++        file_scsolver.par                \
++
++ULFFILES= \
++        module_scsolver.ulf
++
++# --- File ---------------------------------------------------------
++.INCLUDE :  target.mk
+diff --git scp2/source/scsolver/module_scsolver.scp scp2/source/scsolver/module_scsolver.scp
+new file mode 100644
+index 0000000..ac9b7d3
+--- /dev/null
++++ scp2/source/scsolver/module_scsolver.scp
+@@ -0,0 +1,11 @@
++#include "macros.inc"
++
++Module gid_Module_Optional_ScSolver
++    PackageInfo = "packinfo_office.txt";
++    MOD_NAME_DESC ( MODULE_OPTIONAL_SCSOLVER );
++    ParentID = gid_Module_Optional;
++    Sortkey = "750";
++    Files = (gid_File_Oxt_ScSolver);
++    Minimal = NO;
++    Default = YES;
++End
+diff --git scp2/source/scsolver/module_scsolver.ulf scp2/source/scsolver/module_scsolver.ulf
+new file mode 100644
+index 0000000..cab3a2e
+--- /dev/null
++++ scp2/source/scsolver/module_scsolver.ulf
+@@ -0,0 +1,6 @@
++
++[STR_NAME_MODULE_OPTIONAL_SCSOLVER]
++en-US = "%PRODUCTNAME Calc Solver"
++
++[STR_DESC_MODULE_OPTIONAL_SCSOLVER]
++en-US = "The linear and non-linear optimization solver for Calc."
+diff --git scp2/util/makefile.mk scp2/util/makefile.mk
+index 329a03a..42eac10 100644
+--- scp2/util/makefile.mk
++++ scp2/util/makefile.mk
+@@ -91,6 +91,11 @@ SCP1FILES  = installation_ooo.par          \
+              common_brand_readme.par       \
+              ooo_brand.par
+ 
++.IF "$(WITH_SCSOLVER)" != "NO"
++SCP1FILES += module_scsolver.par           \
++             file_scsolver.par
++.ENDIF
++
+ .IF "$(WITH_BINFILTER)" != "NO"
+ SCP1FILES +=                               \
+              module_binfilter.par          \
+@@ -241,6 +246,11 @@ SCP2FILES  = installation_ooo.par          \
+              common_brand_readme.par       \
+              ooo_brand.par
+ 
++.IF "$(WITH_SCSOLVER)" != "NO"
++SCP2FILES += module_scsolver.par           \
++             file_scsolver.par
++.ENDIF
++
+ .IF "$(WITH_BINFILTER)" != "NO"
+ SCP2FILES +=                               \
+              module_binfilter.par          \

Added: trunk/patches/scsolver/scsolver-setup_native.diff
==============================================================================
--- (empty file)
+++ trunk/patches/scsolver/scsolver-setup_native.diff	Mon Aug 11 04:04:13 2008
@@ -0,0 +1,23 @@
+diff --git setup_native/source/packinfo/packinfo_office.txt setup_native/source/packinfo/packinfo_office.txt
+index a13b5cf..f22d2bb 100755
+--- setup_native/source/packinfo/packinfo_office.txt
++++ setup_native/source/packinfo/packinfo_office.txt
+@@ -812,3 +812,18 @@ destpath = "/opt"
+ packageversion = "%OOOPACKAGEVERSION"
+ End
+ 
++Start
++module = "gid_Module_Optional_ScSolver"
++script = "shellscripts_extensions.txt"
++solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-scsolver"
++solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-calc"
++packagename = "%UNIXPRODUCTNAME-scsolver"
++linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-scsolver"
++requires = "%UNIXPRODUCTNAME-calc"
++freebsdrequires = "%UNIXPRODUCTNAME-calc"
++copyright = "2005-2008 by Kohei Yoshida"
++solariscopyright = "solariscopyrightfile"
++vendor = "OpenOffice.org"
++description = "Calc Solver extension for %PRODUCTNAME %PRODUCTVERSION"
++destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
++End
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]