Author: damjan
Date: Thu Sep 24 14:37:53 2015
New Revision: 1705072
URL: http://svn.apache.org/viewvc?rev=1705072&view=rev
Log:
Migrate main/formula from dmake to gbuild.
Added:
openoffice/trunk/main/formula/AllLangResTarget_for.mk
openoffice/trunk/main/formula/AllLangResTarget_forui.mk
openoffice/trunk/main/formula/Library_for.mk
openoffice/trunk/main/formula/Library_forui.mk
openoffice/trunk/main/formula/Makefile (with props)
openoffice/trunk/main/formula/Module_formula.mk
openoffice/trunk/main/formula/Package_inc.mk
openoffice/trunk/main/formula/prj/makefile.mk
Removed:
openoffice/trunk/main/formula/inc/makefile.mk
openoffice/trunk/main/formula/source/core/api/makefile.mk
openoffice/trunk/main/formula/source/core/resource/makefile.mk
openoffice/trunk/main/formula/source/ui/dlg/makefile.mk
openoffice/trunk/main/formula/source/ui/resource/makefile.mk
openoffice/trunk/main/formula/util/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/formula/prj/build.lst
openoffice/trunk/main/formula/prj/d.lst
openoffice/trunk/main/formula/source/ui/resource/ModuleHelper.cxx
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1705072&r1=1705071&r2=1705072&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Thu Sep 24 14:37:53 2015
@@ -42,6 +42,7 @@ $(eval $(call gb_Module_add_moduledirs,o
unoxml \
xmloff \
vbahelper \
+ formula \
))
# vim: set noet ts=4 sw=4:
Modified: openoffice/trunk/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1705072&r1=1705071&r2=1705072&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Thu Sep 24 14:37:53 2015
@@ -50,6 +50,8 @@ $(eval $(call gb_Helper_register_librari
drawinglayer \
svgio \
editeng \
+ for \
+ forui \
fwe \
fwi \
fwk \
Added: openoffice/trunk/main/formula/AllLangResTarget_for.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/formula/AllLangResTarget_for.mk?rev=1705072&view=auto
==============================================================================
--- openoffice/trunk/main/formula/AllLangResTarget_for.mk (added)
+++ openoffice/trunk/main/formula/AllLangResTarget_for.mk Thu Sep 24 14:37:53
2015
@@ -0,0 +1,45 @@
+#**************************************************************
+#
+# 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,for))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,for,formula))
+
+$(eval $(call gb_AllLangResTarget_add_srs,for,\
+ for/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,for/res))
+
+$(eval $(call gb_SrsTarget_set_include,for/res,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+ -I$(WORKDIR)/inc/formula \
+ -I$(SRCDIR)/formula/source/core/inc \
+ -I$(SRCDIR)/formula/source/core/api \
+ -I$(SRCDIR)/formula/source/core/resource \
+))
+
+$(eval $(call gb_SrsTarget_add_files,for/res,\
+ formula/source/core/resource/core_resource.src \
+))
Added: openoffice/trunk/main/formula/AllLangResTarget_forui.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/formula/AllLangResTarget_forui.mk?rev=1705072&view=auto
==============================================================================
--- openoffice/trunk/main/formula/AllLangResTarget_forui.mk (added)
+++ openoffice/trunk/main/formula/AllLangResTarget_forui.mk Thu Sep 24 14:37:53
2015
@@ -0,0 +1,48 @@
+#**************************************************************
+#
+# 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,forui))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,forui,formula))
+
+$(eval $(call gb_AllLangResTarget_add_srs,forui,\
+ forui/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,forui/res))
+
+$(eval $(call gb_SrsTarget_set_include,forui/res,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+ -I$(WORKDIR)/inc/formula \
+ -I$(SRCDIR)/formula/inc \
+ -I$(SRCDIR)/formula/inc/formula \
+ -I$(SRCDIR)/formula/source/ui/inc \
+ -I$(SRCDIR)/formula/source/ui/dlg \
+ -I$(SRCDIR)/formula/source/ui/resource \
+))
+
+$(eval $(call gb_SrsTarget_add_files,forui/res,\
+ formula/source/ui/dlg/formdlgs.src \
+ formula/source/ui/dlg/parawin.src \
+))
Added: openoffice/trunk/main/formula/Library_for.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/formula/Library_for.mk?rev=1705072&view=auto
==============================================================================
--- openoffice/trunk/main/formula/Library_for.mk (added)
+++ openoffice/trunk/main/formula/Library_for.mk Thu Sep 24 14:37:53 2015
@@ -0,0 +1,69 @@
+#**************************************************************
+#
+# 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,for))
+
+$(eval $(call gb_Library_add_package_headers,for,formula_inc))
+
+$(eval $(call
gb_Library_add_precompiled_header,for,$(SRCDIR)/formula/inc/pch/precompiled_formula))
+
+$(eval $(call gb_Library_set_componentfile,for,formula/util/for))
+
+$(eval $(call gb_Library_set_include,for,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/formula/inc \
+ -I$(SRCDIR)/formula/inc/pch \
+ -I$(SRCDIR)/formula/source/core/inc \
+ -I$(OUTDIR)/inc \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,for,\
+ $$(DEFS) \
+ -DFORMULA_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,for,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ stl \
+ svl \
+ svt \
+ tl \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,for,\
+ formula/source/core/api/FormulaCompiler \
+ formula/source/core/api/FormulaOpCodeMapperObj \
+ formula/source/core/api/services \
+ formula/source/core/api/token \
+ formula/source/core/resource/core_resource \
+))
+
+# vim: set noet sw=4 ts=4:
+
Added: openoffice/trunk/main/formula/Library_forui.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/formula/Library_forui.mk?rev=1705072&view=auto
==============================================================================
--- openoffice/trunk/main/formula/Library_forui.mk (added)
+++ openoffice/trunk/main/formula/Library_forui.mk Thu Sep 24 14:37:53 2015
@@ -0,0 +1,70 @@
+#**************************************************************
+#
+# 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,forui))
+
+$(eval $(call gb_Library_add_package_headers,forui,formula_inc))
+
+$(eval $(call
gb_Library_add_precompiled_header,forui,$(SRCDIR)/formula/inc/pch/precompiled_formula))
+
+$(eval $(call gb_Library_set_include,forui,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/formula/inc \
+ -I$(SRCDIR)/formula/inc/pch \
+ -I$(SRCDIR)/formula/source/ui/inc \
+ -I$(OUTDIR)/inc \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,forui,\
+ $$(DEFS) \
+ -DFORMULA_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,forui,\
+ cppu \
+ cppuhelper \
+ for \
+ sal \
+ sfx \
+ stl \
+ svl \
+ svt \
+ tl \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,forui,\
+ formula/source/ui/dlg/formula \
+ formula/source/ui/dlg/FormulaHelper \
+ formula/source/ui/dlg/parawin \
+ formula/source/ui/dlg/funcutl \
+ formula/source/ui/dlg/funcpage \
+ formula/source/ui/dlg/structpg \
+ formula/source/ui/resource/ModuleHelper \
+))
+
+# vim: set noet sw=4 ts=4:
+
Added: openoffice/trunk/main/formula/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/formula/Makefile?rev=1705072&view=auto
==============================================================================
--- openoffice/trunk/main/formula/Makefile (added)
+++ openoffice/trunk/main/formula/Makefile Thu Sep 24 14:37:53 2015
@@ -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/formula/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/formula/Module_formula.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/formula/Module_formula.mk?rev=1705072&view=auto
==============================================================================
--- openoffice/trunk/main/formula/Module_formula.mk (added)
+++ openoffice/trunk/main/formula/Module_formula.mk Thu Sep 24 14:37:53 2015
@@ -0,0 +1,35 @@
+#**************************************************************
+#
+# 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,formula))
+
+$(eval $(call gb_Module_add_targets,formula,\
+ AllLangResTarget_for \
+ AllLangResTarget_forui \
+ Library_for \
+ Library_forui \
+ Package_inc \
+))
+
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/formula/Package_inc.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/formula/Package_inc.mk?rev=1705072&view=auto
==============================================================================
--- openoffice/trunk/main/formula/Package_inc.mk (added)
+++ openoffice/trunk/main/formula/Package_inc.mk Thu Sep 24 14:37:53 2015
@@ -0,0 +1,41 @@
+#**************************************************************
+#
+# 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_Package_Package,formula_inc,$(SRCDIR)/formula/inc))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/ExternalReferenceHelper.hxx,formula/ExternalReferenceHelper.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/FormulaCompiler.hxx,formula/FormulaCompiler.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/FormulaOpCodeMapperObj.hxx,formula/FormulaOpCodeMapperObj.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/IControlReferenceHandler.hxx,formula/IControlReferenceHandler.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/IFunctionDescription.hxx,formula/IFunctionDescription.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/compiler.hrc,formula/compiler.hrc))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/errorcodes.hxx,formula/errorcodes.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/formdata.hxx,formula/formdata.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/formula.hxx,formula/formula.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/formuladllapi.h,formula/formuladllapi.h))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/formulahelper.hxx,formula/formulahelper.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/funcutl.hxx,formula/funcutl.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/grammar.hxx,formula/grammar.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/intruref.hxx,formula/intruref.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/opcode.hxx,formula/opcode.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/token.hxx,formula/token.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/tokenarray.hxx,formula/tokenarray.hxx))
Modified: openoffice/trunk/main/formula/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/formula/prj/build.lst?rev=1705072&r1=1705071&r2=1705072&view=diff
==============================================================================
--- openoffice/trunk/main/formula/prj/build.lst (original)
+++ openoffice/trunk/main/formula/prj/build.lst Thu Sep 24 14:37:53 2015
@@ -1,9 +1,2 @@
fml formula : BOOST:boost LIBXSLT:libxslt comphelper svx NULL
-fml formula usr1 -
all fml_mkout NULL
-fml formula\inc nmake -
all fml_inc NULL
-fml formula\source\core\api nmake -
all fml_api fml_inc NULL
-fml formula\source\core\resource nmake -
all fml_core_res fml_inc NULL
-fml formula\source\ui\resource nmake -
all fml_ui_res fml_inc NULL
-fml formula\source\ui\dlg nmake -
all fml_uidlg fml_inc NULL
-fml formula\util nmake -
all fml_util fml_uidlg fml_core_res fml_ui_res fml_api NULL
-
+fml formula\prj nmake -
all fml_prj NULL
Modified: openoffice/trunk/main/formula/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/formula/prj/d.lst?rev=1705072&r1=1705071&r2=1705072&view=diff
==============================================================================
--- openoffice/trunk/main/formula/prj/d.lst (original)
+++ openoffice/trunk/main/formula/prj/d.lst Thu Sep 24 14:37:53 2015
@@ -1,39 +0,0 @@
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-
-dos: sh -c "if test %OS% = MACOSX; then create-bundle
%_DEST%\lib%_EXT%\*.dylib; fi"
-
-# Libraries
-..\%__SRC%\bin\for*.dll %_DEST%\bin%_EXT%\for*.dll
-..\%__SRC%\lib\libfor*.so %_DEST%\lib%_EXT%\libfor*.so
-..\%__SRC%\lib\ifor*.lib %_DEST%\lib%_EXT%\ifor*.lib
-..\%__SRC%\lib\for*.lib %_DEST%\lib%_EXT%\for*.lib
-..\%__SRC%\lib\libfor*.dylib %_DEST%\lib%_EXT%\libfor*.dylib
-
-# Resources
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-
-mkdir: %_DEST%\inc%_EXT%\formula
-..\inc\formula\formdata.hxx %_DEST%\inc%_EXT%\formula\formdata.hxx
-..\inc\formula\formula.hxx %_DEST%\inc%_EXT%\formula\formula.hxx
-..\inc\formula\formulahelper.hxx %_DEST%\inc%_EXT%\formula\formulahelper.hxx
-..\inc\formula\funcutl.hxx %_DEST%\inc%_EXT%\formula\funcutl.hxx
-..\inc\formula\IControlReferenceHandler.hxx
%_DEST%\inc%_EXT%\formula\IControlReferenceHandler.hxx
-..\inc\formula\IFunctionDescription.hxx
%_DEST%\inc%_EXT%\formula\IFunctionDescription.hxx
-..\inc\formula\ExternalReferenceHelper.hxx
%_DEST%\inc%_EXT%\formula\ExternalReferenceHelper.hxx
-..\inc\formula\formuladllapi.h %_DEST%\inc%_EXT%\formula\formuladllapi.h
-..\inc\formula\opcode.hxx %_DEST%\inc%_EXT%\formula\opcode.hxx
-..\inc\formula\grammar.hxx %_DEST%\inc%_EXT%\formula\grammar.hxx
-..\inc\formula\FormulaCompiler.hxx
%_DEST%\inc%_EXT%\formula\FormulaCompiler.hxx
-..\inc\formula\FormulaOpCodeMapperObj.hxx
%_DEST%\inc%_EXT%\formula\FormulaOpCodeMapperObj.hxx
-..\inc\formula\compiler.hrc %_DEST%\inc%_EXT%\formula\compiler.hrc
-..\inc\formula\token.hxx %_DEST%\inc%_EXT%\formula\token.hxx
-..\inc\formula\tokenarray.hxx %_DEST%\inc%_EXT%\formula\tokenarray.hxx
-..\inc\formula\errorcodes.hxx %_DEST%\inc%_EXT%\formula\errorcodes.hxx
-..\inc\formula\intruref.hxx %_DEST%\inc%_EXT%\formula\intruref.hxx
-
-
-
-
-
-..\%__SRC%\misc\for.component %_DEST%\xml%_EXT%\for.component
Added: openoffice/trunk/main/formula/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/formula/prj/makefile.mk?rev=1705072&view=auto
==============================================================================
--- openoffice/trunk/main/formula/prj/makefile.mk (added)
+++ openoffice/trunk/main/formula/prj/makefile.mk Thu Sep 24 14:37:53 2015
@@ -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/formula/source/ui/resource/ModuleHelper.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/formula/source/ui/resource/ModuleHelper.cxx?rev=1705072&r1=1705071&r2=1705072&view=diff
==============================================================================
--- openoffice/trunk/main/formula/source/ui/resource/ModuleHelper.cxx (original)
+++ openoffice/trunk/main/formula/source/ui/resource/ModuleHelper.cxx Thu Sep
24 14:37:53 2015
@@ -20,6 +20,7 @@
*************************************************************/
+#include "precompiled_formula.hxx"
#include "ModuleHelper.hxx"
#include <comphelper/configurationhelper.hxx>
#include <comphelper/processfactory.hxx>
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1705072&r1=1705071&r2=1705072&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Thu Sep 24
14:37:53 2015
@@ -71,6 +71,7 @@ my_components = \
component/comphelper/util/comphelp \
component/cui/util/cui \
component/drawinglayer/drawinglayer \
+ component/formula/util/for \
component/framework/util/fwk \
component/framework/util/fwl \
component/framework/util/fwm \
@@ -116,7 +117,6 @@ my_components = \
filterconfig1 \
flash \
flat \
- for \
fpicker \
fps_office \
frm \
