Author: damjan Date: Sun May 12 09:34:12 2019 New Revision: 1859134 URL: http://svn.apache.org/viewvc?rev=1859134&view=rev Log: Port qadevOOo to gbuild/Ant.
Patch by: me Added: openoffice/trunk/main/qadevOOo/Ant_OOoRunner.mk openoffice/trunk/main/qadevOOo/Ant_OOoRunnerLight.mk openoffice/trunk/main/qadevOOo/JunitTest_qadevOOo_unoapi.mk openoffice/trunk/main/qadevOOo/Makefile (with props) openoffice/trunk/main/qadevOOo/Module_qadevOOo.mk openoffice/trunk/main/qadevOOo/java/ openoffice/trunk/main/qadevOOo/java/OOoRunner/ openoffice/trunk/main/qadevOOo/java/OOoRunner/build.xml (with props) openoffice/trunk/main/qadevOOo/java/OOoRunner/manifest - copied unchanged from r1859133, openoffice/trunk/main/qadevOOo/runner/manifest openoffice/trunk/main/qadevOOo/java/OOoRunner/src/ openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/ openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/ openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/base/ - copied from r1859133, openoffice/trunk/main/qadevOOo/runner/base/ openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/basicrunner/ - copied from r1859133, openoffice/trunk/main/qadevOOo/runner/basicrunner/ openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/complex/ - copied from r1859133, openoffice/trunk/main/qadevOOo/tests/java/complex/ openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/complexlib/ - copied from r1859133, openoffice/trunk/main/qadevOOo/runner/complexlib/ openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/ - copied from r1859133, openoffice/trunk/main/qadevOOo/runner/convwatch/ openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/graphical/ - copied from r1859133, openoffice/trunk/main/qadevOOo/runner/graphical/ openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/helper/ - copied from r1859133, openoffice/trunk/main/qadevOOo/runner/helper/ openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/ifc/ - copied from r1859133, openoffice/trunk/main/qadevOOo/tests/java/ifc/ openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/lib/ - copied from r1859133, openoffice/trunk/main/qadevOOo/runner/lib/ openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/mod/ - copied from r1859133, openoffice/trunk/main/qadevOOo/tests/java/mod/ openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/org/ - copied from r1859133, openoffice/trunk/main/qadevOOo/runner/org/ openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/share/ - copied from r1859133, openoffice/trunk/main/qadevOOo/runner/share/ openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/stats/ - copied from r1859133, openoffice/trunk/main/qadevOOo/runner/stats/ openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/util/ - copied from r1859133, openoffice/trunk/main/qadevOOo/runner/util/ openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/resources/ openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/ - copied from r1859133, openoffice/trunk/main/qadevOOo/objdsc/ openoffice/trunk/main/qadevOOo/java/OOoRunnerLight/ openoffice/trunk/main/qadevOOo/java/OOoRunnerLight/build.xml (with props) openoffice/trunk/main/qadevOOo/java/OOoRunnerLight/manifest openoffice/trunk/main/qadevOOo/prj/makefile.mk Removed: openoffice/trunk/main/qadevOOo/build.xml openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/base/makefile.mk openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/basicrunner/basichelper/makefile.mk openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/basicrunner/makefile.mk openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/complexlib/makefile.mk openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/makefile.mk openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/graphical/makefile.mk openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/helper/makefile.mk openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/lib/makefile.mk openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/org/openoffice/makefile.mk openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/share/makefile.mk openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/stats/makefile.mk openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/util/compare/makefile.mk openoffice/trunk/main/qadevOOo/java/OOoRunner/src/main/java/util/makefile.mk openoffice/trunk/main/qadevOOo/makefile.mk openoffice/trunk/main/qadevOOo/objdsc/ openoffice/trunk/main/qadevOOo/qa/unoapi/makefile.mk openoffice/trunk/main/qadevOOo/runner/ openoffice/trunk/main/qadevOOo/tests/java/ Modified: openoffice/trunk/main/Module_ooo.mk openoffice/trunk/main/qadevOOo/prj/build.lst openoffice/trunk/main/qadevOOo/prj/d.lst Modified: openoffice/trunk/main/Module_ooo.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1859134&r1=1859133&r2=1859134&view=diff ============================================================================== --- openoffice/trunk/main/Module_ooo.mk (original) +++ openoffice/trunk/main/Module_ooo.mk Sun May 12 09:34:12 2019 @@ -77,6 +77,7 @@ $(eval $(call gb_Module_add_moduledirs,o padmin \ psprint_config \ pyuno \ + qadevOOo \ rdbmaker \ registry \ remotebridges \ Added: openoffice/trunk/main/qadevOOo/Ant_OOoRunner.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/qadevOOo/Ant_OOoRunner.mk?rev=1859134&view=auto ============================================================================== --- openoffice/trunk/main/qadevOOo/Ant_OOoRunner.mk (added) +++ openoffice/trunk/main/qadevOOo/Ant_OOoRunner.mk Sun May 12 09:34:12 2019 @@ -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,OOoRunner,$(SRCDIR)/qadevOOo/java/OOoRunner/build.xml)) + +# vim: set noet sw=4 ts=4: + Added: openoffice/trunk/main/qadevOOo/Ant_OOoRunnerLight.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/qadevOOo/Ant_OOoRunnerLight.mk?rev=1859134&view=auto ============================================================================== --- openoffice/trunk/main/qadevOOo/Ant_OOoRunnerLight.mk (added) +++ openoffice/trunk/main/qadevOOo/Ant_OOoRunnerLight.mk Sun May 12 09:34:12 2019 @@ -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,OOoRunnerLight,$(SRCDIR)/qadevOOo/java/OOoRunnerLight/build.xml)) + +# vim: set noet sw=4 ts=4: + Added: openoffice/trunk/main/qadevOOo/JunitTest_qadevOOo_unoapi.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/qadevOOo/JunitTest_qadevOOo_unoapi.mk?rev=1859134&view=auto ============================================================================== --- openoffice/trunk/main/qadevOOo/JunitTest_qadevOOo_unoapi.mk (added) +++ openoffice/trunk/main/qadevOOo/JunitTest_qadevOOo_unoapi.mk Sun May 12 09:34:12 2019 @@ -0,0 +1,46 @@ +############################################################### +# +# 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_JunitTest_JunitTest,qadevOOo_unoapi,SRCDIR)) + +#$(eval $(call gb_JunitTest_set_defs,sm_unoapi,\ +# $$(DEFS) \ +# -Dorg.openoffice.test.arg.sce=$(SRCDIR)/starmath/qa/unoapi/sm.sce \ +# -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/starmath/qa/unoapi/knownissues.xcl \ +#)) + +$(eval $(call gb_JunitTest_add_jars,qadevOOo_unoapi,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,qadevOOo_unoapi,\ + qadevOOo/qa/unoapi/Test \ +)) + +$(eval $(call gb_JunitTest_add_classes,qadevOOo_unoapi,\ + org.openoffice.qadevOOo.qa.unoapi.Test \ +)) + +# vim: set noet sw=4 ts=4: Added: openoffice/trunk/main/qadevOOo/Makefile URL: http://svn.apache.org/viewvc/openoffice/trunk/main/qadevOOo/Makefile?rev=1859134&view=auto ============================================================================== --- openoffice/trunk/main/qadevOOo/Makefile (added) +++ openoffice/trunk/main/qadevOOo/Makefile Sun May 12 09:34:12 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/qadevOOo/Makefile ------------------------------------------------------------------------------ svn:eol-style = native Added: openoffice/trunk/main/qadevOOo/Module_qadevOOo.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/qadevOOo/Module_qadevOOo.mk?rev=1859134&view=auto ============================================================================== --- openoffice/trunk/main/qadevOOo/Module_qadevOOo.mk (added) +++ openoffice/trunk/main/qadevOOo/Module_qadevOOo.mk Sun May 12 09:34:12 2019 @@ -0,0 +1,38 @@ +#************************************************************** +# +# 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,qadevOOo)) + +$(eval $(call gb_Module_add_targets,qadevOOo,\ + Ant_OOoRunner \ + Ant_OOoRunnerLight \ +)) + +ifneq ($(OOO_JUNIT_JAR),) +$(eval $(call gb_Module_add_subsequentcheck_targets,qadevOOo,\ + JunitTest_qadevOOo_unoapi \ +)) +endif + + +# vim: set noet sw=4 ts=4: Added: openoffice/trunk/main/qadevOOo/java/OOoRunner/build.xml URL: http://svn.apache.org/viewvc/openoffice/trunk/main/qadevOOo/java/OOoRunner/build.xml?rev=1859134&view=auto ============================================================================== --- openoffice/trunk/main/qadevOOo/java/OOoRunner/build.xml (added) +++ openoffice/trunk/main/qadevOOo/java/OOoRunner/build.xml Sun May 12 09:34:12 2019 @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--*********************************************************** + * + * 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. + * + ***********************************************************--> + + +<project name="OOoRunner" default="main" xmlns:if="ant:if" xmlns:unless="ant:unless"> + + <property file="../../../ant.properties"/> + <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/> + + <target name="init-project"> + <property name="jar.manifest" value="manifest"/> + <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"/> + <pathelement location="${OUTDIR}/bin/java_uno.jar"/> + </path> + </target> + +</project> + Propchange: openoffice/trunk/main/qadevOOo/java/OOoRunner/build.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: openoffice/trunk/main/qadevOOo/java/OOoRunner/build.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: openoffice/trunk/main/qadevOOo/java/OOoRunnerLight/build.xml URL: http://svn.apache.org/viewvc/openoffice/trunk/main/qadevOOo/java/OOoRunnerLight/build.xml?rev=1859134&view=auto ============================================================================== --- openoffice/trunk/main/qadevOOo/java/OOoRunnerLight/build.xml (added) +++ openoffice/trunk/main/qadevOOo/java/OOoRunnerLight/build.xml Sun May 12 09:34:12 2019 @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--*********************************************************** + * + * 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. + * + ***********************************************************--> + + +<project name="OOoRunnerLight" default="main" xmlns:if="ant:if" xmlns:unless="ant:unless"> + + <property name="main.src.dir" value="../OOoRunner/src/main/java"/> + + <property file="../../../ant.properties"/> + <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/> + + <target name="init-project"> + <property name="jar.manifest" value="manifest"/> + <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"/> + <pathelement location="${OUTDIR}/bin/java_uno.jar"/> + </path> + </target> + + + <target name="jar" depends="compile" if="${jar.enabled}"> + <jar destfile="${jar.dir}/${jar.name}.jar" + manifest="${jar.manifest}" + duplicate="fail"> + <manifest> + <attribute name="Class-Path" value="${jar.classpath}" unless:blank="${jar.classpath}"/> + <attribute name="Solar-Version" value="${RSCREVISION}"/> + </manifest> + + <!-- Exclude the "test" classes --> + + <fileset dir="${main.build.dir}/" casesensitive="false"> + <include name="**/*.class"/> + <exclude name="complex/"/> + <exclude name="ifc/"/> + <exclude name="mod/"/> + </fileset> + </jar> + </target> + +</project> + Propchange: openoffice/trunk/main/qadevOOo/java/OOoRunnerLight/build.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: openoffice/trunk/main/qadevOOo/java/OOoRunnerLight/build.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: openoffice/trunk/main/qadevOOo/java/OOoRunnerLight/manifest URL: http://svn.apache.org/viewvc/openoffice/trunk/main/qadevOOo/java/OOoRunnerLight/manifest?rev=1859134&view=auto ============================================================================== --- openoffice/trunk/main/qadevOOo/java/OOoRunnerLight/manifest (added) +++ openoffice/trunk/main/qadevOOo/java/OOoRunnerLight/manifest Sun May 12 09:34:12 2019 @@ -0,0 +1,3 @@ +Class-Path: ridl.jar unoil.jar +RegistrationClassName: org.openoffice.RunnerService + Modified: openoffice/trunk/main/qadevOOo/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/qadevOOo/prj/build.lst?rev=1859134&r1=1859133&r2=1859134&view=diff ============================================================================== --- openoffice/trunk/main/qadevOOo/prj/build.lst (original) +++ openoffice/trunk/main/qadevOOo/prj/build.lst Sun May 12 09:34:12 2019 @@ -1,6 +1,2 @@ qa qadevOOo : javaunohelper jurt ridljar unoil NULL -qa qadevOOo usr1 - all qa_mkout NULL -qa qadevOOo nmake - all qa_runner_ant_build NULL -qa qadevOOo\runner nmake - all qa_make_package qa_runner_ant_build NULL - -qa qadevOOo\qa\unoapi nmake - all qa_qa_unoapi qa_make_package NULL +qa qadevOOo\prj nmake - all qa_prj NULL Modified: openoffice/trunk/main/qadevOOo/prj/d.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/qadevOOo/prj/d.lst?rev=1859134&r1=1859133&r2=1859134&view=diff ============================================================================== --- openoffice/trunk/main/qadevOOo/prj/d.lst (original) +++ openoffice/trunk/main/qadevOOo/prj/d.lst Sun May 12 09:34:12 2019 @@ -1 +0,0 @@ -..\%__SRC%\class\OOoRunner*.jar %_DEST%\bin%_EXT% Added: openoffice/trunk/main/qadevOOo/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/qadevOOo/prj/makefile.mk?rev=1859134&view=auto ============================================================================== --- openoffice/trunk/main/qadevOOo/prj/makefile.mk (added) +++ openoffice/trunk/main/qadevOOo/prj/makefile.mk Sun May 12 09:34:12 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