[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - Module_ooo.mk postprocess/packcomponents RepositoryExternal.mk Repository.mk sccomp/AllLangResTarget_solver.mk sccomp/Library_solver.mk sccomp/Makefile sccomp/Module_sccomp.mk sccomp/prj sccomp/source solenv/gbuild ucb/source
Damjan Jovanovic
damjan at apache.org
Fri Jan 6 06:08:51 UTC 2017
Module_ooo.mk | 1
Repository.mk | 1
RepositoryExternal.mk | 45 ++++++++++++++
postprocess/packcomponents/makefile.mk | 2
sccomp/AllLangResTarget_solver.mk | 40 ++++++++++++
sccomp/Library_solver.mk | 53 ++++++++++++++++
sccomp/Makefile | 32 ++++++++++
sccomp/Module_sccomp.mk | 33 ++++++++++
sccomp/prj/build.lst | 4 -
sccomp/prj/d.lst | 10 ---
sccomp/prj/makefile.mk | 44 +++++++++++++
sccomp/source/solver/makefile.mk | 98 -------------------------------
sccomp/source/solver/solver.cxx | 6 -
solenv/gbuild/platform/windows.mk | 1
solenv/gbuild/platform/winmingw.mk | 1
ucb/source/ucp/webdav/webdavprovider.cxx | 10 +--
16 files changed, 259 insertions(+), 122 deletions(-)
New commits:
commit de091ad1b8abb5d4fb2d7ea1cc2a90b6c1bad236
Author: Damjan Jovanovic <damjan at apache.org>
Date: Fri Jan 6 04:38:43 2017 +0000
Ubuntu 14.04 apparently isn't happen with implicit int -> sal_In32 and
wchar_t -> sal_Unicode conversions, so do them explicitly.
Patch by: me
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index 4b5f3c0..445989f 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -62,11 +62,11 @@ rtl::OUString &WebDAVUserAgent::operator()() const
int major, minor, patch;
serf_lib_version(&major, &minor, &patch);
aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( " serf/" ) );
- aBuffer.append(major);
- aBuffer.append( L'.' );
- aBuffer.append(minor);
- aBuffer.append( L'.' );
- aBuffer.append(patch);
+ aBuffer.append( sal_Int32 ( major ) );
+ aBuffer.append( sal_Unicode( L'.' ) );
+ aBuffer.append( sal_Int32 ( minor ) );
+ aBuffer.append( sal_Unicode( L'.' ) );
+ aBuffer.append( sal_Int32 ( patch ) );
#endif
static rtl::OUString aUserAgent( aBuffer.makeStringAndClear() );
return aUserAgent;
commit f371d243a59ba61e1cb282c2f9363adac52a188e
Author: Damjan Jovanovic <damjan at apache.org>
Date: Fri Jan 6 04:15:08 2017 +0000
Add ws2_32 to the list of known DLLs.
Patch by: me
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 5a04f33..8001f21 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -465,6 +465,7 @@ gb_Library_PLAINLIBS_NONE += \
uwinapi \
winmm \
winspool \
+ ws2_32 \
wsock32
gb_Library_LAYER := \
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 088659c..e90a616 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -486,6 +486,7 @@ gb_Library_PLAINLIBS_NONE += \
uwinapi \
winmm \
winspool \
+ ws2_32 \
wsock32
gb_Library_LAYER := \
commit 2ddbf071356df6dba6954b8c0540793611a60560
Author: Damjan Jovanovic <damjan at apache.org>
Date: Fri Jan 6 00:48:17 2017 +0000
Port main/sccomp to gbuild.
Fix the include paths for CoinMP.
Add CoinMP to RepositoryExternal.mk.
Patch by: me
diff --git a/Module_ooo.mk b/Module_ooo.mk
index ecebf7b..32419a1 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -62,6 +62,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
reportdesign \
remotebridges \
sax \
+ sccomp \
sd \
sfx2 \
slideshow \
diff --git a/Repository.mk b/Repository.mk
index 3dc50ea..fd256ba 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -111,6 +111,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
simplecm \
sm \
smd \
+ solver \
sot \
spa \
sts \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0196868..a4a0b6a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -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:
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index a6171a0..a444660 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -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)" == ""
diff --git a/sccomp/AllLangResTarget_solver.mk b/sccomp/AllLangResTarget_solver.mk
new file mode 100644
index 0000000..4e55e64
--- /dev/null
+++ b/sccomp/AllLangResTarget_solver.mk
@@ -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 \
+))
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
new file mode 100644
index 0000000..1dc3ba1
--- /dev/null
+++ b/sccomp/Library_solver.mk
@@ -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:
diff --git a/sccomp/Makefile b/sccomp/Makefile
new file mode 100644
index 0000000..c1d144c
--- /dev/null
+++ b/sccomp/Makefile
@@ -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:
diff --git a/sccomp/Module_sccomp.mk b/sccomp/Module_sccomp.mk
new file mode 100644
index 0000000..f8e0a5a
--- /dev/null
+++ b/sccomp/Module_sccomp.mk
@@ -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:
diff --git a/sccomp/prj/build.lst b/sccomp/prj/build.lst
index 29ac874..e47c7a6 100644
--- a/sccomp/prj/build.lst
+++ b/sccomp/prj/build.lst
@@ -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
diff --git a/sccomp/prj/d.lst b/sccomp/prj/d.lst
index 2af1e70..e69de29 100644
--- a/sccomp/prj/d.lst
+++ b/sccomp/prj/d.lst
@@ -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
diff --git a/sccomp/prj/makefile.mk b/sccomp/prj/makefile.mk
new file mode 100644
index 0000000..c62c6a6
--- /dev/null
+++ b/sccomp/prj/makefile.mk
@@ -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
diff --git a/sccomp/source/solver/makefile.mk b/sccomp/source/solver/makefile.mk
deleted file mode 100644
index e0c8870..0000000
--- a/sccomp/source/solver/makefile.mk
+++ /dev/null
@@ -1,98 +0,0 @@
-#**************************************************************
-#
-# 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=..$/..
-PRJNAME=sccomp
-TARGET=solver
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-USE_DEFFILE=TRUE
-LIBTARGET=NO
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files -------------------------------------
-
-.IF "$(ENABLE_COINMP)"=="NO"
-
-dummy:
- @echo "Nothing to build (CoinMP is disabled)"
-
-.ELSE
-
-SLOFILES=$(SLO)$/solver.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES=solver.src
-
-# --- Library -----------------------------------
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-
-SHL1OBJS= $(SLOFILES)
-
-SHL1STDLIBS= $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB) \
- $(TOOLSLIB)
-
-SHL1DEPN= makefile.mk
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-SHL1VERSIONMAP= $(SOLARENV)/src/component.map
-DEF1NAME= $(SHL1TARGET)
-
-.IF "$(SYSTEM_COINMP)" == "YES"
-CFLAGS+= $(COINMP_CFLAGS) -DSYSTEM_COINMP
-# Use the library flags from configure
-SHL1STDLIBS+=$(COINMP_LIBS)
-.ELSE
-# Use the library flags from solenv
-SHL1STDLIBS+=$(COINMPLIBS)
-.ENDIF
-
-# --- Resources --------------------------------
-
-RESLIB1LIST=$(SRS)$/solver.srs
-
-RESLIB1NAME=solver
-RESLIB1SRSFILES=$(RESLIB1LIST)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-
-ALLTAR : $(MISC)/solver.component
-
-$(MISC)/solver.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- solver.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt solver.component
-
-.ENDIF
diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index 496edcd..15d97af 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -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"
More information about the Libreoffice-commits
mailing list