svn commit: r1847358 - in /openoffice/trunk/main: ./ bean/ bean/com/ bean/java/ bean/java/officebean/ bean/java/officebean/src/ bean/java/officebean/src/main/ bean/java/officebean/src/main/java/ bean/java/officebean/src/main/java/com/ bean/prj/

d***@apache.org

2018-11-24 11:42:08 UTC

Author: damjan
Date: Sat Nov 24 11:42:07 2018
New Revision: 1847358

URL: http://svn.apache.org/viewvc?rev=1847358&view=rev
Log:
Port main/bean to gbuild.

Patch by: me

Added:
openoffice/trunk/main/bean/Ant_officebean.mk
openoffice/trunk/main/bean/Library_officebean.mk
openoffice/trunk/main/bean/Makefile (with props)
openoffice/trunk/main/bean/Module_bean.mk
openoffice/trunk/main/bean/java/
openoffice/trunk/main/bean/java/officebean/
openoffice/trunk/main/bean/java/officebean/build.xml (with props)
openoffice/trunk/main/bean/java/officebean/src/
openoffice/trunk/main/bean/java/officebean/src/main/
openoffice/trunk/main/bean/java/officebean/src/main/java/
openoffice/trunk/main/bean/java/officebean/src/main/java/com/
- copied from r1847357, openoffice/trunk/main/bean/com/
openoffice/trunk/main/bean/prj/makefile.mk
Removed:
openoffice/trunk/main/bean/com/
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/bean/prj/build.lst
openoffice/trunk/main/bean/prj/d.lst

Modified: openoffice/trunk/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1847358&r1=1847357&r2=1847358&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Sat Nov 24 11:42:07 2018
@@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_moduledirs,o
basebmp \
basegfx \
basic \
+ bean \
binaryurp \
canvas \
codemaker \

Modified: openoffice/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1847358&r1=1847357&r2=1847358&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Sat Nov 24 11:42:07 2018
@@ -199,6 +199,7 @@ $(eval $(call gb_Helper_register_librari
))

$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ officebean \
))

Added: openoffice/trunk/main/bean/Ant_officebean.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bean/Ant_officebean.mk?rev=1847358&view=auto
==============================================================================
--- openoffice/trunk/main/bean/Ant_officebean.mk (added)
+++ openoffice/trunk/main/bean/Ant_officebean.mk Sat Nov 24 11:42:07 2018
@@ -0,0 +1,27 @@
+#**************************************************************
+#
+# 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_Ant_Ant,officebean,$(SRCDIR)/bean/java/officebean/build.xml))
+
+# vim: set noet sw=4 ts=4:
+

Added: openoffice/trunk/main/bean/Library_officebean.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bean/Library_officebean.mk?rev=1847358&view=auto
==============================================================================
--- openoffice/trunk/main/bean/Library_officebean.mk (added)
+++ openoffice/trunk/main/bean/Library_officebean.mk Sat Nov 24 11:42:07 2018
@@ -0,0 +1,68 @@
+#**************************************************************
+#
+# 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,officebean))
+
+$(eval $(call gb_Library_set_include,officebean,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+))
+
+#$(eval $(call gb_Library_add_api,officebean, \
+# udkapi \
+# offapi \
+#))
+
+#$(eval $(call gb_Library_add_defs,officebean,\
+# -DFORMULA_DLLIMPLEMENTATION \
+#))
+
+$(eval $(call gb_Library_add_linked_libs,officebean,\
+ stl \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,officebean,\
+ sal \
+))
+endif
+
+$(eval $(call gb_Library_add_libs,officebean,\
+ $(AWTLIB) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_cobjects,officebean,\
+ bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow \
+ bean/native/win32/com_sun_star_beans_LocalOfficeWindow \
+))
+else
+$(eval $(call gb_Library_add_cobjects,officebean,\
+ bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow \
+ bean/native/unix/com_sun_star_beans_LocalOfficeWindow \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
+

Added: openoffice/trunk/main/bean/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bean/Makefile?rev=1847358&view=auto
==============================================================================
--- openoffice/trunk/main/bean/Makefile (added)
+++ openoffice/trunk/main/bean/Makefile Sat Nov 24 11:42:07 2018
@@ -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/bean/Makefile
------------------------------------------------------------------------------
svn:eol-style = native

Added: openoffice/trunk/main/bean/Module_bean.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bean/Module_bean.mk?rev=1847358&view=auto
==============================================================================
--- openoffice/trunk/main/bean/Module_bean.mk (added)
+++ openoffice/trunk/main/bean/Module_bean.mk Sat Nov 24 11:42:07 2018
@@ -0,0 +1,43 @@
+#**************************************************************
+#
+# 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,bean))
+
+$(eval $(call gb_Module_add_targets,bean,\
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,bean,\
+ Ant_officebean \
+ Library_officebean \
+))
+else ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Module_add_targets,bean,\
+ Ant_officebean \
+ Library_officebean \
+))
+endif
+
+
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/bean/java/officebean/build.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bean/java/officebean/build.xml?rev=1847358&view=auto
==============================================================================
--- openoffice/trunk/main/bean/java/officebean/build.xml (added)
+++ openoffice/trunk/main/bean/java/officebean/build.xml Sat Nov 24 11:42:07 2018
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+
+<project name="officebean" default="main" basedir=".">
+
+ <property file="../../../ant.properties"/>
+ <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
+
+ <target name="init-project">
+
+ <path id="main.classpath">
+ <pathelement location="${OUTDIR}/bin/ridl.jar"/>
+ <pathelement location="${OUTDIR}/bin/unoil.jar"/>
+ <pathelement location="${OUTDIR}/bin/jurt.jar"/>
+ <pathelement location="${OUTDIR}/bin/juh.jar"/>
+ </path>
+ </target>
+
+</project>
+

Propchange: openoffice/trunk/main/bean/java/officebean/build.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: openoffice/trunk/main/bean/java/officebean/build.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml

Modified: openoffice/trunk/main/bean/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bean/prj/build.lst?rev=1847358&r1=1847357&r2=1847358&view=diff
==============================================================================
--- openoffice/trunk/main/bean/prj/build.lst (original)
+++ openoffice/trunk/main/bean/prj/build.lst Sat Nov 24 11:42:07 2018
@@ -1,10 +1,3 @@
ob bean : javaunohelper jurt ridljar unoil offapi udkapi NULL
-ob bean\com\sun\star\comp\beans nmake - all ob_beanjava NULL
-ob bean\com\sun\star\beans nmake - all ob_legacybeanjava ob_beanjava NULL
-ob bean\native\win32 nmake - n ob_beanwin32 NULL
-ob bean\native\unix nmake - u ob_beanunix NULL
-ob bean\util nmake - all ob_util ob_beanjava ob_legacybeanjava ob_beanwin32.n ob_beanunix.u NULL
-
-# complex tests compileable but fail at runtime
-# ob bean\qa\complex\bean nmake - all ob_qa_complex ob_util NULL
+ob bean\prj nmake - all ob_prj NULL

Modified: openoffice/trunk/main/bean/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bean/prj/d.lst?rev=1847358&r1=1847357&r2=1847358&view=diff
==============================================================================
--- openoffice/trunk/main/bean/prj/d.lst (original)
+++ openoffice/trunk/main/bean/prj/d.lst Sat Nov 24 11:42:07 2018
@@ -1,5 +0,0 @@
-..\%__SRC%\class\officebean.jar %_DEST%\bin%_EXT%\officebean.jar
-
-..\%__SRC%\bin\officebean.dll %_DEST%\bin%_EXT%\officebean.dll
-..\%__SRC%\lib\libofficebean.so %_DEST%\lib%_EXT%\libofficebean.so
-..\%__SRC%\lib\*officebean.dylib %_DEST%\lib%_EXT%\*officebean.dylib

Added: openoffice/trunk/main/bean/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bean/prj/makefile.mk?rev=1847358&view=auto
==============================================================================
--- openoffice/trunk/main/bean/prj/makefile.mk (added)
+++ openoffice/trunk/main/bean/prj/makefile.mk Sat Nov 24 11:42:07 2018
@@ -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