[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - i18npool/Library_localedata_en.mk Module_ooo.mk ure/Makefile ure/Module_ure.mk ure/Package_services_rdb.mk ure/Package_ure.mk ure/Package_uretest_zip.mk ure/prj ure/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Feb 9 17:08:21 UTC 2019
Module_ooo.mk | 1
i18npool/Library_localedata_en.mk | 6 ++---
ure/Makefile | 32 +++++++++++++++++++++++++++
ure/Module_ure.mk | 33 ++++++++++++++++++++++++++++
ure/Package_services_rdb.mk | 35 ++++++++++++++++++++++++++++++
ure/Package_ure.mk | 30 +++++++++++++++++++++++++
ure/Package_uretest_zip.mk | 29 +++++++++++++++++++++++++
ure/prj/build.lst | 2 -
ure/prj/d.lst | 10 --------
ure/prj/makefile.mk | 44 ++++++++++++++++++++++++++++++++++++++
ure/source/services.input | 41 +++++++++++++++++++++++++++++++++++
11 files changed, 249 insertions(+), 14 deletions(-)
New commits:
commit 3576a2b554fb699e7752c9c7bf6e48c8adad31d6
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sat Feb 9 16:02:33 2019 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Sat Feb 9 16:02:33 2019 +0000
Port main/ure to gbuild.
Patch by: me
diff --git a/Module_ooo.mk b/Module_ooo.mk
index ac0723ea1c6a..77b30275d797 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -109,6 +109,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
unodevtools \
unotools \
unoxml \
+ ure \
uui \
vbahelper \
vcl \
diff --git a/ure/Makefile b/ure/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/ure/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/ure/Module_ure.mk b/ure/Module_ure.mk
new file mode 100644
index 000000000000..ac93aea828a4
--- /dev/null
+++ b/ure/Module_ure.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,ure))
+
+$(eval $(call gb_Module_add_targets,ure,\
+ Package_services_rdb \
+ Package_ure \
+ Package_uretest_zip \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/ure/Package_services_rdb.mk b/ure/Package_services_rdb.mk
new file mode 100644
index 000000000000..f1cee1be0e63
--- /dev/null
+++ b/ure/Package_services_rdb.mk
@@ -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_Package_Package,ure_services_rdb,$(WORKDIR)/CustomTarget/ure/source))
+
+$(eval $(call gb_Package_add_file,ure_services_rdb,xml/ure/services.rdb,services.rdb))
+
+$(WORKDIR)/CustomTarget/ure/source/services.rdb : \
+ $(SRCDIR)/ure/source/services.input \
+ $(SOLARENV)/bin/packcomponents.xslt
+ mkdir -p $(dir $@) && \
+ $(gb_XSLTPROC) \
+ --nonet \
+ --stringparam prefix $(call gb_Helper_convert_native,$(OUTDIR)/xml/) \
+ -o $(call gb_Helper_convert_native,$@) \
+ $(call gb_Helper_convert_native,$(SOLARENV)/bin/packcomponents.xslt) \
+ $(call gb_Helper_convert_native,$(SRCDIR)/ure/source/services.input)
diff --git a/ure/Package_ure.mk b/ure/Package_ure.mk
new file mode 100644
index 000000000000..63af8fe8b20b
--- /dev/null
+++ b/ure/Package_ure.mk
@@ -0,0 +1,30 @@
+#**************************************************************
+#
+# 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,ure_ure,$(SRCDIR)/ure/source))
+
+$(eval $(call gb_Package_add_file,ure_ure,bin/ure/README,README))
+$(eval $(call gb_Package_add_file,ure_ure,bin/ure/jvmfwk3.ini,jvmfwk3.ini))
+$(eval $(call gb_Package_add_file,ure_ure,bin/ure/jvmfwk3rc,jvmfwk3rc))
+$(eval $(call gb_Package_add_file,ure_ure,bin/ure/startup.sh,startup.sh))
+$(eval $(call gb_Package_add_file,ure_ure,bin/ure/uno.ini,uno.ini))
+$(eval $(call gb_Package_add_file,ure_ure,bin/ure/unorc,unorc))
+
diff --git a/ure/Package_uretest_zip.mk b/ure/Package_uretest_zip.mk
new file mode 100644
index 000000000000..7e86ba80f27b
--- /dev/null
+++ b/ure/Package_uretest_zip.mk
@@ -0,0 +1,29 @@
+#**************************************************************
+#
+# 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,ure_uretest_zip,$(WORKDIR)/CustomTarget/ure/source))
+
+$(eval $(call gb_Package_add_file,ure_uretest_zip,bin/uretest.zip,uretest.zip))
+
+$(WORKDIR)/CustomTarget/ure/source/uretest.zip : $(wildcard $(SRCDIR)/ure/source/uretest/*)
+ mkdir -p $(dir $@) && \
+ cd $(SRCDIR)/ure/source && \
+ zip -r $@ uretest
diff --git a/ure/prj/build.lst b/ure/prj/build.lst
index 7618bf3299b7..57ce50deb981 100644
--- a/ure/prj/build.lst
+++ b/ure/prj/build.lst
@@ -1,2 +1,2 @@
ur ure : LIBXSLT:libxslt binaryurp cli_ure io javaunohelper remotebridges solenv stoc NULL
-ur ure\source nmake - all ur_source NULL
+ur ure\prj nmake - all ur_prj NULL
diff --git a/ure/prj/d.lst b/ure/prj/d.lst
index 1703431ad8e1..e69de29bb2d1 100644
--- a/ure/prj/d.lst
+++ b/ure/prj/d.lst
@@ -1,10 +0,0 @@
-mkdir: %_DEST%\bin%_EXT%\ure
-mkdir: %_DEST%\xml%_EXT%\ure
-..\%__SRC%\bin\uretest.zip %COMMON_DEST%\bin%_EXT%\uretest.zip
-..\%__SRC%\misc\services.rdb %_DEST%\xml%_EXT%\ure\services.rdb
-..\source\README %_DEST%\bin%_EXT%\ure\README
-..\source\jvmfwk3.ini %_DEST%\bin%_EXT%\ure\jvmfwk3.ini
-..\source\jvmfwk3rc %_DEST%\bin%_EXT%\ure\jvmfwk3rc
-..\source\startup.sh %_DEST%\bin%_EXT%\ure\startup.sh
-..\source\uno.ini %_DEST%\bin%_EXT%\ure\uno.ini
-..\source\unorc %_DEST%\bin%_EXT%\ure\unorc
diff --git a/ure/prj/makefile.mk b/ure/prj/makefile.mk
new file mode 100644
index 000000000000..c62c6a657d16
--- /dev/null
+++ b/ure/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/ure/source/services.input b/ure/source/services.input
new file mode 100644
index 000000000000..abe8bc567914
--- /dev/null
+++ b/ure/source/services.input
@@ -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.
+ *
+ ***********************************************************-->
+
+<list>
+ <filename>component/binaryurp/source/binaryurp.component</filename>
+ <filename>component/io/source/acceptor/acceptor.component</filename>
+ <filename>bootstrap.component</filename>
+ <filename>component/io/source/connector/connector.component</filename>
+ <filename>introspection.component</filename>
+ <filename>invocadapt.component</filename>
+ <filename>invocation.component</filename>
+ <filename>javaloader.component</filename>
+ <filename>javavm.component</filename>
+ <filename>component/javaunohelper/util/juh.component</filename>
+ <filename>namingservice.component</filename>
+ <filename>proxyfac.component</filename>
+ <filename>reflection.component</filename>
+ <filename>stocservices.component</filename>
+ <filename>component/io/source/stm/streams.component</filename>
+ <filename>component/io/source/TextInputStream/textinstream.component</filename>
+ <filename>component/io/source/TextOutputStream/textoutstream.component</filename>
+ <filename>component/remotebridges/source/unourl_resolver/uuresolver.component</filename>
+</list>
commit 50f11e18db273584888d15df21c3184fdd0873af
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sat Feb 9 15:59:48 2019 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Sat Feb 9 15:59:48 2019 +0000
Allow handling multiple components like dmake did.
Patch by: me
diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk
index 33256dfeac15..867b39233838 100644
--- a/i18npool/Library_localedata_en.mk
+++ b/i18npool/Library_localedata_en.mk
@@ -79,12 +79,12 @@ $(WORKDIR)/CustomTarget/i18npool/source/localedata/data/localedata_%.cxx : $(SRC
$(call gb_Helper_convert_native,$(OUTDIR)/bin/types.rdb) \
-env:OOO_INBUILD_SHAREDLIB_DIR=$(URL_PROTOCOL)$(call gb_Helper_convert_native,$(gb_InBuild_Library_Path))
-MY_COMPONENT := sax/source/expatwrap/expwrap
+MY_COMPONENTS := component/sax/source/expatwrap/expwrap
$(WORKDIR)/CustomTarget/i18npool/source/localedata/data/saxparser.rdb : \
$(WORKDIR)/CustomTarget/i18npool/source/localedata/data/saxparser.input \
$(SOLARENV)/bin/packcomponents.xslt \
- $(call gb_ComponentTarget_get_outdir_inbuild_target,$(MY_COMPONENT))
+ $(foreach component,$(MY_COMPONENTS),$(OUTDIR)/xml/$(component).inbuild.component)
$(gb_XSLTPROC) \
--nonet \
--stringparam prefix $(call gb_Helper_convert_native,$(OUTDIR)/xml/) \
@@ -94,7 +94,7 @@ $(WORKDIR)/CustomTarget/i18npool/source/localedata/data/saxparser.rdb : \
$(WORKDIR)/CustomTarget/i18npool/source/localedata/data/saxparser.input :
mkdir -p $(dir $@) \
- && echo "<list><filename>component/$(MY_COMPONENT).inbuild.component</filename></list>" > $@
+ && echo "<list>$(foreach component,$(MY_COMPONENTS),<filename>$(component).inbuild.component</filename>)</list>" > $@
# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list