From 7b6e027f776ba3c6e7455b1dbf2df31a16e1ba86 Mon Sep 17 00:00:00 2001
From: spandi <spandi@94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c>
Date: Sun, 17 May 2009 19:37:40 +0000
Subject: [PATCH] use only one version property for Windows and Unix-like
 systems

git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@274 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c
---
 LibusbJava/build.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/LibusbJava/build.xml b/LibusbJava/build.xml
index eba4149..030a79a 100644
--- a/LibusbJava/build.xml
+++ b/LibusbJava/build.xml
@@ -17,8 +17,7 @@
 	<property file="project.properties" />
 	<property file="version.properties" />
 	<property name="version.win.rc" value="${version.major},${version.minor},${version.micro},${version.nano}" />
-	<property name="version.win.str" value="${version.major}.${version.minor}.${version.micro}.${version.nano}" />
-	<property name="version.linux" value="${version.major}.${version.minor}.${version.micro}" />
+	<property name="version" value="${version.major}.${version.minor}.${version.micro}.${version.nano}" />
 
 	<patternset id="buildfiles">
 		<include name="**/*.o" />
@@ -45,7 +44,7 @@
 			<arg value="-DRC_VERSION_STR=&apos;\&quot;${version.str}\&quot;&apos;" />
 		</exec>
 		-->
-		<echo level="warning" message="WARNING: If the version has changed -> change the RC_VERSION_STR define in resource.rc to &quot;${version.win.str}&quot;" />
+		<echo level="warning" message="WARNING: If the version has changed -> change the RC_VERSION_STR define in resource.rc to &quot;${version}&quot;" />
 		<exec dir="." executable="${build.win.windres}">
 			<arg value="-o${build.win.resource.obj}" />
 			<arg value="${build.win.resource.rc}" />
@@ -74,7 +73,7 @@
 			<arg value="-I${build.linux.includes2}" />
 			<arg value="-I${build.linux.includes3}" />
 			<arg value="${build.shlib.srcname}" />
-			<arg value="-o${build.shlib.linux.shlibname}.${version.linux}" />
+			<arg value="-o${build.shlib.linux.shlibname}.${version}" />
 			<arg value="${build.linux.includes}/${build.linux.lib.libusb}" />
 			<arg value="${build.linux.includes}/${build.linux.lib.libusbpp}" />
 		</exec>
@@ -88,7 +87,7 @@
 			<arg line="-I ${build.mac.jni}" />
 			<arg value="${build.shlib.srcname}" />
 			<arg line="-o ${build.shlib.mac.shlibname}" />
-			<arg line="-current_version ${version.mac}" />
+			<arg line="-current_version ${version}" />
 			<arg line="-l ${build.mac.stdclib}" />
 			<arg value="${build.mac.includes}/${build.mac.lib.libusb}" />
 			<arg value="${build.mac.includes}/${build.mac.lib.libusbpp}" />