diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2021-08-26 08:10:15 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2021-08-26 10:55:15 +0200 |
commit | 60b32d931da91a25e7f8912c36c48ba8302e6a43 (patch) | |
tree | 386be84aeacecc61053101f872b1c1863b3ad4c7 /odk | |
parent | ccd2de75987bae25b34a0d7d22322cada796bb3e (diff) |
Remove spurious odk/examples/java/MinimalComponent/BuildMinimalComponent.xml
It had been added together with odk/examples/java/MinimalComponent/Makefile in
ff4c86ff37af5136466d49a9fb394974ee62cb0f "Added an example for a minimal UNO
component", and it apparently is an Ant build script that shall do the same as
the Makefile. However, it is apparently unused: For one, it does not
appear to get referenced from anywhere else in the code or to get mentioned at
<https://wiki.openoffice.org/wiki/Documentation/DevGuide/OpenOffice.org_Developers_Guide>.
And for another, it would apparently only work on Windows (using e.g.
"${ODKPATH}/windows/bin/idlc.exe"), but would typically fail even there with
something like
> > ant -f BuildMinimalComponent.xml
> Buildfile: C:\lo\core\instdir\sdk\examples\java\MinimalComponent\BuildMinimalComponent.xml
>
> init:
>
> unoidl:
>
> BUILD FAILED
> C:\lo\core\instdir\sdk\examples\java\MinimalComponent\BuildMinimalComponent.xml:35: The directory D:\cvs\api\odk\WINexample.out\misc does not exist
due to the hardcoded D:/cvs/api/odk paths.
Change-Id: Idd020bcf1a2383295704b208d3ac2be047f270ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121050
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'odk')
-rw-r--r-- | odk/Package_examples.mk | 1 | ||||
-rw-r--r-- | odk/examples/java/MinimalComponent/BuildMinimalComponent.xml | 76 |
2 files changed, 0 insertions, 77 deletions
diff --git a/odk/Package_examples.mk b/odk/Package_examples.mk index e2cb4bd4c7a1..9b752f2387ed 100644 --- a/odk/Package_examples.mk +++ b/odk/Package_examples.mk @@ -483,7 +483,6 @@ $(eval $(call gb_Package_add_files_with_dir,odk_examples,$(SDKDIRNAME)/examples, java/Inspector/images/properties_16.png \ java/Inspector/images/services_16.png \ java/Inspector/manifest.mf \ - java/MinimalComponent/BuildMinimalComponent.xml \ java/MinimalComponent/Makefile \ java/MinimalComponent/MinimalComponent.components \ java/MinimalComponent/MinimalComponent.idl \ diff --git a/odk/examples/java/MinimalComponent/BuildMinimalComponent.xml b/odk/examples/java/MinimalComponent/BuildMinimalComponent.xml deleted file mode 100644 index 10dfde5ecee4..000000000000 --- a/odk/examples/java/MinimalComponent/BuildMinimalComponent.xml +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * 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 . ---> -<project name="MinimalComponent" basedir="." default="all"> - - <target name="init"> - <!-- - In this target you have to change all parts, so that the properties - fit to your odk installation and to your service - --> - <property name="ODKPATH" value="D:/cvs/api/odk"/> - <property name="OUTPUTPATH" value="D:/cvs/api/odk/WINexample.out"/> - <property name="PACKAGE_NAME" value="org.OpenOffice."/> - <property name="JAR_FILE_NAME" value="MinimalComponent"/> - <property name="INTERFACE_NAME" value="MinimalComponent"/> - <property name="RDB_NAME" value="MinimalComponent.rdb"/> - </target> - <target depends="init" name="unoidl"> - - <exec dir="${ODKPATH}/WINexample.out/misc/" executable="${ODKPATH}/windows/bin/idlc.exe" timeout="600"> - <arg line="-I. -I${ODKPATH}/idl ${ODKPATH}/examples/java/MinimalComponent/${INTERFACE_NAME}.idl"/> - </exec> - - <exec dir="." executable="${ODKPATH}/windows/bin/regmerge.exe" timeout="600"> - <arg line="./${RDB_NAME} /UCR ./${INTERFACE_NAME}.urd"/> - </exec> - - <exec dir="." executable="${ODKPATH}/windows/bin/regmerge.exe" timeout="600"> - <arg line="./${RDB_NAME} / ${ODKPATH}/windows/bin/applicat.rdb"/> - </exec> - - <exec dir="." executable="${ODKPATH}/windows/bin/javamaker.exe" timeout="600"> - <arg line="-O${OUTPUTPATH}/class/${INTERFACE_NAME} -nD ./${RDB_NAME}"/> -<!-- - <arg line="-T${PACKAGE_NAME}${INTERFACE_NAME} -O${OUTPUTPATH}/class/${INTERFACE_NAME} -nD ./${INTERFACE_NAME}.urd"/> - --> - </exec> - - </target> - - <target depends="init,unoidl" name="compile"> - <mkdir dir="classes"/> - <javac debug="on" destdir="./classes" srcdir="." > - <classpath> - <fileset dir="${ODKPATH}/classes/"> - <include name="**/*.jar"/> - </fileset> - <pathelement location="./classes"/> - </classpath> - </javac> - </target> - - <target depends="compile,init" name="jar"> - <jar basedir="./classes" compress="true" jarfile="${JAR_FILE_NAME}.jar" manifest="Manifest"> - </jar> - </target> - - <target depends="compile,init,jar" name="all"> - <!-- WRITEME --> - </target> -</project> |