Skip to content

Commit

Permalink
Remove all references to JDBC_VER_SUFFIX
Browse files Browse the repository at this point in the history
  • Loading branch information
joerivanruth committed Jan 16, 2025
1 parent fb016c0 commit c5a808e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
2 changes: 0 additions & 2 deletions build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
JDBC_MAJOR=3
# minor release number
JDBC_MINOR=3
# an additional identifying string
JDBC_VER_SUFFIX=Liberica


##
Expand Down
4 changes: 1 addition & 3 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -237,19 +237,17 @@ Copyright 1997 - July 2008 CWI.
<!-- Some defaults -->
<filter token="JDBC_MAJOR" value="${JDBC_MAJOR}" />
<filter token="JDBC_MINOR" value="${JDBC_MINOR}" />
<filter token="JDBC_VER_SUFFIX" value="${JDBC_VER_SUFFIX} ${TODAY}" />

<fail unless="JDBC_MAJOR" message="'JDBC_MAJOR' undefined. Please follow the directions in build.properties."/>
<fail unless="JDBC_MINOR" message="'JDBC_MINOR' undefined. Please follow the directions in build.properties."/>
<fail unless="JDBC_VER_SUFFIX" message="'JDBC_VER_SUFFIX' undefined. Please follow the directions in build.properties."/>

<!-- now copy and filter the file -->
<copy file="${srcdir}/${jdbc-package}/MonetVersion.java.in"
overwrite="true"
tofile="${srcdir}/${jdbc-package}/MonetVersion.java"
filtering="yes" />

<echo message="Configured build for the ${JDBC_MAJOR}.${JDBC_MINOR} (${JDBC_VER_SUFFIX}) edition driver" />
<echo message="Configured build for the ${JDBC_MAJOR}.${JDBC_MINOR} edition driver" />
</target>

<!-- Prepares the build directory and sets some variables -->
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/monetdb/jdbc/MonetVersion.java.in
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ final class MonetVersion {
/**
* Full version string of MonetDB JDBC driver.
*/
public static String driverVersion = "@JDBC_MAJOR@.@JDBC_MINOR@ (@JDBC_VER_SUFFIX@)";
public static String driverVersion = "@JDBC_MAJOR@.@JDBC_MINOR@";
}

0 comments on commit c5a808e

Please sign in to comment.