Fridrich Strba 2024-10-30 23:09:16 +00:00 committed by Git OBS Bridge
parent 83e522924c
commit 7cee4409b0
2 changed files with 11 additions and 11 deletions

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="picocli-jline3" default="package" basedir=".">
<project name="picocli-extras" default="package" basedir=".">
<!-- ====================================================================== -->
<!-- Build environment properties -->
@ -8,7 +8,7 @@
<property file="build.properties"/>
<property name="project.artifactId" value="picocli-shell-jline3"/>
<property name="project.artifactId" value="picocli"/>
<property name="project.version" value="[UNKNOWN]"/>
<property name="compiler.release" value="8"/>
@ -40,8 +40,8 @@
<target name="compile" description="Compile the code">
<mkdir dir="${build.outputDir}"/>
<!-- Build all except module-info.java with source/target 8 -->
<mkdir dir="picocli-shell-jline3/${build.outputDir}"/>
<javac destdir="${project.artifactId}/${build.outputDir}"
<mkdir dir="${project.artifactId}-shell-jline3/${build.outputDir}"/>
<javac destdir="${project.artifactId}-shell-jline3/${build.outputDir}"
nowarn="false"
debug="true"
optimize="false"
@ -54,7 +54,7 @@
encoding="UTF-8"
createMissingPackageInfoClass="false">
<src>
<pathelement location="${project.artifactId}/${build.srcDir}"/>
<pathelement location="${project.artifactId}-shell-jline3/${build.srcDir}"/>
</src>
<classpath>
<pathelement location="${picocli.jar}"/>
@ -62,7 +62,7 @@
</classpath>
</javac>
<!-- Build module-info.java with release 9 -->
<javac destdir="${project.artifactId}/${build.outputDir}"
<javac destdir="${project.artifactId}-shell-jline3/${build.outputDir}"
nowarn="false"
debug="true"
optimize="false"
@ -73,7 +73,7 @@
encoding="UTF-8"
createMissingPackageInfoClass="false">
<src>
<pathelement location="${project.artifactId}/${build.srcDir9}"/>
<pathelement location="${project.artifactId}-shell-jline3/${build.srcDir9}"/>
</src>
<modulepath>
<pathelement location="${picocli.jar}"/>
@ -108,7 +108,7 @@
breakiterator="false"
source="${compiler.source}">
<sourcepath>
<pathelement location="${project.artifactId}/${build.srcDir}"/>
<pathelement location="${project.artifactId}-shell-jline3/${build.srcDir}"/>
</sourcepath>
<classpath>
<pathelement location="${picocli.jar}"/>
@ -122,10 +122,10 @@
<!-- ====================================================================== -->
<target name="package" depends="compile" description="Package the application">
<jar jarfile="${build.dir}/${project.artifactId}-${project.version}.jar"
<jar jarfile="${build.dir}/${project.artifactId}-shell-jline3-${project.version}.jar"
compress="true"
index="false"
basedir="${project.artifactId}/${build.outputDir}"
basedir="${project.artifactId}-shell-jline3/${build.outputDir}"
excludes="**/package.html"/>
</target>

View File

@ -71,7 +71,7 @@ cp %{SOURCE1} build.xml
%{ant} \
-Dproject.version=%{version} \
-Djline3.jar=$(find-jar jline3/jline) \
-D%{base_name}.jar=$(find-jar %{base_name}/%{base_name}) \
-Dpicocli.jar=$(find-jar picocli/picocli) \
jar javadoc
%install