Hello, now I'm able to create sdf files based on the source code and the files in Pootle.
Source code ie r1847189. Building with current trunk failed con Centos 7 as described in this thread. So I think we need a branch whre we can work for the next release like 4.2. @ Jim: Can you gererate a 4.2 branch up to r 184789. Then I can put the new sdf files. I did it manually for 6 Languages. I will do it then for all Languages in Pootle. After then I can create new *.po files to import in Pootle. Is'it possible to do it in a more efficient way than uploading it file by file. I need a shell access to do so, I guess. I will also publish the documentation after migration of the wiki. Kind regards Mechtilde Am 24.11.18 um 23:20 schrieb Matthias Seidel: > Linux-32 and Windows builds also fail in xmerge. > > Matthias > > Am 24.11.18 um 16:08 schrieb Matthias Seidel: >> Hi Damjan, >> >> This commit breaks at least our Linux-64 builds: >> >> https://ci.apache.org/projects/openoffice/buildlogs/linux64/main/xmerge/unxlngx6.pro/misc/logs/prj.txt >> >> Regards, >> >> Matthias >> >> Am 24.11.18 um 08:58 schrieb dam...@apache.org: >>> Author: damjan >>> Date: Sat Nov 24 07:58:57 2018 >>> New Revision: 1847342 >>> >>> URL: http://svn.apache.org/viewvc?rev=1847342&view=rev >>> Log: >>> Add a "dependencies" target for Ant to allow extracting the JARs that >>> a Java module depends on. Use this to make Ant targets depends on >>> their dependencies in gbuild, so that Java submodules within a >>> main/ module build in the correct order. >>> >>> Port main/xmerge to gbuild/Ant using this approach. >>> >>> Patch by: me >>> >>> >>> Added: >>> openoffice/trunk/main/xmerge/Ant_XMergeBridge.mk >>> openoffice/trunk/main/xmerge/Ant_aportisdoc.mk >>> openoffice/trunk/main/xmerge/Ant_htmlsoff.mk >>> openoffice/trunk/main/xmerge/Ant_pexcel.mk >>> openoffice/trunk/main/xmerge/Ant_pocketword.mk >>> openoffice/trunk/main/xmerge/Ant_xmerge-javadoc.mk >>> openoffice/trunk/main/xmerge/Ant_xmerge.mk >>> openoffice/trunk/main/xmerge/Makefile (with props) >>> openoffice/trunk/main/xmerge/Module_xmerge.mk >>> openoffice/trunk/main/xmerge/Package_xmergesync.mk >>> openoffice/trunk/main/xmerge/java/ >>> openoffice/trunk/main/xmerge/java/XMergeBridge/ >>> - copied from r1847341, openoffice/trunk/main/xmerge/source/bridge/ >>> openoffice/trunk/main/xmerge/java/XMergeBridge/src/ >>> openoffice/trunk/main/xmerge/java/XMergeBridge/src/main/ >>> openoffice/trunk/main/xmerge/java/XMergeBridge/src/main/java/ >>> - copied from r1847335, >>> openoffice/trunk/main/xmerge/source/bridge/java/ >>> openoffice/trunk/main/xmerge/java/aportisdoc/ >>> - copied from r1847341, >>> openoffice/trunk/main/xmerge/source/aportisdoc/ >>> openoffice/trunk/main/xmerge/java/aportisdoc/src/ >>> openoffice/trunk/main/xmerge/java/aportisdoc/src/main/ >>> openoffice/trunk/main/xmerge/java/aportisdoc/src/main/java/ >>> - copied from r1847335, >>> openoffice/trunk/main/xmerge/source/aportisdoc/java/ >>> openoffice/trunk/main/xmerge/java/aportisdoc/src/main/resources/ >>> >>> openoffice/trunk/main/xmerge/java/aportisdoc/src/main/resources/META-INF/ >>> >>> openoffice/trunk/main/xmerge/java/aportisdoc/src/main/resources/META-INF/converter.xml >>> - copied unchanged from r1847335, >>> openoffice/trunk/main/xmerge/source/aportisdoc/converter.xml >>> openoffice/trunk/main/xmerge/java/htmlsoff/ >>> - copied from r1847341, openoffice/trunk/main/xmerge/source/htmlsoff/ >>> openoffice/trunk/main/xmerge/java/htmlsoff/src/ >>> openoffice/trunk/main/xmerge/java/htmlsoff/src/main/ >>> openoffice/trunk/main/xmerge/java/htmlsoff/src/main/java/ >>> openoffice/trunk/main/xmerge/java/htmlsoff/src/main/java/package.html >>> - copied unchanged from r1847335, >>> openoffice/trunk/main/xmerge/source/htmlsoff/package.html >>> openoffice/trunk/main/xmerge/java/htmlsoff/src/main/resources/ >>> openoffice/trunk/main/xmerge/java/htmlsoff/src/main/resources/META-INF/ >>> >>> openoffice/trunk/main/xmerge/java/htmlsoff/src/main/resources/META-INF/converter.xml >>> - copied unchanged from r1847335, >>> openoffice/trunk/main/xmerge/source/htmlsoff/converter.xml >>> >>> openoffice/trunk/main/xmerge/java/htmlsoff/src/main/resources/htmltosoff.xsl >>> - copied unchanged from r1847335, >>> openoffice/trunk/main/xmerge/source/htmlsoff/htmltosoff.xsl >>> >>> openoffice/trunk/main/xmerge/java/htmlsoff/src/main/resources/sofftohtml.xsl >>> - copied unchanged from r1847335, >>> openoffice/trunk/main/xmerge/source/htmlsoff/sofftohtml.xsl >>> openoffice/trunk/main/xmerge/java/pexcel/ >>> - copied from r1847341, openoffice/trunk/main/xmerge/source/pexcel/ >>> openoffice/trunk/main/xmerge/java/pexcel/src/ >>> openoffice/trunk/main/xmerge/java/pexcel/src/main/ >>> openoffice/trunk/main/xmerge/java/pexcel/src/main/java/ >>> - copied from r1847335, >>> openoffice/trunk/main/xmerge/source/pexcel/java/ >>> openoffice/trunk/main/xmerge/java/pexcel/src/main/resources/ >>> openoffice/trunk/main/xmerge/java/pexcel/src/main/resources/META-INF/ >>> >>> openoffice/trunk/main/xmerge/java/pexcel/src/main/resources/META-INF/converter.xml >>> - copied unchanged from r1847335, >>> openoffice/trunk/main/xmerge/source/pexcel/converter.xml >>> openoffice/trunk/main/xmerge/java/pocketword/ >>> - copied from r1847341, >>> openoffice/trunk/main/xmerge/source/pocketword/ >>> openoffice/trunk/main/xmerge/java/pocketword/src/ >>> openoffice/trunk/main/xmerge/java/pocketword/src/main/ >>> openoffice/trunk/main/xmerge/java/pocketword/src/main/java/ >>> - copied from r1847335, >>> openoffice/trunk/main/xmerge/source/pocketword/java/ >>> openoffice/trunk/main/xmerge/java/pocketword/src/main/resources/ >>> >>> openoffice/trunk/main/xmerge/java/pocketword/src/main/resources/META-INF/ >>> >>> openoffice/trunk/main/xmerge/java/pocketword/src/main/resources/META-INF/converter.xml >>> - copied unchanged from r1847335, >>> openoffice/trunk/main/xmerge/source/pocketword/converter.xml >>> openoffice/trunk/main/xmerge/java/xmerge/ >>> - copied from r1847341, openoffice/trunk/main/xmerge/source/xmerge/ >>> openoffice/trunk/main/xmerge/java/xmerge/manifest.mf (with props) >>> openoffice/trunk/main/xmerge/java/xmerge/src/ >>> openoffice/trunk/main/xmerge/java/xmerge/src/main/ >>> openoffice/trunk/main/xmerge/java/xmerge/src/main/java/ >>> - copied from r1847335, >>> openoffice/trunk/main/xmerge/source/xmerge/java/ >>> openoffice/trunk/main/xmerge/java/xmerge/src/main/resources/ >>> openoffice/trunk/main/xmerge/java/xmerge/src/main/resources/org/ >>> >>> openoffice/trunk/main/xmerge/java/xmerge/src/main/resources/org/openoffice/ >>> >>> openoffice/trunk/main/xmerge/java/xmerge/src/main/resources/org/openoffice/xmerge/ >>> >>> openoffice/trunk/main/xmerge/java/xmerge/src/main/resources/org/openoffice/xmerge/converter/ >>> >>> openoffice/trunk/main/xmerge/java/xmerge/src/main/resources/org/openoffice/xmerge/converter/xml/ >>> >>> openoffice/trunk/main/xmerge/java/xmerge/src/main/resources/org/openoffice/xmerge/converter/xml/xslt/ >>> >>> openoffice/trunk/main/xmerge/java/xmerge/src/main/resources/org/openoffice/xmerge/converter/xml/xslt/XsltPlugin.properties >>> - copied unchanged from r1847335, >>> openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/XsltPlugin.properties >>> >>> openoffice/trunk/main/xmerge/java/xmerge/src/main/resources/org/openoffice/xmerge/test/ >>> >>> openoffice/trunk/main/xmerge/java/xmerge/src/main/resources/org/openoffice/xmerge/test/ConverterInfoList.properties >>> - copied unchanged from r1847335, >>> openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.properties >>> >>> openoffice/trunk/main/xmerge/java/xmerge/src/main/resources/org/openoffice/xmerge/util/ >>> >>> openoffice/trunk/main/xmerge/java/xmerge/src/main/resources/org/openoffice/xmerge/util/Debug.properties >>> - copied unchanged from r1847335, >>> openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.properties >>> >>> openoffice/trunk/main/xmerge/java/xmerge/src/main/resources/org/openoffice/xmerge/util/resources.properties >>> - copied unchanged from r1847335, >>> openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/resources.properties >>> openoffice/trunk/main/xmerge/prj/makefile.mk >>> Removed: >>> openoffice/trunk/main/xmerge/java/XMergeBridge/java/ >>> openoffice/trunk/main/xmerge/java/aportisdoc/converter.xml >>> openoffice/trunk/main/xmerge/java/aportisdoc/java/ >>> openoffice/trunk/main/xmerge/java/htmlsoff/converter.xml >>> openoffice/trunk/main/xmerge/java/htmlsoff/htmltosoff.xsl >>> openoffice/trunk/main/xmerge/java/htmlsoff/package.html >>> openoffice/trunk/main/xmerge/java/htmlsoff/sofftohtml.xsl >>> openoffice/trunk/main/xmerge/java/pexcel/converter.xml >>> openoffice/trunk/main/xmerge/java/pexcel/java/ >>> openoffice/trunk/main/xmerge/java/pocketword/converter.xml >>> openoffice/trunk/main/xmerge/java/pocketword/java/ >>> openoffice/trunk/main/xmerge/java/xmerge/java/ >>> >>> openoffice/trunk/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/converter/xml/xslt/XsltPlugin.properties >>> >>> openoffice/trunk/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/test/ConverterInfoList.properties >>> >>> openoffice/trunk/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/Debug.properties >>> >>> openoffice/trunk/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/resources.properties >>> openoffice/trunk/main/xmerge/source/aportisdoc/ >>> openoffice/trunk/main/xmerge/source/bridge/ >>> openoffice/trunk/main/xmerge/source/htmlsoff/ >>> openoffice/trunk/main/xmerge/source/pexcel/ >>> openoffice/trunk/main/xmerge/source/pocketword/ >>> openoffice/trunk/main/xmerge/source/xmerge/ >>> Modified: >>> openoffice/trunk/main/Module_ooo.mk >>> openoffice/trunk/main/postprocess/packcomponents/makefile.mk >>> openoffice/trunk/main/solenv/ant/aoo-ant.xml >>> openoffice/trunk/main/solenv/gbuild/Ant.mk >>> openoffice/trunk/main/xmerge/java/XMergeBridge/build.xml >>> openoffice/trunk/main/xmerge/java/aportisdoc/build.xml >>> openoffice/trunk/main/xmerge/java/htmlsoff/build.xml >>> openoffice/trunk/main/xmerge/java/pexcel/build.xml >>> openoffice/trunk/main/xmerge/java/pocketword/build.xml >>> openoffice/trunk/main/xmerge/java/xmerge/build.xml >>> openoffice/trunk/main/xmerge/prj/build.lst >>> openoffice/trunk/main/xmerge/prj/d.lst >>> openoffice/trunk/main/xmerge/util/build.xml >>> >>> Modified: openoffice/trunk/main/Module_ooo.mk >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1847342&r1=1847341&r2=1847342&view=diff >>> ============================================================================== >>> --- openoffice/trunk/main/Module_ooo.mk (original) >>> +++ openoffice/trunk/main/Module_ooo.mk Sat Nov 24 07:58:57 2018 >>> @@ -109,6 +109,7 @@ $(eval $(call gb_Module_add_moduledirs,o >>> wizards \ >>> writerfilter \ >>> x11_extensions \ >>> + xmerge \ >>> xml2cmp \ >>> xmlhelp \ >>> xmloff \ >>> >>> Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1847342&r1=1847341&r2=1847342&view=diff >>> ============================================================================== >>> --- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original) >>> +++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Sat Nov 24 >>> 07:58:57 2018 >>> @@ -278,7 +278,7 @@ my_components += \ >>> component/xmlhelp/java/LuceneHelpWrapper/LuceneHelpWrapper \ >>> ScriptFramework \ >>> ScriptProviderForJava \ >>> - XMergeBridge \ >>> + component/xmerge/java/XMergeBridge/XMergeBridge \ >>> XSLTValidate \ >>> component/wizards/com/sun/star/wizards/agenda/agenda \ >>> component/wizards/com/sun/star/wizards/fax/fax \ >>> >>> Modified: openoffice/trunk/main/solenv/ant/aoo-ant.xml >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/ant/aoo-ant.xml?rev=1847342&r1=1847341&r2=1847342&view=diff >>> ============================================================================== >>> --- openoffice/trunk/main/solenv/ant/aoo-ant.xml (original) >>> +++ openoffice/trunk/main/solenv/ant/aoo-ant.xml Sat Nov 24 07:58:57 2018 >>> @@ -37,8 +37,10 @@ >>> <property name="build.base.dir" >>> location="${WORKDIR}/Ant/${ant.project.name}"/> >>> >>> <property name="main.src.dir" location="src/main/java"/> >>> + <property name="res.src.dir" location="src/main/resources"/> >>> <property name="idl.src.dir" location="src/main/idl"/> >>> <property name="test.src.dir" location="src/test/java"/> >>> + <property name="test-res.src.dir" location="src/test/resources"/> >>> <property name="test-idl.src.dir" location="src/test/idl"/> >>> >>> <property name="main.build.dir" location="${build.base.dir}/main"/> >>> @@ -93,23 +95,22 @@ >>> </path> >>> </target> >>> >>> + <target name="dependencies" depends="prepare"> >>> + <local name="has.main.classpath"/> >>> + <condition property="has.main.classpath"> >>> + <isreference refid="main.classpath"/> >>> + </condition> >>> + >>> + <pathconvert refid="main.classpath" setonempty="true" pathsep=" " >>> property="deps" if:set="has.main.classpath"/> >>> + <property name="dep" value=""/> >>> + <echo message="${deps}" file="${dependencies.outfile}"/> >>> + </target> >>> + >>> <target name="res" depends="prepare"> >>> <mkdir dir="${main.build.dir}"/> >>> - <copy todir="${main.build.dir}"> >>> - <fileset dir="${main.src.dir}"> >>> - <include name="**/*.properties"/> >>> - <include name="**/*.css"/> >>> - <include name="**/*.dtd"/> >>> - <include name="**/*.form"/> >>> - <include name="**/*.gif "/> >>> - <include name="**/*.htm"/> >>> - <include name="**/*.html"/> >>> - <include name="**/*.js"/> >>> - <include name="**/*.mod"/> >>> - <include name="**/*.sql"/> >>> - <include name="**/*.xml"/> >>> - <include name="**/*.xsl"/> >>> - <include name="**/*.map"/> >>> + <copy todir="${main.build.dir}" failonerror="false" quiet="true"> >>> + <fileset dir="${res.src.dir}"> >>> + <include name="**/*"/> >>> </fileset> >>> </copy> >>> </target> >>> @@ -160,7 +161,16 @@ >>> </sequential> >>> </macrodef> >>> >>> - <target name="test-idl" depends="pre-compile"> >>> + <target name="test-res" depends="pre-compile"> >>> + <mkdir dir="${test.build.dir}" unless:set="test.skip"/> >>> + <copy todir="${test.build.dir}" failonerror="false" quiet="true" >>> unless:set="test.skip"> >>> + <fileset dir="${test-res.src.dir}"> >>> + <include name="**/*"/> >>> + </fileset> >>> + </copy> >>> + </target> >>> + >>> + <target name="test-idl" depends="test-res"> >>> <fileset id="test-idl.files" dir="${test-idl.src.dir}" >>> includes="**/*.idl" erroronmissingdir="false"/> >>> <idl-javamaker >>> idlFiles="test-idl.files" >>> >>> Modified: openoffice/trunk/main/solenv/gbuild/Ant.mk >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/Ant.mk?rev=1847342&r1=1847341&r2=1847342&view=diff >>> ============================================================================== >>> --- openoffice/trunk/main/solenv/gbuild/Ant.mk (original) >>> +++ openoffice/trunk/main/solenv/gbuild/Ant.mk Sat Nov 24 07:58:57 2018 >>> @@ -46,6 +46,11 @@ $(call gb_Ant_get_target,%) : FORCE >>> FORCE: >>> >>> >>> +define gb_Ant_add_dependency >>> +$(1) : $(2) >>> + >>> +endef >>> + >>> # registers target and clean target >>> # adds jar files to DeliverLogTarget >>> # adds dependency for outdir target to workdir target (pattern rule for >>> delivery is in Package.mk) >>> @@ -61,6 +66,9 @@ $(eval $(call gb_Module_register_target, >>> $(call gb_Deliver_add_deliverable,$(call >>> gb_Jar_get_outdir_target,$(1)),$(call gb_Ant_get_target,$(1)),$(1)) >>> $(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Ant_get_target,$(1)) >>> >>> +__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -v >>> -Ddependencies.outfile=$(WORKDIR)/Ant/$(1)/deps -f $(2) dependencies) >>> +$$(eval $(foreach dep,$(file < $(WORKDIR)/Ant/$(1)/deps),$$(call >>> gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep)))) >>> + >>> endef >>> >>> >>> >>> Added: openoffice/trunk/main/xmerge/Ant_XMergeBridge.mk >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/Ant_XMergeBridge.mk?rev=1847342&view=auto >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/Ant_XMergeBridge.mk (added) >>> +++ openoffice/trunk/main/xmerge/Ant_XMergeBridge.mk Sat Nov 24 07:58:57 >>> 2018 >>> @@ -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_Ant_Ant,XMergeBridge,$(SRCDIR)/xmerge/java/XMergeBridge/build.xml)) >>> + >>> +$(eval $(call >>> gb_Ant_set_componentfile,XMergeBridge,xmerge/java/XMergeBridge/XMergeBridge,OOO)) >>> + >>> +# vim: set noet sw=4 ts=4: >>> + >>> >>> Added: openoffice/trunk/main/xmerge/Ant_aportisdoc.mk >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/Ant_aportisdoc.mk?rev=1847342&view=auto >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/Ant_aportisdoc.mk (added) >>> +++ openoffice/trunk/main/xmerge/Ant_aportisdoc.mk Sat Nov 24 07:58:57 2018 >>> @@ -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,aportisdoc,$(SRCDIR)/xmerge/java/aportisdoc/build.xml)) >>> + >>> +# vim: set noet sw=4 ts=4: >>> + >>> >>> Added: openoffice/trunk/main/xmerge/Ant_htmlsoff.mk >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/Ant_htmlsoff.mk?rev=1847342&view=auto >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/Ant_htmlsoff.mk (added) >>> +++ openoffice/trunk/main/xmerge/Ant_htmlsoff.mk Sat Nov 24 07:58:57 2018 >>> @@ -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,htmlsoff,$(SRCDIR)/xmerge/java/htmlsoff/build.xml)) >>> + >>> +# vim: set noet sw=4 ts=4: >>> + >>> >>> Added: openoffice/trunk/main/xmerge/Ant_pexcel.mk >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/Ant_pexcel.mk?rev=1847342&view=auto >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/Ant_pexcel.mk (added) >>> +++ openoffice/trunk/main/xmerge/Ant_pexcel.mk Sat Nov 24 07:58:57 2018 >>> @@ -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,pexcel,$(SRCDIR)/xmerge/java/pexcel/build.xml)) >>> + >>> +# vim: set noet sw=4 ts=4: >>> + >>> >>> Added: openoffice/trunk/main/xmerge/Ant_pocketword.mk >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/Ant_pocketword.mk?rev=1847342&view=auto >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/Ant_pocketword.mk (added) >>> +++ openoffice/trunk/main/xmerge/Ant_pocketword.mk Sat Nov 24 07:58:57 2018 >>> @@ -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,pocketword,$(SRCDIR)/xmerge/java/pocketword/build.xml)) >>> + >>> +# vim: set noet sw=4 ts=4: >>> + >>> >>> Added: openoffice/trunk/main/xmerge/Ant_xmerge-javadoc.mk >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/Ant_xmerge-javadoc.mk?rev=1847342&view=auto >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/Ant_xmerge-javadoc.mk (added) >>> +++ openoffice/trunk/main/xmerge/Ant_xmerge-javadoc.mk Sat Nov 24 07:58:57 >>> 2018 >>> @@ -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,xmerge-javadoc,$(SRCDIR)/xmerge/util/build.xml)) >>> + >>> +# vim: set noet sw=4 ts=4: >>> + >>> >>> Added: openoffice/trunk/main/xmerge/Ant_xmerge.mk >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/Ant_xmerge.mk?rev=1847342&view=auto >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/Ant_xmerge.mk (added) >>> +++ openoffice/trunk/main/xmerge/Ant_xmerge.mk Sat Nov 24 07:58:57 2018 >>> @@ -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,xmerge,$(SRCDIR)/xmerge/java/xmerge/build.xml)) >>> + >>> +# vim: set noet sw=4 ts=4: >>> + >>> >>> Added: openoffice/trunk/main/xmerge/Makefile >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/Makefile?rev=1847342&view=auto >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/Makefile (added) >>> +++ openoffice/trunk/main/xmerge/Makefile Sat Nov 24 07:58:57 2018 >>> @@ -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/xmerge/Makefile >>> ------------------------------------------------------------------------------ >>> svn:eol-style = native >>> >>> Added: openoffice/trunk/main/xmerge/Module_xmerge.mk >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/Module_xmerge.mk?rev=1847342&view=auto >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/Module_xmerge.mk (added) >>> +++ openoffice/trunk/main/xmerge/Module_xmerge.mk Sat Nov 24 07:58:57 2018 >>> @@ -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,xmerge)) >>> + >>> +$(eval $(call gb_Module_add_targets,xmerge,\ >>> + Ant_aportisdoc \ >>> + Ant_htmlsoff \ >>> + Ant_pexcel \ >>> + Ant_pocketword \ >>> + Ant_xmerge-javadoc \ >>> + Ant_xmerge \ >>> + Ant_XMergeBridge \ >>> + Package_xmergesync \ >>> +)) >>> + >>> + >>> +# vim: set noet sw=4 ts=4: >>> >>> Added: openoffice/trunk/main/xmerge/Package_xmergesync.mk >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/Package_xmergesync.mk?rev=1847342&view=auto >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/Package_xmergesync.mk (added) >>> +++ openoffice/trunk/main/xmerge/Package_xmergesync.mk Sat Nov 24 07:58:57 >>> 2018 >>> @@ -0,0 +1,25 @@ >>> +#************************************************************** >>> +# >>> +# 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,xmergesync,$(SRCDIR)/xmerge)) >>> +$(eval $(call >>> gb_Package_add_file,xmergesync,bin/xmergesync.dll,source/activesync/BIN/xmergesync.dll)) >>> >>> Modified: openoffice/trunk/main/xmerge/java/XMergeBridge/build.xml >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/java/XMergeBridge/build.xml?rev=1847342&r1=1847341&r2=1847342&view=diff >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/java/XMergeBridge/build.xml (original) >>> +++ openoffice/trunk/main/xmerge/java/XMergeBridge/build.xml Sat Nov 24 >>> 07:58:57 2018 >>> @@ -21,54 +21,23 @@ >>> ***********************************************************--> >>> >>> >>> + >>> +<project name="XMergeBridge" default="main" basedir="."> >>> >>> -<project name="XMergeBridge" default="all" basedir="."> >>> + <property file="../../../ant.properties"/> >>> + <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/> >>> >>> - <property file="../inc/antbuild.properties"/> >>> - >>> - <path id="classpath"> >>> - <pathelement location="${build.dir}/xmerge.jar"/> >>> - <pathelement location="${solar.jar}/unoil.jar"/> >>> - <pathelement location="${solar.jar}/ridl.jar"/> >>> - <pathelement location="${solar.jar}/jurt.jar"/> >>> - <pathelement location="${solar.jar}/juh.jar"/> >>> - </path> >>> - >>> - >>> - <target name="init" > >>> - <mkdir dir="${target.dir}"/> >>> - <echo >>> message="--------------------------------------------------------------------------------" >>> /> >>> - <echo message="debug is ${debug}"/> >>> - <echo >>> message="--------------------------------------------------------------------------------" >>> /> >>> - </target> >>> - >>> - <!-- compile java sources in ${package} --> >>> - <target name="compile" depends="init"> >>> - <javac srcdir="${src.dir}" >>> - destdir="${target.dir}" >>> - debug="${debug}" >>> - deprecation="${deprecation}" >>> - optimize="${optimize}"> >>> - <classpath refid="classpath"/> >>> - </javac> >>> - </target> >>> - >>> - <!-- package to jar --> >>> - <target name="jar" depends="compile"> >>> - <jar destfile="${target.jar}" >>> - manifest="manifest.mf"> >>> - <fileset dir="${target.dir}" >>> - includes="**/*.class" /> >>> - </jar> >>> - </target> >>> - >>> - <!-- clean up --> >>> - <target name="clean"> >>> - <delete dir="${class.dir}"/> >>> - <delete file="${target.jar}"/> >>> - </target> >>> - >>> - <target name="all" depends="jar"> >>> + <target name="init-project"> >>> + <property name="jar.classpath" value="xmerge.jar"/> >>> + <property name="jar.manifest" value="manifest.mf"/> >>> + >>> + <path id="main.classpath"> >>> + <pathelement location="${OUTDIR}/bin/xmerge.jar"/> >>> + <pathelement location="${OUTDIR}/bin/unoil.jar"/> >>> + <pathelement location="${OUTDIR}/bin/ridl.jar"/> >>> + <pathelement location="${OUTDIR}/bin/jurt.jar"/> >>> + <pathelement location="${OUTDIR}/bin/juh.jar"/> >>> + </path> >>> </target> >>> >>> </project> >>> >>> Modified: openoffice/trunk/main/xmerge/java/aportisdoc/build.xml >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/java/aportisdoc/build.xml?rev=1847342&r1=1847341&r2=1847342&view=diff >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/java/aportisdoc/build.xml (original) >>> +++ openoffice/trunk/main/xmerge/java/aportisdoc/build.xml Sat Nov 24 >>> 07:58:57 2018 >>> @@ -22,49 +22,16 @@ >>> >>> >>> >>> -<project name="aportisdoc" default="all" basedir="."> >>> +<project name="aportisdoc" default="main" basedir="."> >>> >>> - <property file="../inc/antbuild.properties"/> >>> - >>> - <path id="classpath"> >>> - <pathelement location="${build.dir}/xmerge.jar"/> >>> - </path> >>> + <property file="../../../ant.properties"/> >>> + <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/> >>> >>> - >>> - <target name="init" > >>> - <mkdir dir="${target.dir}"/> >>> - </target> >>> - >>> - <!-- compile java sources in ${package} --> >>> - <target name="compile" depends="init"> >>> - <javac srcdir="${src.dir}" >>> - destdir="${target.dir}" >>> - debug="${debug}" >>> - deprecation="${deprecation}" >>> - optimize="${optimize}"> >>> - <classpath refid="classpath"/> >>> - </javac> >>> - </target> >>> - >>> - <!-- package to jar --> >>> - <target name="jar" depends="compile"> >>> - <jar destfile="${target.jar}"> >>> - <fileset dir="${target.dir}" >>> - includes="**/*.class" /> >>> - <metainf dir="${basedir}"> >>> - <filename name="converter.xml"/> >>> - </metainf> >>> - </jar> >>> + <target name="init-project"> >>> + <path id="main.classpath"> >>> + <pathelement location="${OUTDIR}/bin/xmerge.jar"/> >>> + </path> >>> </target> >>> >>> - <!-- clean up --> >>> - <target name="clean"> >>> - <delete dir="${class.dir}"/> >>> - <delete file="${target.jar}"/> >>> - </target> >>> - >>> - <target name="all" depends="jar"> >>> - </target> >>> - >>> </project> >>> >>> >>> Modified: openoffice/trunk/main/xmerge/java/htmlsoff/build.xml >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/java/htmlsoff/build.xml?rev=1847342&r1=1847341&r2=1847342&view=diff >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/java/htmlsoff/build.xml (original) >>> +++ openoffice/trunk/main/xmerge/java/htmlsoff/build.xml Sat Nov 24 >>> 07:58:57 2018 >>> @@ -22,40 +22,13 @@ >>> >>> >>> >>> -<project name="htmlsoff" default="all" basedir="."> >>> +<project name="htmlsoff" default="main" basedir="."> >>> >>> - <property file="../inc/antbuild.properties"/> >>> - >>> - <path id="classpath"> >>> - <pathelement location="${build.dir}/xmerge.jar"/> >>> - </path> >>> + <property file="../../../ant.properties"/> >>> + <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/> >>> >>> - >>> - <target name="init" > >>> - </target> >>> - >>> - <!-- compile java sources in ${package} --> >>> - <target name="compile" depends="init"> >>> - </target> >>> - >>> - <!-- package to jar --> >>> - <target name="jar" depends="compile"> >>> - <jar destfile="${target.jar}"> >>> - <fileset dir="${basedir}" >>> - includes="*.xsl" /> >>> - <metainf dir="${basedir}"> >>> - <filename name="converter.xml"/> >>> - </metainf> >>> - </jar> >>> + <target name="init-project"> >>> </target> >>> >>> - <!-- clean up --> >>> - <target name="clean"> >>> - <delete file="${target.jar}"/> >>> - </target> >>> - >>> - <target name="all" depends="jar"> >>> - </target> >>> - >>> </project> >>> >>> >>> Modified: openoffice/trunk/main/xmerge/java/pexcel/build.xml >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/java/pexcel/build.xml?rev=1847342&r1=1847341&r2=1847342&view=diff >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/java/pexcel/build.xml (original) >>> +++ openoffice/trunk/main/xmerge/java/pexcel/build.xml Sat Nov 24 07:58:57 >>> 2018 >>> @@ -22,49 +22,16 @@ >>> >>> >>> >>> -<project name="pexcel" default="all" basedir="."> >>> - >>> - <property file="../inc/antbuild.properties"/> >>> - >>> - <path id="classpath"> >>> - <pathelement location="${build.dir}/xmerge.jar"/> >>> - </path> >>> +<project name="pexcel" default="main" basedir="."> >>> >>> + <property file="../../../ant.properties"/> >>> + <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/> >>> >>> - <target name="init" > >>> - <mkdir dir="${target.dir}"/> >>> + <target name="init-project"> >>> + <path id="main.classpath"> >>> + <pathelement location="${OUTDIR}/bin/xmerge.jar"/> >>> + </path> >>> </target> >>> >>> - <!-- compile java sources in ${package} --> >>> - <target name="compile" depends="init"> >>> - <javac srcdir="${src.dir}" >>> - destdir="${target.dir}" >>> - debug="${debug}" >>> - deprecation="${deprecation}" >>> - optimize="${optimize}"> >>> - <classpath refid="classpath"/> >>> - </javac> >>> - </target> >>> - >>> - <!-- package to jar --> >>> - <target name="jar" depends="compile"> >>> - <jar destfile="${target.jar}"> >>> - <fileset dir="${target.dir}" >>> - includes="**/*.class" /> >>> - <metainf dir="${basedir}"> >>> - <filename name="converter.xml"/> >>> - </metainf> >>> - </jar> >>> - </target> >>> - >>> - <!-- clean up --> >>> - <target name="clean"> >>> - <delete dir="${class.dir}"/> >>> - <delete file="${target.jar}"/> >>> - </target> >>> - >>> - <target name="all" depends="jar"> >>> - </target> >>> - >>> </project> >>> >>> >>> Modified: openoffice/trunk/main/xmerge/java/pocketword/build.xml >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/java/pocketword/build.xml?rev=1847342&r1=1847341&r2=1847342&view=diff >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/java/pocketword/build.xml (original) >>> +++ openoffice/trunk/main/xmerge/java/pocketword/build.xml Sat Nov 24 >>> 07:58:57 2018 >>> @@ -22,49 +22,16 @@ >>> >>> >>> >>> -<project name="pocketword" default="all" basedir="."> >>> +<project name="pocketword" default="main" basedir="."> >>> >>> - <property file="../inc/antbuild.properties"/> >>> - >>> - <path id="classpath"> >>> - <pathelement location="${build.dir}/xmerge.jar"/> >>> - </path> >>> + <property file="../../../ant.properties"/> >>> + <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/> >>> >>> - >>> - <target name="init" > >>> - <mkdir dir="${target.dir}"/> >>> - </target> >>> - >>> - <!-- compile java sources in ${package} --> >>> - <target name="compile" depends="init"> >>> - <javac srcdir="${src.dir}" >>> - destdir="${target.dir}" >>> - debug="${debug}" >>> - deprecation="${deprecation}" >>> - optimize="${optimize}"> >>> - <classpath refid="classpath"/> >>> - </javac> >>> - </target> >>> - >>> - <!-- package to jar --> >>> - <target name="jar" depends="compile"> >>> - <jar destfile="${target.jar}"> >>> - <fileset dir="${target.dir}" >>> - includes="**/*.class" /> >>> - <metainf dir="${basedir}"> >>> - <filename name="converter.xml"/> >>> - </metainf> >>> - </jar> >>> + <target name="init-project"> >>> + <path id="main.classpath"> >>> + <pathelement location="${OUTDIR}/bin/xmerge.jar"/> >>> + </path> >>> </target> >>> >>> - <!-- clean up --> >>> - <target name="clean"> >>> - <delete dir="${class.dir}"/> >>> - <delete file="${target.jar}"/> >>> - </target> >>> - >>> - <target name="all" depends="jar"> >>> - </target> >>> - >>> </project> >>> >>> >>> Modified: openoffice/trunk/main/xmerge/java/xmerge/build.xml >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/java/xmerge/build.xml?rev=1847342&r1=1847341&r2=1847342&view=diff >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/java/xmerge/build.xml (original) >>> +++ openoffice/trunk/main/xmerge/java/xmerge/build.xml Sat Nov 24 07:58:57 >>> 2018 >>> @@ -22,65 +22,24 @@ >>> >>> >>> >>> -<project name="xmerge" default="all" basedir="."> >>> +<project name="xmerge" default="main" basedir="."> >>> >>> - <property file="../inc/antbuild.properties"/> >>> + <property file="../../../ant.properties"/> >>> + <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/> >>> >>> - <property environment="env"/> >>> - <property name="env.XML_APIS_JAR" value="${solar.jar}/xml-apis.jar"/> >>> - <property name="env.XERCES_JAR" value="${solar.jar}/xercesImpl.jar"/> >>> - >>> - <path id="classpath"> >>> - <pathelement location="${env.XML_APIS_JAR}"/> >>> - <pathelement location="${env.XERCES_JAR}"/> >>> - <pathelement location="${solar.jar}/unoil.jar"/> >>> - <pathelement location="${solar.jar}/ridl.jar"/> >>> - <pathelement location="${solar.jar}/jurt.jar"/> >>> - <pathelement location="${solar.jar}/juh.jar"/> >>> - </path> >>> - >>> - >>> - <target name="init" > >>> - <mkdir dir="${target.dir}"/> >>> + <target name="init-project"> >>> + <property name="jar.classpath" value="xml-apis.jar xercesImpl.jar >>> serializer.jar"/> >>> + <property name="jar.manifest" value="manifest.mf"/> >>> + >>> + <path id="main.classpath"> >>> +<!-- <pathelement location="${OUTDIR}/bin/xml-apis.jar"/> --> >>> +<!-- <pathelement location="${OUTDIR}/bin/xercesImpl.jar"/> --> >>> + <pathelement location="${OUTDIR}/bin/unoil.jar"/> >>> + <pathelement location="${OUTDIR}/bin/ridl.jar"/> >>> + <pathelement location="${OUTDIR}/bin/juh.jar"/> >>> + <pathelement location="${OUTDIR}/bin/jurt.jar"/> >>> + </path> >>> </target> >>> >>> - <!-- compile java sources in ${package} --> >>> - <target name="compile" depends="init"> >>> - <javac srcdir="${src.dir}" >>> - destdir="${target.dir}" >>> - debug="${debug}" >>> - deprecation="${deprecation}" >>> - optimize="${optimize}"> >>> - <classpath refid="classpath"/> >>> - </javac> >>> - </target> >>> - >>> - <!-- package to jar --> >>> - <target name="jar" depends="compile"> >>> - <jar destfile="${target.jar}"> >>> - <fileset dir="${target.dir}" >>> - includes="**/*.class" /> >>> - <fileset dir="${src.dir}" >>> - includes="**/*.properties" /> >>> - <manifest> >>> - <attribute name="Main-Class" >>> value="org.openoffice.xmerge.test.Driver"/> >>> - <attribute name="Specification-Title" value="Apache >>> OpenOffice XMerge Framework"/> >>> - <attribute name="Specification-Vendor" value="Apache >>> OpenOffice"/> >>> - <attribute name="Specification-Version" value="0.6.0"/> >>> - <attribute name="Implementation-Version" >>> value="#IMPL-VERSION#"/> >>> - <attribute name="Class-Path" value="xml-apis.jar >>> xercesImpl.jar serializer.jar"/> >>> - </manifest> >>> - </jar> >>> - </target> >>> - >>> - <!-- clean up --> >>> - <target name="clean"> >>> - <delete dir="${class.dir}"/> >>> - <delete file="${target.jar}"/> >>> - </target> >>> - >>> - <target name="all" depends="jar"> >>> - </target> >>> - >>> </project> >>> >>> >>> Added: openoffice/trunk/main/xmerge/java/xmerge/manifest.mf >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/java/xmerge/manifest.mf?rev=1847342&view=auto >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/java/xmerge/manifest.mf (added) >>> +++ openoffice/trunk/main/xmerge/java/xmerge/manifest.mf Sat Nov 24 >>> 07:58:57 2018 >>> @@ -0,0 +1,6 @@ >>> +Main-Class: org.openoffice.xmerge.test.Driver >>> +Specification-Title: Apache OpenOffice XMerge Framework >>> +Specification-Vendor: Apache OpenOffice >>> +Specification-Version: 0.6.0 >>> +Implementation-Version: #IMPL-VERSION# >>> + >>> >>> Propchange: openoffice/trunk/main/xmerge/java/xmerge/manifest.mf >>> ------------------------------------------------------------------------------ >>> svn:eol-style = native >>> >>> Modified: openoffice/trunk/main/xmerge/prj/build.lst >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/prj/build.lst?rev=1847342&r1=1847341&r2=1847342&view=diff >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/prj/build.lst (original) >>> +++ openoffice/trunk/main/xmerge/prj/build.lst Sat Nov 24 07:58:57 2018 >>> @@ -1,11 +1,2 @@ >>> xmrg xmerge : solenv unoil javaunohelper LIBXSLT:libxslt NULL >>> -xmrg xmerge usr1 - all xmrg_mkout NULL >>> -xmrg xmerge\inc nmake - all xmrg_inc NULL >>> -xmrg xmerge\source\xmerge nmake - all xmrg_xmerge xmrg_inc NULL >>> -xmrg xmerge\source\bridge nmake - all xmrg_bridge xmrg_xmerge >>> xmrg_inc NULL >>> -xmrg xmerge\source\aportisdoc nmake - all xmrg_aportis xmrg_xmerge >>> xmrg_inc NULL >>> -xmrg xmerge\source\pexcel nmake - all xmrg_pexcel xmrg_xmerge >>> xmrg_inc NULL >>> -xmrg xmerge\source\pocketword nmake - all xmrg_pword xmrg_xmerge >>> xmrg_inc NULL >>> -xmrg xmerge\source\htmlsoff nmake - all xmrg_htmlsoff xmrg_inc NULL >>> -xmrg xmerge\source\activesync nmake - all xmrg_activesync xmrg_inc >>> NULL >>> -xmrg xmerge\util nmake - all xmrg_util xmrg_xmerge >>> xmrg_bridge xmrg_aportis xmrg_pexcel xmrg_pword NULL >>> +xmrg xmerge\prj nmake - all xmrg_prj NULL >>> >>> Modified: openoffice/trunk/main/xmerge/prj/d.lst >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/prj/d.lst?rev=1847342&r1=1847341&r2=1847342&view=diff >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/prj/d.lst (original) >>> +++ openoffice/trunk/main/xmerge/prj/d.lst Sat Nov 24 07:58:57 2018 >>> @@ -1,12 +0,0 @@ >>> -..\%__SRC%\class\xmerge.jar %_DEST%\bin%_EXT%\xmerge.jar >>> -..\%__SRC%\class\pexcel.jar %_DEST%\bin%_EXT%\pexcel.jar >>> -..\%__SRC%\class\htmlsoff.jar %_DEST%\bin%_EXT%\htmlsoff.jar >>> -..\%__SRC%\class\aportisdoc.jar %_DEST%\bin%_EXT%\aportisdoc.jar >>> -..\%__SRC%\class\XMergeBridge.jar %_DEST%\bin%_EXT%\XMergeBridge.jar >>> -..\%__SRC%\class\pocketword.jar %_DEST%\bin%_EXT%\pocketword.jar >>> -..\%__SRC%\bin\xmergesync.dll %_DEST%\bin%_EXT%\xmergesync.dll >>> -mkdir: %_DEST%\doc%_EXT%\xmerge >>> -..\%__SRC%\doc\javadoc\package-list %_DEST%\doc%_EXT%\xmerge\package-list >>> -..\%__SRC%\doc\xmerge_javadoc.zip %_DEST%\doc%_EXT%\xmerge_javadoc.zip >>> -..\%__SRC%\doc\writer2latex_javadoc.zip >>> %_DEST%\doc%_EXT%\writer2latex_javadoc.zip >>> -..\%__SRC%\misc\XMergeBridge.component >>> %_DEST%\xml%_EXT%\XMergeBridge.component >>> >>> Added: openoffice/trunk/main/xmerge/prj/makefile.mk >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/prj/makefile.mk?rev=1847342&view=auto >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/prj/makefile.mk (added) >>> +++ openoffice/trunk/main/xmerge/prj/makefile.mk Sat Nov 24 07:58:57 2018 >>> @@ -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 >>> >>> Modified: openoffice/trunk/main/xmerge/util/build.xml >>> URL: >>> http://svn.apache.org/viewvc/openoffice/trunk/main/xmerge/util/build.xml?rev=1847342&r1=1847341&r2=1847342&view=diff >>> ============================================================================== >>> --- openoffice/trunk/main/xmerge/util/build.xml (original) >>> +++ openoffice/trunk/main/xmerge/util/build.xml Sat Nov 24 07:58:57 2018 >>> @@ -21,24 +21,23 @@ >>> ***********************************************************--> >>> >>> >>> -<project name="xmrg_util" default="main" basedir="."> >>> +<project name="xmerge-javadoc" default="main" basedir="."> >>> + >>> + <property file="../../ant.properties"/> >>> + <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/> >>> >>> <property file="../source/inc/antbuild.properties"/> >>> >>> - <property name="javadoc.dir" location="${build.dir}/javadoc"/> >>> + <property name="javadoc.dir" location="${WORKDIR}/Ant/xmerge-javadoc"/> >>> >>> - <property environment="env"/> >>> - <property name="env.XML_APIS_JAR" value="${solar.jar}/xml-apis.jar"/> >>> - <property name="env.XERCES_JAR" value="${solar.jar}/xercesImpl.jar"/> >>> - >>> - <path id="classpath"> >>> - <pathelement location="${env.XML_APIS_JAR}"/> >>> - <pathelement location="${env.XERCES_JAR}"/> >>> - <pathelement location="${solar.jar}/unoil.jar"/> >>> - <pathelement location="${solar.jar}/ridl.jar"/> >>> - <pathelement location="${solar.jar}/jurt.jar"/> >>> - <pathelement location="${solar.jar}/juh.jar"/> >>> - <pathelement location="${build.dir}/xmerge.jar"/> >>> + <path id="main.classpath"> >>> +<!-- <pathelement location="${OUTDIR}/bin/xml-apis.jar"/> --> >>> +<!-- <pathelement location="${OUTDIR}/bin/xercesImpl.jar"/> --> >>> + <pathelement location="${OUTDIR}/bin/unoil.jar"/> >>> + <pathelement location="${OUTDIR}/bin/ridl.jar"/> >>> + <pathelement location="${OUTDIR}/bin/jurt.jar"/> >>> + <pathelement location="${OUTDIR}/bin/juh.jar"/> >>> + <pathelement location="${OUTDIR}/bin/xmerge.jar"/> >>> </path> >>> >>> <target name="init"> >>> @@ -55,20 +54,20 @@ >>> use="true" >>> Doctitle="Apache OpenOffice XMerge API" >>> windowtitle="Apache OpenOffice XMerge API" >>> - classpathref="classpath"> >>> - <fileset dir="../source/bridge" defaultexcludes="yes"> >>> + classpathref="main.classpath"> >>> + <fileset dir="../java/XMergeBridge/src/main/java" >>> defaultexcludes="yes"> >>> <include name="**/*.java"/> >>> </fileset> >>> - <fileset dir="../source/xmerge" defaultexcludes="yes"> >>> + <fileset dir="../java/xmerge/src/main/java" >>> defaultexcludes="yes"> >>> <include name="**/*.java"/> >>> </fileset> >>> - <fileset dir="../source/aportisdoc" defaultexcludes="yes"> >>> + <fileset dir="../java/aportisdoc/src/main/java" >>> defaultexcludes="yes"> >>> <include name="**/*.java"/> >>> </fileset> >>> - <fileset dir="../source/pexcel" defaultexcludes="yes"> >>> + <fileset dir="../java/pexcel/src/main/java" >>> defaultexcludes="yes"> >>> <include name="**/*.java"/> >>> </fileset> >>> - <fileset dir="../source/pocketword" defaultexcludes="yes"> >>> + <fileset dir="../java/pocketword/src/main/java" >>> defaultexcludes="yes"> >>> <include name="**/*.java"/> >>> </fileset> >>> <link offline="true" >>> href="http://java.sun.com/j2se/1.3/docs/api"; >>> packagelistLoc="${solar.doc}/jdk13"/> >>> @@ -78,6 +77,24 @@ >>> </target> >>> >>> <target name="main" depends="javadoc"> >>> + <jar destfile="${jar.dir}/${ant.project.name}.jar" >>> + duplicate="fail"> >>> + <fileset dir="${javadoc.dir}"/> >>> + <include name="**/*.class"/> >>> + <include name="**/*.properties"/> >>> + <include name="**/*.css"/> >>> + <include name="**/*.dtd"/> >>> + <include name="**/*.form"/> >>> + <include name="**/*.gif "/> >>> + <include name="**/*.htm"/> >>> + <include name="**/*.html"/> >>> + <include name="**/*.js"/> >>> + <include name="**/*.mod"/> >>> + <include name="**/*.sql"/> >>> + <include name="**/*.xml"/> >>> + <include name="**/*.xsl"/> >>> + <include name="**/*.map"/> >>> + </jar> >>> </target> >>> >>> <target name="all" depends="javadoc"> >>> >>> >>> > -- Mechtilde Stehmann ## Apache OpenOffice ## Freie Office Suite für Linux, MacOSX, Windows ## Debian Developer ## Loook, calender-exchange-provider, libreoffice-canzeley-client ## PGP encryption welcome ## F0E3 7F3D C87A 4998 2899 39E7 F287 7BBA 141A AD7F
signature.asc
Description: OpenPGP digital signature
