openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1853286 - in /openoffice/trunk/main: 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/build.lst ure/prj/d.lst ure/prj/makefile.mk ure/source/services.input
Date Sat, 09 Feb 2019 16:02:33 GMT
Author: damjan
Date: Sat Feb  9 16:02:33 2019
New Revision: 1853286

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

Patch by: me


Added:
    openoffice/trunk/main/ure/Makefile   (with props)
    openoffice/trunk/main/ure/Module_ure.mk
    openoffice/trunk/main/ure/Package_services_rdb.mk
    openoffice/trunk/main/ure/Package_ure.mk
    openoffice/trunk/main/ure/Package_uretest_zip.mk
    openoffice/trunk/main/ure/prj/makefile.mk
    openoffice/trunk/main/ure/source/services.input
Modified:
    openoffice/trunk/main/Module_ooo.mk
    openoffice/trunk/main/ure/prj/build.lst
    openoffice/trunk/main/ure/prj/d.lst

Modified: openoffice/trunk/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1853286&r1=1853285&r2=1853286&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Sat Feb  9 16:02:33 2019
@@ -109,6 +109,7 @@ $(eval $(call gb_Module_add_moduledirs,o
 	unodevtools \
 	unotools \
 	unoxml \
+	ure \
 	uui \
 	vbahelper \
 	vcl \

Added: openoffice/trunk/main/ure/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ure/Makefile?rev=1853286&view=auto
==============================================================================
--- openoffice/trunk/main/ure/Makefile (added)
+++ openoffice/trunk/main/ure/Makefile Sat Feb  9 16:02:33 2019
@@ -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/ure/Makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Added: openoffice/trunk/main/ure/Module_ure.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ure/Module_ure.mk?rev=1853286&view=auto
==============================================================================
--- openoffice/trunk/main/ure/Module_ure.mk (added)
+++ openoffice/trunk/main/ure/Module_ure.mk Sat Feb  9 16:02:33 2019
@@ -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:

Added: openoffice/trunk/main/ure/Package_services_rdb.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ure/Package_services_rdb.mk?rev=1853286&view=auto
==============================================================================
--- openoffice/trunk/main/ure/Package_services_rdb.mk (added)
+++ openoffice/trunk/main/ure/Package_services_rdb.mk Sat Feb  9 16:02:33 2019
@@ -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)

Added: openoffice/trunk/main/ure/Package_ure.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ure/Package_ure.mk?rev=1853286&view=auto
==============================================================================
--- openoffice/trunk/main/ure/Package_ure.mk (added)
+++ openoffice/trunk/main/ure/Package_ure.mk Sat Feb  9 16:02:33 2019
@@ -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))
+

Added: openoffice/trunk/main/ure/Package_uretest_zip.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ure/Package_uretest_zip.mk?rev=1853286&view=auto
==============================================================================
--- openoffice/trunk/main/ure/Package_uretest_zip.mk (added)
+++ openoffice/trunk/main/ure/Package_uretest_zip.mk Sat Feb  9 16:02:33 2019
@@ -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

Modified: openoffice/trunk/main/ure/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ure/prj/build.lst?rev=1853286&r1=1853285&r2=1853286&view=diff
==============================================================================
--- openoffice/trunk/main/ure/prj/build.lst (original)
+++ openoffice/trunk/main/ure/prj/build.lst Sat Feb  9 16:02:33 2019
@@ -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

Modified: openoffice/trunk/main/ure/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ure/prj/d.lst?rev=1853286&r1=1853285&r2=1853286&view=diff
==============================================================================
--- openoffice/trunk/main/ure/prj/d.lst (original)
+++ openoffice/trunk/main/ure/prj/d.lst Sat Feb  9 16:02:33 2019
@@ -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

Added: openoffice/trunk/main/ure/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ure/prj/makefile.mk?rev=1853286&view=auto
==============================================================================
--- openoffice/trunk/main/ure/prj/makefile.mk (added)
+++ openoffice/trunk/main/ure/prj/makefile.mk Sat Feb  9 16:02:33 2019
@@ -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

Added: openoffice/trunk/main/ure/source/services.input
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ure/source/services.input?rev=1853286&view=auto
==============================================================================
--- openoffice/trunk/main/ure/source/services.input (added)
+++ openoffice/trunk/main/ure/source/services.input Sat Feb  9 16:02:33 2019
@@ -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>



Mime
View raw message