Fridrich Strba 2022-03-20 12:42:34 +00:00 committed by Git OBS Bridge
parent 0a7407ba49
commit b912e1bced
7 changed files with 126 additions and 422 deletions

View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
<!-- ====================================================================== -->
<project name="jtidy" default="package" basedir=".">
<!-- ====================================================================== -->
<!-- Import maven-build.xml into the current project -->
<!-- ====================================================================== -->
<import file="maven-build.xml"/>
<!-- ====================================================================== -->
<!-- Help target -->
<!-- ====================================================================== -->
<target name="help">
<echo message="Please run: $ant -projecthelp"/>
</target>
</project>

111
jtidy-build.xml Normal file
View File

@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="jtidy" default="package" basedir=".">
<!-- ====================================================================== -->
<!-- Build environment properties -->
<!-- ====================================================================== -->
<property name="build.finalName" value="jtidy-8.0"/>
<property name="build.dir" value="target"/>
<property name="build.outputDir" value="${build.dir}/classes"/>
<property name="build.srcDir" value="src/main/java"/>
<property name="build.resourceDir" value="src/main/resources"/>
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
<!-- ====================================================================== -->
<!-- Defining classpaths -->
<!-- ====================================================================== -->
<path id="build.classpath">
<fileset dir="lib">
<include name="**/*"/>
</fileset>
</path>
<!-- ====================================================================== -->
<!-- Cleaning up target -->
<!-- ====================================================================== -->
<target name="clean" description="Clean the output directory">
<delete dir="${build.dir}"/>
</target>
<!-- ====================================================================== -->
<!-- Compilation target -->
<!-- ====================================================================== -->
<target name="compile" description="Compile the code">
<mkdir dir="${build.outputDir}"/>
<javac destdir="${build.outputDir}"
encoding="UTF8"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
target="1.8"
verbose="false"
fork="false"
source="1.8">
<src>
<pathelement location="${build.srcDir}"/>
</src>
<classpath refid="build.classpath"/>
</javac>
<copy todir="${build.outputDir}">
<fileset dir="${build.resourceDir}"/>
</copy>
</target>
<!-- ====================================================================== -->
<!-- Javadoc target -->
<!-- ====================================================================== -->
<target name="javadoc" description="Generates the Javadoc of the application">
<javadoc sourcepath="${build.srcDir}"
packagenames="*"
destdir="${reporting.outputDirectory}/apidocs"
access="protected"
verbose="false"
version="true"
use="true"
author="true"
splitindex="false"
nodeprecated="false"
nodeprecatedlist="false"
notree="false"
noindex="false"
nohelp="false"
nonavbar="false"
serialwarn="false"
source="1.8"
encoding="UTF8"
linksource="false"
breakiterator="false"/>
</target>
<!-- ====================================================================== -->
<!-- Package target -->
<!-- ====================================================================== -->
<target name="package" depends="compile" description="Package the application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
basedir="${build.outputDir}"
excludes="**/package.html">
<manifest>
<attribute name="Main-Class"
value="org.w3c.tidy.Tidy"/>
</manifest>
</jar>
</target>
<!-- ====================================================================== -->
<!-- A dummy target for the package named after the type it creates -->
<!-- ====================================================================== -->
<target name="jar" depends="package" description="Builds the jar for the application"/>
</project>

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Mar 20 12:39:53 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with java source and target levels 8
- Rewamp and simplify the build system
-------------------------------------------------------------------
Mon Oct 29 09:36:38 UTC 2018 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,26 +0,0 @@
#!/bin/sh
#
# JTidy script
# JPackage Project <http://www.jpackage.org/>
# $Id: jtidy.jtidy.script,v 1.1 2002/08/30 20:27:06 scop Exp $
# Source functions library
if [ -f /usr/share/java-utils/java-functions ] ; then
. /usr/share/java-utils/java-functions
else
echo "Can't find functions library, aborting"
exit 1
fi
# Configuration
MAIN_CLASS=org.w3c.tidy.Tidy
BASE_JARS="jtidy xerces-j2 xml-commons-apis"
# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
# Let's start
run "$@"

View File

@ -1,7 +1,7 @@
#
# spec file for package jtidy
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -34,10 +34,7 @@ URL: http://jtidy.sourceforge.net/
# # bnc#501764
# rm jtidy/src/config/clover.license
Source0: jtidy-r813.tar.bz2
Source1: %{name}.jtidy.script
Source2: build.xml
Source3: maven-build.properties
Source4: maven-build.xml
Source1: jtidy-build.xml
BuildRequires: ant >= 1.6
BuildRequires: ant-junit
BuildRequires: fdupes
@ -78,33 +75,19 @@ DOM parser for real-world HTML.
%prep
%setup -q -n %{name}
cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} .
sed -i 's/charset="ISO-8859-1"/charset="UTF-8"/' maven-build.xml
cp -p %{SOURCE1} build.xml
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
if [ `uname -m` = "ppc64" -o `uname -m` = "ppc64le" ];then
export ANT_OPTS="-Xss2m"
else
export ANT_OPTS="-Xss1m"
fi
export CLASSPATH=$(build-classpath junit slf4j xerces-j2 xml-commons-jaxp-1.3-apis):`pwd`/target/classes:`pwd`/target/test-classes
export OPT_JAR_LIST="junit ant/ant-junit"
mkdir -p lib
build-jar-repository -s lib xerces-j2 xml-commons-jaxp-1.3-apis
%{ant} \
-Dbuild.sysclasspath=only \
-Dmaven.mode.offline=true \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven.test.skip=true \
-Dmaven.test.error.ignore=true \
package javadoc
%install
# jar
install -d -m 0755 %{buildroot}%{_javadir}
install -m 644 target/jtidy-8.0-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}.jar
install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
@ -117,25 +100,17 @@ cp -aL target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
# shell script
install -d -m 0755 %{buildroot}%{_bindir}
install -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
%jpackage_script org.w3c.tidy.Tidy "" "" %{name}:xerces-j2:xml-apis %{name} true
# ant.d
install -d -m 0755 %{buildroot}%{_sysconfdir}/ant.d
cat > %{buildroot}%{_sysconfdir}/ant.d/%{name} << EOF
jtidy xerces-j2 xml-commons-jaxp-1.3-apis
jtidy xerces-j2 xml-apis
EOF
%files
%defattr(0644,root,root,0755)
%files -f .mfiles
%license LICENSE.txt
%{_javadir}/%{name}.jar
%{_mavenpomdir}/*
%if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}
%else
%{_datadir}/maven-metadata/%{name}.xml*
%endif
%config(noreplace) %{_sysconfdir}/ant.d/%{name}
%files javadoc

View File

@ -1,17 +0,0 @@
#Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
#Thu Oct 02 12:28:05 EDT 2008
project.build.outputDirectory=${maven.build.outputDir}
project.build.directory=${maven.build.dir}
maven.test.reports=${maven.build.dir}/test-reports
maven.build.finalName=jtidy-8.0-SNAPSHOT
maven.reporting.outputDirectory=${maven.build.dir}/site
maven.build.testResourceDir.0=src/test/resources
maven.build.outputDir=${maven.build.dir}/classes
maven.build.resourceDir.0=src/main/resources
maven.build.testOutputDir=${maven.build.dir}/test-classes
maven.repo.local=${user.home}/.m2/repository
maven.settings.offline=false
maven.build.dir=target
maven.settings.interactiveMode=true
maven.build.testDir.0=src/test/java
maven.build.srcDir.0=src/main/java

View File

@ -1,322 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
<!-- ====================================================================== -->
<!-- -->
<!-- Any modifications will be overwritten. -->
<!-- -->
<!-- Generated by Maven Ant Plugin on 10/2/08 12:28 PM -->
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
<!-- -->
<!-- ====================================================================== -->
<project name="jtidy-from-maven" default="package" basedir=".">
<!-- ====================================================================== -->
<!-- Build environment properties -->
<!-- ====================================================================== -->
<property file="${user.home}/.m2/maven.properties"/>
<property file="maven-build.properties"/>
<property name="maven.build.finalName" value="jtidy-8.0-SNAPSHOT"/>
<property name="maven.build.dir" value="target"/>
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
<property name="maven.build.srcDir.0" value="src/main/java"/>
<property name="maven.build.resourceDir.0" value="src/main/resources"/>
<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
<property name="maven.build.testDir.0" value="src/test/java"/>
<property name="maven.build.testResourceDir.0" value="src/test/resources"/>
<property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
<property name="maven.settings.offline" value="false"/>
<property name="maven.settings.interactiveMode" value="true"/>
<!-- ====================================================================== -->
<!-- Defining classpaths -->
<!-- ====================================================================== -->
<path id="build.classpath">
<fileset dir="${maven.repo.local}">
<include name="ant/ant/1.6.5/ant-1.6.5.jar"/>
<include name="xerces/dom3-xml-apis/1.0/dom3-xml-apis-1.0.jar"/>
</fileset>
</path>
<path id="build.test.classpath">
<fileset dir="${maven.repo.local}">
<include name="ant/ant/1.6.5/ant-1.6.5.jar"/>
<include name="xerces/dom3-xml-apis/1.0/dom3-xml-apis-1.0.jar"/>
<include name="junit/junit/3.8.1/junit-3.8.1.jar"/>
<include name="org/slf4j/slf4j-log4j12/1.0.1/slf4j-log4j12-1.0.1.jar"/>
<include name="log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
</fileset>
</path>
<!-- ====================================================================== -->
<!-- Cleaning up target -->
<!-- ====================================================================== -->
<target name="clean" description="Clean the output directory">
<delete dir="${maven.build.dir}"/>
</target>
<!-- ====================================================================== -->
<!-- Compilation target -->
<!-- ====================================================================== -->
<target name="compile" depends="get-deps" description="Compile the code">
<mkdir dir="${maven.build.outputDir}"/>
<javac destdir="${maven.build.outputDir}"
encoding="UTF8"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
target="1.6"
verbose="false"
fork="false"
source="1.6">
<src>
<pathelement location="${maven.build.srcDir.0}"/>
</src>
<classpath refid="build.classpath"/>
</javac>
<copy todir="${maven.build.outputDir}">
<fileset dir="${maven.build.resourceDir.0}"/>
</copy>
</target>
<!-- ====================================================================== -->
<!-- Test-compilation target -->
<!-- ====================================================================== -->
<target name="compile-tests"
depends="compile"
description="Compile the test code"
unless="maven.test.skip">
<mkdir dir="${maven.build.testOutputDir}"/>
<javac destdir="${maven.build.testOutputDir}"
encoding="UTF8"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
target="1.6"
verbose="false"
fork="false"
source="1.6">
<src>
<pathelement location="${maven.build.testDir.0}"/>
</src>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${maven.build.outputDir}"/>
</classpath>
</javac>
<copy todir="${maven.build.testOutputDir}">
<fileset dir="${maven.build.testResourceDir.0}"/>
</copy>
</target>
<!-- ====================================================================== -->
<!-- Run all tests -->
<!-- ====================================================================== -->
<target name="test"
depends="compile-tests, junit-missing"
unless="junit.skipped"
description="Run the test cases">
<mkdir dir="${maven.test.reports}"/>
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
<sysproperty key="basedir" value="."/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${maven.build.outputDir}"/>
<pathelement location="${maven.build.testOutputDir}"/>
</classpath>
<batchtest todir="${maven.test.reports}" unless="test">
<fileset dir="${maven.build.testDir.0}">
<include name="**/*Test.*"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
<batchtest todir="${maven.test.reports}" if="test">
<fileset dir="${maven.build.testDir.0}">
<include name="**/${test}.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
</junit>
</target>
<target name="test-junit-present">
<available classname="junit.framework.Test" property="junit.present"/>
</target>
<target name="test-junit-status"
depends="test-junit-present">
<condition property="junit.missing">
<and>
<isfalse value="${junit.present}"/>
<isfalse value="${maven.test.skip}"/>
</and>
</condition>
<condition property="junit.skipped">
<or>
<isfalse value="${junit.present}"/>
<istrue value="${maven.test.skip}"/>
</or>
</condition>
</target>
<target name="junit-missing"
depends="test-junit-status"
if="junit.missing">
<echo>=================================== WARNING ===================================</echo>
<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
<echo>===============================================================================</echo>
</target>
<!-- ====================================================================== -->
<!-- Javadoc target -->
<!-- ====================================================================== -->
<target name="javadoc" description="Generates the Javadoc of the application">
<javadoc sourcepath="${maven.build.srcDir.0}"
packagenames="*"
destdir="${maven.reporting.outputDirectory}/apidocs"
access="protected"
old="false"
verbose="false"
version="true"
use="true"
author="true"
splitindex="false"
nodeprecated="false"
nodeprecatedlist="false"
notree="false"
noindex="false"
nohelp="false"
nonavbar="false"
serialwarn="false"
source="6"
encoding="UTF8"
linksource="false"
breakiterator="false"/>
</target>
<!-- ====================================================================== -->
<!-- Package target -->
<!-- ====================================================================== -->
<target name="package" depends="compile,test" description="Package the application">
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
<manifest>
<attribute name="Main-Class"
value="org.w3c.tidy.Tidy"/>
</manifest>
</jar>
</target>
<!-- ====================================================================== -->
<!-- A dummy target for the package named after the type it creates -->
<!-- ====================================================================== -->
<target name="jar" depends="package" description="Builds the jar for the application"/>
<!-- ====================================================================== -->
<!-- Download dependencies target -->
<!-- ====================================================================== -->
<target name="test-offline">
<condition property="maven.mode.offline">
<equals arg1="${maven.settings.offline}" arg2="true"/>
</condition>
</target>
<target name="get-deps"
depends="test-offline"
description="Download all dependencies"
unless="maven.mode.offline">
<mkdir dir="${maven.repo.local}"/>
<mkdir dir="${maven.repo.local}/ant/ant/1.6.5"/>
<get src="http://jtidy.sourceforge.net/maven2//ant/ant/1.6.5/ant-1.6.5.jar"
dest="${maven.repo.local}/ant/ant/1.6.5/ant-1.6.5.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="file:///usr/share/maven2/repository/ant/ant/1.6.5/ant-1.6.5.jar"
dest="${maven.repo.local}/ant/ant/1.6.5/ant-1.6.5.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo1.maven.org/maven2/ant/ant/1.6.5/ant-1.6.5.jar"
dest="${maven.repo.local}/ant/ant/1.6.5/ant-1.6.5.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/xerces/dom3-xml-apis/1.0"/>
<get src="http://jtidy.sourceforge.net/maven2//xerces/dom3-xml-apis/1.0/dom3-xml-apis-1.0.jar"
dest="${maven.repo.local}/xerces/dom3-xml-apis/1.0/dom3-xml-apis-1.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="file:///usr/share/maven2/repository/xerces/dom3-xml-apis/1.0/dom3-xml-apis-1.0.jar"
dest="${maven.repo.local}/xerces/dom3-xml-apis/1.0/dom3-xml-apis-1.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo1.maven.org/maven2/xerces/dom3-xml-apis/1.0/dom3-xml-apis-1.0.jar"
dest="${maven.repo.local}/xerces/dom3-xml-apis/1.0/dom3-xml-apis-1.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/junit/junit/3.8.1"/>
<get src="http://jtidy.sourceforge.net/maven2//junit/junit/3.8.1/junit-3.8.1.jar"
dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="file:///usr/share/maven2/repository/junit/junit/3.8.1/junit-3.8.1.jar"
dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar"
dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.0.1"/>
<get src="http://jtidy.sourceforge.net/maven2//org/slf4j/slf4j-log4j12/1.0.1/slf4j-log4j12-1.0.1.jar"
dest="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.0.1/slf4j-log4j12-1.0.1.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="file:///usr/share/maven2/repository/org/slf4j/slf4j-log4j12/1.0.1/slf4j-log4j12-1.0.1.jar"
dest="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.0.1/slf4j-log4j12-1.0.1.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo1.maven.org/maven2/org/slf4j/slf4j-log4j12/1.0.1/slf4j-log4j12-1.0.1.jar"
dest="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.0.1/slf4j-log4j12-1.0.1.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/log4j/log4j/1.2.13"/>
<get src="http://jtidy.sourceforge.net/maven2//log4j/log4j/1.2.13/log4j-1.2.13.jar"
dest="${maven.repo.local}/log4j/log4j/1.2.13/log4j-1.2.13.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="file:///usr/share/maven2/repository/log4j/log4j/1.2.13/log4j-1.2.13.jar"
dest="${maven.repo.local}/log4j/log4j/1.2.13/log4j-1.2.13.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo1.maven.org/maven2/log4j/log4j/1.2.13/log4j-1.2.13.jar"
dest="${maven.repo.local}/log4j/log4j/1.2.13/log4j-1.2.13.jar"
usetimestamp="false"
ignoreerrors="true"/>
</target>
</project>