Skip to content

Commit

Permalink
Improved version detection
Browse files Browse the repository at this point in the history
  • Loading branch information
hudeany committed Aug 15, 2024
1 parent d7e2935 commit 70d4ca7
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions build.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project default="build_jar" name="Create all Jars for Project DbImport">
<loadfile property="version" srcFile="build.version" failonerror="false" />
<property name="version" value="24.0.0" />
<echo message="version: ${version}" />
<loadfile property="build.version" srcFile="build.version" failonerror="false" />
<property name="build.version" value="24.0.0" />
<echo message="build.version: ${build.version}" />

<property file="${user.home}/git/codeSigning.properties" />

Expand Down Expand Up @@ -107,13 +107,13 @@
<basename property="CaPublicKeyFileNameOld" file="${CaPublicKeyOld}"/>

<delete file="${buildPath}/bin/version.txt" />
<echo file="${buildPath}/bin/version.txt" append="false">${version}${line.separator}${buildTime}${line.separator}${VersionsUrl}${line.separator}${CaPublicKeyFileName}, ${CaPublicKeyFileNameOld}${line.separator}</echo>
<echo file="${buildPath}/bin/version.txt" append="false">${build.version}${line.separator}${buildTime}${line.separator}${VersionsUrl}${line.separator}${CaPublicKeyFileName}, ${CaPublicKeyFileNameOld}${line.separator}</echo>
<delete file="src/version.txt" />
<echo file="src/version.txt" append="false">${version}${line.separator}${buildTime}${line.separator}${VersionsUrl}${line.separator}${CaPublicKeyFileName}, ${CaPublicKeyFileNameOld}${line.separator}</echo>
<echo file="src/version.txt" append="false">${build.version}${line.separator}${buildTime}${line.separator}${VersionsUrl}${line.separator}${CaPublicKeyFileName}, ${CaPublicKeyFileNameOld}${line.separator}</echo>
</target>

<target name="create_jar" depends="compile, create_versionfile">
<jar destfile="${buildPath}/DbImport-${version}.jar">
<jar destfile="${buildPath}/DbImport-${build.version}.jar">
<manifest>
<attribute name="Main-Class" value="de.soderer.DbImport" />
<attribute name="Class-Path" value="." />
Expand All @@ -131,7 +131,7 @@
<zipfileset dir="src" includes="DbImport.ico" />
</jar>

<jar destfile="${buildPath}/DbImport-${version}_sources.jar">
<jar destfile="${buildPath}/DbImport-${build.version}_sources.jar">
<manifest>
<attribute name="Main-Class" value="de.soderer.DbImport" />
<attribute name="Class-Path" value="." />
Expand Down Expand Up @@ -169,7 +169,7 @@
</signjar>
<signjar destDir="${buildPath}" alias="${CodeSigningKeyAlias}" keystore="${CodeSigningKeyStore}" storepass="${CodeSigningKeyStorePassword}" keypass="${CodeSigningKeyPassword}" preservelastmodified="true" tsaurl="${TsaUrl}">
<path>
<fileset dir="${buildPath}" includes="DbImport-${version}.jar" />
<fileset dir="${buildPath}" includes="DbImport-${build.version}.jar" />
</path>
</signjar>
</target>
Expand Down

0 comments on commit 70d4ca7

Please sign in to comment.