openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1777528 - in /openoffice/trunk/main: ./ postprocess/packcomponents/ sccomp/ sccomp/prj/ sccomp/source/solver/
Date Fri, 06 Jan 2017 00:48:17 GMT
Author: damjan
Date: Fri Jan  6 00:48:17 2017
New Revision: 1777528

URL: http://svn.apache.org/viewvc?rev=1777528&view=rev
Log:
Port main/sccomp to gbuild.
Fix the include paths for CoinMP.
Add CoinMP to RepositoryExternal.mk.

Patch by: me

Added:
    openoffice/trunk/main/sccomp/AllLangResTarget_solver.mk
    openoffice/trunk/main/sccomp/Library_solver.mk
    openoffice/trunk/main/sccomp/Makefile   (with props)
    openoffice/trunk/main/sccomp/Module_sccomp.mk
    openoffice/trunk/main/sccomp/prj/makefile.mk
Removed:
    openoffice/trunk/main/sccomp/source/solver/makefile.mk
Modified:
    openoffice/trunk/main/Module_ooo.mk
    openoffice/trunk/main/Repository.mk
    openoffice/trunk/main/RepositoryExternal.mk
    openoffice/trunk/main/postprocess/packcomponents/makefile.mk
    openoffice/trunk/main/sccomp/prj/build.lst
    openoffice/trunk/main/sccomp/prj/d.lst
    openoffice/trunk/main/sccomp/source/solver/solver.cxx

Modified: openoffice/trunk/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1777528&r1=1777527&r2=1777528&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Fri Jan  6 00:48:17 2017
@@ -62,6 +62,7 @@ $(eval $(call gb_Module_add_moduledirs,o
 	reportdesign \
 	remotebridges \
 	sax \
+	sccomp \
 	sd \
 	sfx2 \
 	slideshow \

Modified: openoffice/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1777528&r1=1777527&r2=1777528&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Fri Jan  6 00:48:17 2017
@@ -111,6 +111,7 @@ $(eval $(call gb_Helper_register_librari
 	simplecm \
 	sm \
 	smd \
+	solver \
 	sot \
 	spa \
 	sts \

Modified: openoffice/trunk/main/RepositoryExternal.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryExternal.mk?rev=1777528&r1=1777527&r2=1777528&view=diff
==============================================================================
--- openoffice/trunk/main/RepositoryExternal.mk (original)
+++ openoffice/trunk/main/RepositoryExternal.mk Fri Jan  6 00:48:17 2017
@@ -486,4 +486,49 @@ endef
 endif # SYSTEM_CURL
 
 
+ifeq ($(SYSTEM_COINMP),YES)
+
+define gb_LinkTarget__use_coinmp
+$(call gb_LinkTarget_add_defs,$(1),\
+	-DSYSTEM_COINMP \
+)
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(COINMP_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(COINMP_LIBS))
+endef
+
+else # !SYSTEM_COINMP
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	CoinMP \
+	CoinUtils \
+	Clp \
+	Cbc \
+	Osi \
+	OsiClp \
+	Cgl \
+	CbcSolver \
+))
+
+define gb_LinkTarget__use_coinmp
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc/coinmp \
+)
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	CoinMP \
+	CoinUtils \
+	Clp \
+	Cbc \
+	Osi \
+	OsiClp \
+	Cgl \
+	CbcSolver \
+)
+endef
+
+endif # SYSTEM_COINMP
+
 # vim: set noet sw=4 ts=4:

Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1777528&r1=1777527&r2=1777528&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Fri Jan  6 00:48:17 2017
@@ -219,7 +219,7 @@ my_components += oooimprovement
 .END
 
 .IF "$(ENABLE_COINMP)"=="YES"
-my_components += solver
+my_components += component/sccomp/source/solver/solver
 .END
 
 .IF "$(DISABLE_SAXON)" == ""

Added: openoffice/trunk/main/sccomp/AllLangResTarget_solver.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sccomp/AllLangResTarget_solver.mk?rev=1777528&view=auto
==============================================================================
--- openoffice/trunk/main/sccomp/AllLangResTarget_solver.mk (added)
+++ openoffice/trunk/main/sccomp/AllLangResTarget_solver.mk Fri Jan  6 00:48:17 2017
@@ -0,0 +1,40 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,solver))
+
+$(eval $(call gb_AllLangResTarget_add_srs,solver,\
+	solver/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,solver/res))
+
+$(eval $(call gb_SrsTarget_set_include,solver/res,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc \
+	-I$(SRCDIR)/sccomp/source/solver \
+))
+
+$(eval $(call gb_SrsTarget_add_files,solver/res,\
+	sccomp/source/solver/solver.src \
+))

Added: openoffice/trunk/main/sccomp/Library_solver.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sccomp/Library_solver.mk?rev=1777528&view=auto
==============================================================================
--- openoffice/trunk/main/sccomp/Library_solver.mk (added)
+++ openoffice/trunk/main/sccomp/Library_solver.mk Fri Jan  6 00:48:17 2017
@@ -0,0 +1,53 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,solver))
+
+$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/solver))
+
+$(eval $(call gb_Library_set_include,solver,\
+        $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_api,solver,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,solver,\
+	comphelper \
+	cppuhelper \
+	cppu \
+	sal \
+	stl \
+	tl \
+	$(gb_STDLIBS) \
+))
+
+$(call gb_Library_use_external,solver,coinmp)
+
+$(eval $(call gb_Library_add_exception_objects,solver,\
+	sccomp/source/solver/solver \
+))
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/sccomp/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sccomp/Makefile?rev=1777528&view=auto
==============================================================================
--- openoffice/trunk/main/sccomp/Makefile (added)
+++ openoffice/trunk/main/sccomp/Makefile Fri Jan  6 00:48:17 2017
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:

Propchange: openoffice/trunk/main/sccomp/Makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Added: openoffice/trunk/main/sccomp/Module_sccomp.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sccomp/Module_sccomp.mk?rev=1777528&view=auto
==============================================================================
--- openoffice/trunk/main/sccomp/Module_sccomp.mk (added)
+++ openoffice/trunk/main/sccomp/Module_sccomp.mk Fri Jan  6 00:48:17 2017
@@ -0,0 +1,33 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,sccomp))
+
+ifeq ($(ENABLE_COINMP),YES)
+$(eval $(call gb_Module_add_targets,sccomp,\
+	AllLangResTarget_solver \
+	Library_solver \
+))
+endif
+
+# vim: set noet sw=4 ts=4:

Modified: openoffice/trunk/main/sccomp/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sccomp/prj/build.lst?rev=1777528&r1=1777527&r2=1777528&view=diff
==============================================================================
--- openoffice/trunk/main/sccomp/prj/build.lst (original)
+++ openoffice/trunk/main/sccomp/prj/build.lst Fri Jan  6 00:48:17 2017
@@ -1,4 +1,2 @@
 scc	sccomp	:    L10N:l10n offapi 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
+scc	sccomp\prj								nmake		-	all	scc_prj NULL

Modified: openoffice/trunk/main/sccomp/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sccomp/prj/d.lst?rev=1777528&r1=1777527&r2=1777528&view=diff
==============================================================================
--- openoffice/trunk/main/sccomp/prj/d.lst (original)
+++ openoffice/trunk/main/sccomp/prj/d.lst Fri Jan  6 00:48:17 2017
@@ -1,10 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\misc\solver.component %_DEST%\xml%_EXT%\solver.component

Added: openoffice/trunk/main/sccomp/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sccomp/prj/makefile.mk?rev=1777528&view=auto
==============================================================================
--- openoffice/trunk/main/sccomp/prj/makefile.mk (added)
+++ openoffice/trunk/main/sccomp/prj/makefile.mk Fri Jan  6 00:48:17 2017
@@ -0,0 +1,44 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT)
&& $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Modified: openoffice/trunk/main/sccomp/source/solver/solver.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sccomp/source/solver/solver.cxx?rev=1777528&r1=1777527&r2=1777528&view=diff
==============================================================================
--- openoffice/trunk/main/sccomp/source/solver/solver.cxx (original)
+++ openoffice/trunk/main/sccomp/source/solver/solver.cxx Fri Jan  6 00:48:17 2017
@@ -20,11 +20,7 @@
  *************************************************************/
 
 
-#ifdef SYSTEM_COINMP
-#include <coin/CoinMP.h>
-#else
-#include <coinmp/CoinMP.h>
-#endif
+#include <CoinMP.h>
 
 #include "solver.hxx"
 #include "solver.hrc"



Mime
View raw message