openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1859207 - in /openoffice/trunk/main: Module_ooo.mk testgraphical/Ant_ConvwatchGUIProject.mk testgraphical/Makefile testgraphical/Module_testgraphical.mk testgraphical/prj/build.lst testgraphical/prj/makefile.mk
Date Tue, 14 May 2019 04:22:59 GMT
Author: damjan
Date: Tue May 14 04:22:58 2019
New Revision: 1859207

URL: http://svn.apache.org/viewvc?rev=1859207&view=rev
Log:
Port main/testgraphical to gbuild. Not that it does anything.

Patch by: me


Added:
    openoffice/trunk/main/testgraphical/Ant_ConvwatchGUIProject.mk
    openoffice/trunk/main/testgraphical/Makefile   (with props)
    openoffice/trunk/main/testgraphical/Module_testgraphical.mk
    openoffice/trunk/main/testgraphical/prj/makefile.mk
Modified:
    openoffice/trunk/main/Module_ooo.mk
    openoffice/trunk/main/testgraphical/prj/build.lst

Modified: openoffice/trunk/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1859207&r1=1859206&r2=1859207&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Tue May 14 04:22:58 2019
@@ -101,6 +101,7 @@ $(eval $(call gb_Module_add_moduledirs,o
 	svtools \
 	svx \
 	sw \
+	testgraphical \
 	toolkit \
 	tools \
 	twain \

Added: openoffice/trunk/main/testgraphical/Ant_ConvwatchGUIProject.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/testgraphical/Ant_ConvwatchGUIProject.mk?rev=1859207&view=auto
==============================================================================
--- openoffice/trunk/main/testgraphical/Ant_ConvwatchGUIProject.mk (added)
+++ openoffice/trunk/main/testgraphical/Ant_ConvwatchGUIProject.mk Tue May 14 04:22:58 2019
@@ -0,0 +1,28 @@
+#**************************************************************
+#  
+#  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.
+#  
+#**************************************************************
+
+
+# FIXME: move to correct location and get it to actually build:
+
+$(eval $(call gb_Ant_Ant,ConvwatchGUIProject,$(SRCDIR)/testgraphical/ui/java/ConvwatchGUIProject/build.xml))
+
+# vim: set noet sw=4 ts=4:
+

Added: openoffice/trunk/main/testgraphical/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/testgraphical/Makefile?rev=1859207&view=auto
==============================================================================
--- openoffice/trunk/main/testgraphical/Makefile (added)
+++ openoffice/trunk/main/testgraphical/Makefile Tue May 14 04:22:58 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/testgraphical/Makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Added: openoffice/trunk/main/testgraphical/Module_testgraphical.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/testgraphical/Module_testgraphical.mk?rev=1859207&view=auto
==============================================================================
--- openoffice/trunk/main/testgraphical/Module_testgraphical.mk (added)
+++ openoffice/trunk/main/testgraphical/Module_testgraphical.mk Tue May 14 04:22:58 2019
@@ -0,0 +1,34 @@
+#**************************************************************
+#  
+#  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,testgraphical))
+
+$(eval $(call gb_Module_add_targets,testgraphical,\
+))
+
+# Didn't build anything in dmake either:
+#
+# Ant_ConvwatchGUIProject \
+#
+
+# vim: set noet sw=4 ts=4:

Modified: openoffice/trunk/main/testgraphical/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/testgraphical/prj/build.lst?rev=1859207&r1=1859206&r2=1859207&view=diff
==============================================================================
--- openoffice/trunk/main/testgraphical/prj/build.lst (original)
+++ openoffice/trunk/main/testgraphical/prj/build.lst Tue May 14 04:22:58 2019
@@ -1,3 +1,2 @@
 gfxcmp    testgraphical     :       instsetoo_native qadevOOo NULL
-gfxcmp    testgraphical                             usr1     -  all    gfxcmp_mkout NULL
-gfxcmp    testgraphical\ui\java\ConvwatchGUIProject nmake    -  all    gfxcmp_java_ui NULL
+gfxcmp    testgraphical\prj                             nmake     -  all    gfxcmp_prj NULL

Added: openoffice/trunk/main/testgraphical/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/testgraphical/prj/makefile.mk?rev=1859207&view=auto
==============================================================================
--- openoffice/trunk/main/testgraphical/prj/makefile.mk (added)
+++ openoffice/trunk/main/testgraphical/prj/makefile.mk Tue May 14 04:22:58 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



Mime
View raw message