rik/jlibusb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use only one version property for Windows and Unix-like systems

Browse Source 
git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@274 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c
This commit is contained in:
spandi
2009-05-17 19:37:40 +00:00
parent 519dac0002
commit 7b6e027f77
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
LibusbJava/build.xml
View File

@@ -17,8 +17,7 @@
<property file="project.properties" /> <property file="project.properties" />
<property file="version.properties" /> <property file="version.properties" />
<property name="version.win.rc" value="${version.major},${version.minor},${version.micro},${version.nano}" /> <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" value="${version.major}.${version.minor}.${version.micro}.${version.nano}" />
<property name="version.linux" value="${version.major}.${version.minor}.${version.micro}" />
<patternset id="buildfiles"> <patternset id="buildfiles">
<include name="**/*.o" /> <include name="**/*.o" />
@@ -45,7 +44,7 @@
<arg value="-DRC_VERSION_STR=&apos;\&quot;${version.str}\&quot;&apos;" /> <arg value="-DRC_VERSION_STR=&apos;\&quot;${version.str}\&quot;&apos;" />
</exec> </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}"> <exec dir="." executable="${build.win.windres}">
<arg value="-o${build.win.resource.obj}" /> <arg value="-o${build.win.resource.obj}" />
<arg value="${build.win.resource.rc}" /> <arg value="${build.win.resource.rc}" />
@@ -74,7 +73,7 @@
<arg value="-I${build.linux.includes2}" /> <arg value="-I${build.linux.includes2}" />
<arg value="-I${build.linux.includes3}" /> <arg value="-I${build.linux.includes3}" />
<arg value="${build.shlib.srcname}" /> <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.libusb}" />
<arg value="${build.linux.includes}/${build.linux.lib.libusbpp}" /> <arg value="${build.linux.includes}/${build.linux.lib.libusbpp}" />
</exec> </exec>
@@ -88,7 +87,7 @@
<arg line="-I ${build.mac.jni}" /> <arg line="-I ${build.mac.jni}" />
<arg value="${build.shlib.srcname}" /> <arg value="${build.shlib.srcname}" />
<arg line="-o ${build.shlib.mac.shlibname}" /> <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 line="-l ${build.mac.stdclib}" />
<arg value="${build.mac.includes}/${build.mac.lib.libusb}" /> <arg value="${build.mac.includes}/${build.mac.lib.libusb}" />
<arg value="${build.mac.includes}/${build.mac.lib.libusbpp}" /> <arg value="${build.mac.includes}/${build.mac.lib.libusbpp}" />