You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/12/06 19:29:06 UTC
svn commit: r1772940 - in /openoffice/trunk/main/uui:
AllLangResTarget_uui.mk Library_uui.mk Makefile Module_uui.mk
Package_xml.mk prj/makefile.mk
Author: damjan
Date: Tue Dec 6 19:29:05 2016
New Revision: 1772940
URL: http://svn.apache.org/viewvc?rev=1772940&view=rev
Log:
Finish porting main/uui to gbuild.
Patch by: me
Added:
openoffice/trunk/main/uui/AllLangResTarget_uui.mk
openoffice/trunk/main/uui/Library_uui.mk
openoffice/trunk/main/uui/Makefile (with props)
openoffice/trunk/main/uui/Module_uui.mk
openoffice/trunk/main/uui/Package_xml.mk
openoffice/trunk/main/uui/prj/makefile.mk
Added: openoffice/trunk/main/uui/AllLangResTarget_uui.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/uui/AllLangResTarget_uui.mk?rev=1772940&view=auto
==============================================================================
--- openoffice/trunk/main/uui/AllLangResTarget_uui.mk (added)
+++ openoffice/trunk/main/uui/AllLangResTarget_uui.mk Tue Dec 6 19:29:05 2016
@@ -0,0 +1,57 @@
+#**************************************************************
+#
+# 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,uui))
+
+$(eval $(call gb_AllLangResTarget_add_srs,uui,\
+ uui/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,uui/res))
+
+$(eval $(call gb_SrsTarget_set_include,uui/res,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+ -I$(SRCDIR)/uui/source \
+))
+
+$(eval $(call gb_SrsTarget_add_files,uui/res,\
+ uui/source/cookiedg.src \
+ uui/source/ids.src \
+ uui/source/logindlg.src \
+ uui/source/masterpassworddlg.src \
+ uui/source/masterpasscrtdlg.src \
+ uui/source/openlocked.src \
+ uui/source/passworddlg.src \
+ uui/source/passworderrs.src \
+ uui/source/fltdlg.src \
+ uui/source/unknownauthdlg.src \
+ uui/source/sslwarndlg.src \
+ uui/source/secmacrowarnings.src \
+ uui/source/filechanged.src \
+ uui/source/alreadyopen.src \
+ uui/source/lockfailed.src \
+ uui/source/trylater.src \
+ uui/source/nameclashdlg.src \
+ uui/source/newerverwarn.src \
+))
Added: openoffice/trunk/main/uui/Library_uui.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/uui/Library_uui.mk?rev=1772940&view=auto
==============================================================================
--- openoffice/trunk/main/uui/Library_uui.mk (added)
+++ openoffice/trunk/main/uui/Library_uui.mk Tue Dec 6 19:29:05 2016
@@ -0,0 +1,83 @@
+#**************************************************************
+#
+# 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,uui))
+
+$(eval $(call gb_Library_set_componentfile,uui,uui/util/uui))
+
+$(eval $(call gb_Library_set_include,uui,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_api,uui,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,uui,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ ootk \
+ sal \
+ svl \
+ svt \
+ tl \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,uui,\
+ uui/source/cookiedg \
+ uui/source/iahndl \
+ uui/source/iahndl-authentication \
+ uui/source/iahndl-ssl \
+ uui/source/iahndl-cookies \
+ uui/source/iahndl-filter \
+ uui/source/iahndl-locking \
+ uui/source/iahndl-ioexceptions \
+ uui/source/iahndl-errorhandler \
+ uui/source/logindlg \
+ uui/source/services \
+ uui/source/masterpassworddlg \
+ uui/source/masterpasscrtdlg \
+ uui/source/openlocked \
+ uui/source/passworddlg \
+ uui/source/fltdlg \
+ uui/source/interactionhandler \
+ uui/source/requeststringresolver \
+ uui/source/unknownauthdlg \
+ uui/source/sslwarndlg \
+ uui/source/secmacrowarnings \
+ uui/source/filechanged \
+ uui/source/alreadyopen \
+ uui/source/lockfailed \
+ uui/source/trylater \
+ uui/source/newerverwarn \
+ uui/source/nameclashdlg \
+ uui/source/passwordcontainer \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/uui/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/uui/Makefile?rev=1772940&view=auto
==============================================================================
--- openoffice/trunk/main/uui/Makefile (added)
+++ openoffice/trunk/main/uui/Makefile Tue Dec 6 19:29:05 2016
@@ -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/uui/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/uui/Module_uui.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/uui/Module_uui.mk?rev=1772940&view=auto
==============================================================================
--- openoffice/trunk/main/uui/Module_uui.mk (added)
+++ openoffice/trunk/main/uui/Module_uui.mk Tue Dec 6 19:29:05 2016
@@ -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.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,uui))
+
+$(eval $(call gb_Module_add_targets,uui,\
+ AllLangResTarget_uui \
+ Library_uui \
+ Package_xml \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/uui/Package_xml.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/uui/Package_xml.mk?rev=1772940&view=auto
==============================================================================
--- openoffice/trunk/main/uui/Package_xml.mk (added)
+++ openoffice/trunk/main/uui/Package_xml.mk Tue Dec 6 19:29:05 2016
@@ -0,0 +1,26 @@
+###############################################################
+#
+# 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,uui_xml,$(SRCDIR)/uui))
+
+$(eval $(call gb_Package_add_file,uui_xml,xml/uui.xml,util/uui.xml))
Added: openoffice/trunk/main/uui/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/uui/prj/makefile.mk?rev=1772940&view=auto
==============================================================================
--- openoffice/trunk/main/uui/prj/makefile.mk (added)
+++ openoffice/trunk/main/uui/prj/makefile.mk Tue Dec 6 19:29:05 2016
@@ -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