commit: b53a3d844a9f3b061334a287b2ab77f8bcd6aae6
Author: Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 13:09:51 2020 +0000
Commit: Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 13:09:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b53a3d84
dev-lang/tuprolog: consolidate build.xml instructions
Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Keri Harris <keri <AT> gentoo.org>
dev-lang/tuprolog/files/build-3.0.1.xml | 110 -----------------------------
dev-lang/tuprolog/files/build-3.1.0.xml | 110 -----------------------------
dev-lang/tuprolog/tuprolog-3.0.1.ebuild | 4 +-
dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild | 2 +-
dev-lang/tuprolog/tuprolog-3.1.0.ebuild | 4 +-
5 files changed, 5 insertions(+), 225 deletions(-)
diff --git a/dev-lang/tuprolog/files/build-3.0.1.xml
b/dev-lang/tuprolog/files/build-3.0.1.xml
deleted file mode 100644
index 3b6f5818eaa..00000000000
--- a/dev-lang/tuprolog/files/build-3.0.1.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" ?><project default="jar" name="tuprolog">
-
- <!-- some properties -->
- <property name="src.dir" value="src"/>
- <property name="build.dir" value="build"/>
- <property name="docs.dir" value="docs"/>
- <property name="dist.dir" value="dist"/>
- <property name="test.dir" value="test"/>
- <property name="test.build.dir" value="test.build"/>
- <property name="jarfile" value="${ant.project.name}.jar"/>
- <property file="build.properties"/>
-
- <path id="compile.classpath">
- <fileset dir="lib" includes="*.jar"/>
- <pathelement path="${gentoo.classpath}"/>
- </path>
-
- <!-- init -->
- <target name="init">
- <tstamp/>
- <mkdir dir="${dist.dir}"/>
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${docs.dir}"/>
- <mkdir dir="${test.build.dir}"/>
- </target>
-
- <!-- compile everything -->
- <target depends="init" name="compile">
- <javac deprecation="off"
- destdir="${build.dir}"
- encoding="ISO-8859-1"
- srcdir="${src.dir}"
- source="1.8"
- target="1.8">
- <classpath>
- <path refid="compile.classpath"/>
- </classpath>
- </javac>
- <copy todir="${build.dir}">
- <fileset dir="${src.dir}">
- <exclude name="**/*.java"/>
- </fileset>
- </copy>
- </target>
-
- <!-- build the jar file -->
- <target depends="compile" name="jar">
- <jar basedir="${build.dir}" jarfile="${dist.dir}/${jarfile}"/>
- <jar basedir="${build.dir}" jarfile="${dist.dir}/2p.jar">
- <manifest>
- <attribute name="Main-Class"
value="alice.tuprologx.ide.GUILauncher"/>
- <attribute name="Class-Path" value="."/>
- </manifest>
- <zipgroupfileset dir="lib" includes="*.jar"/>
- </jar>
- </target>
-
- <!-- generate javadocs -->
- <target depends="init" name="javadoc">
- <javadoc
- author="false"
- destdir="${docs.dir}"
- encoding="ISO-8859-1"
- breakiterator="yes"
- packagenames="alice.*"
- sourcepath="${src.dir}"
- use="true"
- version="true"
- verbose="no"
- windowtitle="${ant.project.name} API">
- <classpath>
- <path refid="compile.classpath"/>
- </classpath>
- </javadoc>
- </target>
-
- <!-- clean up -->
- <target name="clean">
- <delete dir="${build.dir}"/>
- <delete dir="${dist.dir}"/>
- <delete dir="${docs.dir}"/>
- <delete dir="${test.build.dir}"/>
- </target>
-
- <!-- run testsuite -->
- <target name="test">
- <path id="dist.classpath">
- <fileset dir="${dist.dir}">
- <include name="*.jar"/>
- </fileset>
- </path>
- <javac classpathref="dist.classpath"
- deprecation="off"
- destdir="${test.build.dir}"
- encoding="ISO-8859-1"
- srcdir="${test.dir}/unit"
- source="1.8"
- target="1.8"/>
- <junit fork="yes" failureproperty="test.failed"
printsummary="yes">
- <classpath>
- <path refid="dist.classpath"/>
- <pathelement path="${test.build.dir}"/>
- </classpath>
- <formatter type="xml"/>
- <test name="alice.tuprolog.TuPrologTestSuite"
todir="${test.build.dir}"/>
- <test name="alice.tuprolog.ExceptionsTestSuite"
todir="${test.build.dir}"/>
- </junit>
- <fail message="Test failure(s) detected" if="test.failed" />
- </target>
-</project>
diff --git a/dev-lang/tuprolog/files/build-3.1.0.xml
b/dev-lang/tuprolog/files/build-3.1.0.xml
deleted file mode 100644
index 3b6f5818eaa..00000000000
--- a/dev-lang/tuprolog/files/build-3.1.0.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" ?><project default="jar" name="tuprolog">
-
- <!-- some properties -->
- <property name="src.dir" value="src"/>
- <property name="build.dir" value="build"/>
- <property name="docs.dir" value="docs"/>
- <property name="dist.dir" value="dist"/>
- <property name="test.dir" value="test"/>
- <property name="test.build.dir" value="test.build"/>
- <property name="jarfile" value="${ant.project.name}.jar"/>
- <property file="build.properties"/>
-
- <path id="compile.classpath">
- <fileset dir="lib" includes="*.jar"/>
- <pathelement path="${gentoo.classpath}"/>
- </path>
-
- <!-- init -->
- <target name="init">
- <tstamp/>
- <mkdir dir="${dist.dir}"/>
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${docs.dir}"/>
- <mkdir dir="${test.build.dir}"/>
- </target>
-
- <!-- compile everything -->
- <target depends="init" name="compile">
- <javac deprecation="off"
- destdir="${build.dir}"
- encoding="ISO-8859-1"
- srcdir="${src.dir}"
- source="1.8"
- target="1.8">
- <classpath>
- <path refid="compile.classpath"/>
- </classpath>
- </javac>
- <copy todir="${build.dir}">
- <fileset dir="${src.dir}">
- <exclude name="**/*.java"/>
- </fileset>
- </copy>
- </target>
-
- <!-- build the jar file -->
- <target depends="compile" name="jar">
- <jar basedir="${build.dir}" jarfile="${dist.dir}/${jarfile}"/>
- <jar basedir="${build.dir}" jarfile="${dist.dir}/2p.jar">
- <manifest>
- <attribute name="Main-Class"
value="alice.tuprologx.ide.GUILauncher"/>
- <attribute name="Class-Path" value="."/>
- </manifest>
- <zipgroupfileset dir="lib" includes="*.jar"/>
- </jar>
- </target>
-
- <!-- generate javadocs -->
- <target depends="init" name="javadoc">
- <javadoc
- author="false"
- destdir="${docs.dir}"
- encoding="ISO-8859-1"
- breakiterator="yes"
- packagenames="alice.*"
- sourcepath="${src.dir}"
- use="true"
- version="true"
- verbose="no"
- windowtitle="${ant.project.name} API">
- <classpath>
- <path refid="compile.classpath"/>
- </classpath>
- </javadoc>
- </target>
-
- <!-- clean up -->
- <target name="clean">
- <delete dir="${build.dir}"/>
- <delete dir="${dist.dir}"/>
- <delete dir="${docs.dir}"/>
- <delete dir="${test.build.dir}"/>
- </target>
-
- <!-- run testsuite -->
- <target name="test">
- <path id="dist.classpath">
- <fileset dir="${dist.dir}">
- <include name="*.jar"/>
- </fileset>
- </path>
- <javac classpathref="dist.classpath"
- deprecation="off"
- destdir="${test.build.dir}"
- encoding="ISO-8859-1"
- srcdir="${test.dir}/unit"
- source="1.8"
- target="1.8"/>
- <junit fork="yes" failureproperty="test.failed"
printsummary="yes">
- <classpath>
- <path refid="dist.classpath"/>
- <pathelement path="${test.build.dir}"/>
- </classpath>
- <formatter type="xml"/>
- <test name="alice.tuprolog.TuPrologTestSuite"
todir="${test.build.dir}"/>
- <test name="alice.tuprolog.ExceptionsTestSuite"
todir="${test.build.dir}"/>
- </junit>
- <fail message="Test failure(s) detected" if="test.failed" />
- </target>
-</project>
diff --git a/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
b/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
index 8ca8d7d6bb7..411a1f875b0 100644
--- a/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
+++ b/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -35,7 +35,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-no-ikvm.patch
epatch "${FILESDIR}"/${P}-oolibrary-unit-test.patch
- cp "${FILESDIR}"/build-${PV}.xml "${S}"/build.xml || die
+ cp "${FILESDIR}"/build-3.x.xml "${S}"/build.xml || die
}
src_compile() {
diff --git a/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild
b/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild
index c6c38fcd1e6..4f6dd3c988e 100644
--- a/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild
+++ b/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
eapply "${FILESDIR}"/${P}-test-suite.patch
eapply_user
- cp "${FILESDIR}"/build-${PV}.xml "${S}"/build.xml || die
+ cp "${FILESDIR}"/build-3.x.xml "${S}"/build.xml || die
}
src_compile() {
diff --git a/dev-lang/tuprolog/tuprolog-3.1.0.ebuild
b/dev-lang/tuprolog/tuprolog-3.1.0.ebuild
index d04f8f0fad1..d22edc7d11f 100644
--- a/dev-lang/tuprolog/tuprolog-3.1.0.ebuild
+++ b/dev-lang/tuprolog/tuprolog-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -34,7 +34,7 @@ EANT_GENTOO_CLASSPATH="javassist:3,commons-lang-3.1"
src_prepare() {
epatch "${FILESDIR}"/${P}-no-ikvm.patch
- cp "${FILESDIR}"/build-${PV}.xml "${S}"/build.xml || die
+ cp "${FILESDIR}"/build-3.x.xml "${S}"/build.xml || die
}
src_compile() {
