This commit is contained in:
parent
62531e315c
commit
87e2ccdd0d
@ -151,47 +151,6 @@
|
||||
<pathelement location="${jline2.jar}"/>
|
||||
</modulepath>
|
||||
</javac>
|
||||
<!-- Build all except module-info.java with source/target 8 -->
|
||||
<mkdir dir="picocli-shell-jline3/${build.outputDir}"/>
|
||||
<javac destdir="picocli-shell-jline3/${build.outputDir}"
|
||||
nowarn="false"
|
||||
debug="true"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
release="${compiler.release}"
|
||||
target="${compiler.target}"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
source="${compiler.source}"
|
||||
encoding="UTF-8"
|
||||
createMissingPackageInfoClass="false">
|
||||
<src>
|
||||
<pathelement location="picocli-shell-jline3/${build.srcDir}"/>
|
||||
</src>
|
||||
<classpath>
|
||||
<pathelement location="${build.outputDir}"/>
|
||||
<pathelement location="${jline3.jar}"/>
|
||||
</classpath>
|
||||
</javac>
|
||||
<!-- Build module-info.java with release 9 -->
|
||||
<javac destdir="picocli-shell-jline3/${build.outputDir}"
|
||||
nowarn="false"
|
||||
debug="true"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
release="9"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
encoding="UTF-8"
|
||||
createMissingPackageInfoClass="false">
|
||||
<src>
|
||||
<pathelement location="picocli-shell-jline3/${build.srcDir9}"/>
|
||||
</src>
|
||||
<modulepath>
|
||||
<pathelement location="${build.outputDir}"/>
|
||||
<pathelement location="${jline3.jar}"/>
|
||||
</modulepath>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
@ -254,11 +213,6 @@
|
||||
index="false"
|
||||
basedir="picocli-shell-jline2/${build.outputDir}"
|
||||
excludes="**/package.html"/>
|
||||
<jar jarfile="${build.dir}/${project.artifactId}-shell-jline3-${project.version}.jar"
|
||||
compress="true"
|
||||
index="false"
|
||||
basedir="picocli-shell-jline3/${build.outputDir}"
|
||||
excludes="**/package.html"/>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
|
@ -1,45 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>info.picocli</groupId>
|
||||
<artifactId>picocli-shell-jline3</artifactId>
|
||||
<version>4.7.5</version>
|
||||
<name>picocli-shell-jline3</name>
|
||||
<description>Picocli Shell JLine3 - easily build interactive shell applications with JLine 3 and picocli.</description>
|
||||
<url>https://picocli.info</url>
|
||||
<inceptionYear>2018</inceptionYear>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>The Apache Software License, version 2.0</name>
|
||||
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
|
||||
<distribution>repo</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
<developers>
|
||||
<developer>
|
||||
<id>rpopma</id>
|
||||
<name>Remko Popma</name>
|
||||
<email>rpopma@apache.org</email>
|
||||
</developer>
|
||||
</developers>
|
||||
<scm>
|
||||
<connection>scm:git:https://github.com/remkop/picocli.git</connection>
|
||||
<developerConnection>scm:git:ssh://github.com:remkop/picocli.git</developerConnection>
|
||||
<url>https://github.com/remkop/picocli/tree/master</url>
|
||||
</scm>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>info.picocli</groupId>
|
||||
<artifactId>picocli</artifactId>
|
||||
<version>4.7.5</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jline</groupId>
|
||||
<artifactId>jline</artifactId>
|
||||
<version>3.23.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
20
picocli.spec
20
picocli.spec
@ -31,14 +31,12 @@ Source1: %{name}-build.xml
|
||||
Source2: https://repo1.maven.org/maven2/info/%{name}/%{name}/%{version}/%{name}-%{version}.pom
|
||||
Source3: https://repo1.maven.org/maven2/info/%{name}/%{name}-codegen/%{version}/%{name}-codegen-%{version}.pom
|
||||
Source4: https://repo1.maven.org/maven2/info/%{name}/%{name}-shell-jline2/%{version}/%{name}-shell-jline2-%{version}.pom
|
||||
Source5: https://repo1.maven.org/maven2/info/%{name}/%{name}-shell-jline3/%{version}/%{name}-shell-jline3-%{version}.pom
|
||||
BuildRequires: ant
|
||||
BuildRequires: aqute-bnd
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel >= 9
|
||||
BuildRequires: javapackages-local >= 6
|
||||
BuildRequires: jline >= 2
|
||||
BuildRequires: jline3
|
||||
Requires: java-headless >= 1.8
|
||||
BuildArch: noarch
|
||||
|
||||
@ -72,18 +70,6 @@ Easily included as source to avoid adding a dependency.
|
||||
|
||||
Library to build interactive shell applications with JLine 2 and picocli.
|
||||
|
||||
%package shell-jline3
|
||||
Summary: Picocli Shell JLine3
|
||||
Group: Development/Libraries/Java
|
||||
Requires: java-headless >= 1.8
|
||||
|
||||
%description shell-jline3
|
||||
Java command line parser with both an annotations API and a programmatic API.
|
||||
Usage help with ANSI styles and colors. Autocomplete. Nested subcommands.
|
||||
Easily included as source to avoid adding a dependency.
|
||||
|
||||
Library to build interactive shell applications with JLine 3 and picocli.
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
Group: Documentation/HTML
|
||||
@ -99,7 +85,6 @@ cp %{SOURCE1} build.xml
|
||||
%{ant} \
|
||||
-Dproject.version=%{version} \
|
||||
-Djline2.jar=$(find-jar jline/jline) \
|
||||
-Djline3.jar=$(find-jar jline3/jline) \
|
||||
jar javadoc
|
||||
|
||||
echo "-reproducible: true" >> bnd.bnd
|
||||
@ -122,19 +107,16 @@ install -dm0755 %{buildroot}%{_javadir}/%{name}
|
||||
install -pm0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
|
||||
install -pm0644 target/%{name}-codegen-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-codegen.jar
|
||||
install -pm0644 target/%{name}-shell-jline2-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-shell-jline2.jar
|
||||
install -pm0644 target/%{name}-shell-jline3-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-shell-jline3.jar
|
||||
|
||||
#pom
|
||||
install -dm0755 %{buildroot}%{_mavenpomdir}/%{name}
|
||||
%{mvn_install_pom} %{SOURCE2} %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
|
||||
%{mvn_install_pom} %{SOURCE3} %{buildroot}%{_mavenpomdir}/%{name}/%{name}-codegen.pom
|
||||
%{mvn_install_pom} %{SOURCE4} %{buildroot}%{_mavenpomdir}/%{name}/%{name}-shell-jline2.pom
|
||||
%{mvn_install_pom} %{SOURCE3} %{buildroot}%{_mavenpomdir}/%{name}/%{name}-shell-jline3.pom
|
||||
|
||||
%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
|
||||
%add_maven_depmap %{name}/%{name}-codegen.pom %{name}/%{name}-codegen.jar -f codegen
|
||||
%add_maven_depmap %{name}/%{name}-shell-jline2.pom %{name}/%{name}-shell-jline2.jar -f shell-jline2
|
||||
%add_maven_depmap %{name}/%{name}-shell-jline3.pom %{name}/%{name}-shell-jline3.jar -f shell-jline3
|
||||
|
||||
#javadoc
|
||||
install -dm0755 %{buildroot}%{_javadocdir}/%{name}
|
||||
@ -149,8 +131,6 @@ cp -r target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
|
||||
|
||||
%files shell-jline2 -f .mfiles-shell-jline2
|
||||
|
||||
%files shell-jline3 -f .mfiles-shell-jline3
|
||||
|
||||
%files javadoc
|
||||
%{_javadocdir}/%{name}
|
||||
%license LICENSE
|
||||
|
Loading…
Reference in New Issue
Block a user