Skip to content

Commit

Permalink
Merge branch 'artifacts-name-as-property' into 'master'
Browse files Browse the repository at this point in the history
Artifacts name as property

See merge request exedio/copepatch!64
  • Loading branch information
rw7 committed May 3, 2024
2 parents 6879614 + b9dc916 commit c2041ad
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 19 deletions.
30 changes: 15 additions & 15 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -163,44 +163,44 @@
<target name="jar" depends="jar.runtime, jar.console" />

<target name="jar.runtime" depends="src.compile">
<jar jarfile="build/exedio-cope-patch.jar" filesonly="true" duplicate="fail" strict="fail" level="9">
<jar jarfile="build/${artifacts.name}.jar" filesonly="true" duplicate="fail" strict="fail" level="9">
<fileset dir="build/classes/src" />
<manifest>
<attribute name="Specification-Title" value="exedio cope patch" />
<attribute name="Specification-Title" value="${artifacts.title}" />
<attribute name="Specification-Version" value="${build.tag}" />
<attribute name="Specification-Vendor" value="exedio GmbH" />
<attribute name="Implementation-Title" value="exedio cope patch" />
<attribute name="Implementation-Title" value="${artifacts.title}" />
<attribute name="Implementation-Version" value="${build.tag}" />
<attribute name="Implementation-Vendor" value="exedio GmbH" />
</manifest>
</jar>
<plot file="build/exedio-cope-patch.jar" />
<plot file="build/${artifacts.name}.jar" />
</target>

<target name="jar.console" depends="consolesrc.compile">
<jar jarfile="build/exedio-cope-patch-console.jar" filesonly="true" duplicate="fail" strict="fail" level="9">
<jar jarfile="build/${artifacts.name}-console.jar" filesonly="true" duplicate="fail" strict="fail" level="9">
<fileset dir="build/classes/consolesrc" />
<manifest>
<attribute name="Specification-Title" value="exedio cope patch console" />
<attribute name="Specification-Title" value="${artifacts.title} console" />
<attribute name="Specification-Version" value="${build.tag}" />
<attribute name="Specification-Vendor" value="exedio GmbH" />
<attribute name="Implementation-Title" value="exedio cope patch console" />
<attribute name="Implementation-Title" value="${artifacts.title} console" />
<attribute name="Implementation-Version" value="${build.tag}" />
<attribute name="Implementation-Vendor" value="exedio GmbH" />
</manifest>
</jar>
<plot file="build/exedio-cope-patch-console.jar" />
<plot file="build/${artifacts.name}-console.jar" />
</target>

<target name="jar.src">
<mkdir dir="build" />
<zip destfile="build/exedio-cope-patch-src.zip" filesonly="true" whenempty="fail" duplicate="fail" level="9">
<zip destfile="build/${artifacts.name}-src.zip" filesonly="true" whenempty="fail" duplicate="fail" level="9">
<zipfileset dir="${basedir}/src"><include name="**/*.java"/><exclude name="**/*_Jspm.java" /></zipfileset>
<zipfileset dir="${basedir}/consolesrc">
<include name="**/*.java" />
</zipfileset>
</zip>
<plot file="build/exedio-cope-patch-src.zip" />
<plot file="build/${artifacts.name}-src.zip" />
</target>

<target name="web" depends="examplesrc.compile">
Expand Down Expand Up @@ -279,7 +279,7 @@
<target name="compile" depends="src.compile, consolesrc.compile, testsrc.compile, examplesrc.compile" />

<target name="api">
<api title="cope patch">
<api title="${artifacts.title}">
<src>
<fileset dir="src" includes="**/*.java" />
</src>
Expand All @@ -301,10 +301,10 @@

<target name="jenkins" depends="all">
<copy todir="${basedir}/build/success">
<fileset file="${basedir}/build/exedio-cope-patch.jar" />
<fileset file="${basedir}/build/exedio-cope-patch-console.jar" />
<fileset file="${basedir}/build/exedio-cope-patch-src.zip" />
<fileset file="${basedir}/exedio-cope-patch-log.txt" />
<fileset file="${basedir}/build/${artifacts.name}.jar" />
<fileset file="${basedir}/build/${artifacts.name}-console.jar" />
<fileset file="${basedir}/build/${artifacts.name}-src.zip" />
<fileset file="${basedir}/${artifacts.name}-log.txt" />
</copy>
<copy file="ivy/ivy.xml" todir="build/success" overwrite="true">
<filterset>
Expand Down
11 changes: 7 additions & 4 deletions ivy/ivy.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE ivy-module [
<!ENTITY artifacts.name "exedio-cope-patch">
]>
<ivy-module
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0"
Expand Down Expand Up @@ -30,10 +33,10 @@
description="classpath for IDEs such as Eclipse and IntelliJ, includes java sources and changelogs" />
</configurations>
<publications>
<artifact name="exedio-cope-patch" conf="runtime" type="jar" ext="jar" />
<artifact name="exedio-cope-patch-console" conf="console" type="jar" ext="jar" />
<artifact name="exedio-cope-patch" conf="sources" type="src" ext="zip" />
<artifact name="exedio-cope-patch" conf="changelog" type="log" ext="txt" />
<artifact name="&artifacts.name;" conf="runtime" type="jar" ext="jar" />
<artifact name="&artifacts.name;-console" conf="console" type="jar" ext="jar" />
<artifact name="&artifacts.name;" conf="sources" type="src" ext="zip" />
<artifact name="&artifacts.name;" conf="changelog" type="log" ext="txt" />
</publications>
<dependencies defaultconf="SPECIFY_A_CONFIGURATION">
<dependency org="com.exedio" name="copeutil" rev="987" conf="runtime->runtime; ide->runtime,sources,changelog" />
Expand Down
6 changes: 6 additions & 0 deletions project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,9 @@ instrument.verify=false
# See https://junit.org/junit5/docs/current/user-guide/#running-tests-console-launcher-options
#
test-details=summary

# Name and title of the artifacts created in the build process of this project.
# See build.xml for their usage.
#
artifacts.name=exedio-cope-patch
artifacts.title=exedio cope patch

0 comments on commit c2041ad

Please sign in to comment.