Merge branch 'sigar-1.6' into cleanup
Conflicts: bindings/SigarWrapper.pm src/os/netware/Makefile.nw src/os/netware/netware_sigar.c src/os/osf1/osf1_sigar.c src/os/stub/stub_sigar.c
This commit is contained in:
commit
4a0dc0cef3
16 files changed
+2
-2961
No files matched your search
@@ -3,11 +3,10 @@
|
||||
<classpathentry kind="src" path="build/src"/>
|
||||
<classpathentry kind="src" path="hyperic_jni/src"/>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="lib" path="lib/junit.jar"/>
|
||||
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
|
||||
<classpathentry kind="var" path="ANT_HOME/lib/junit.jar"/>
|
||||
<classpathentry kind="lib" path="hyperic_jni/lib/cpptasks.jar"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="lib" path="lib/log4j.jar"/>
|
||||
<classpathentry kind="lib" path="lib/mx4j-jmx.jar"/>
|
||||
<classpathentry kind="lib" path="lib/ant.jar"/>
|
||||
<classpathentry kind="output" path="build/classes"/>
|
||||
</classpath>
|
||||
@@ -156,15 +156,6 @@
|
||||
value="${build}/src/sigar_version.c"/>
|
||||
</antcall>
|
||||
|
||||
<antcall target="version-file">
|
||||
<param name="version.file.srcdir"
|
||||
value="../.."/>
|
||||
<param name="version.file"
|
||||
value="src/os/netware/sigar.def"/>
|
||||
<param name="version.tofile"
|
||||
value="${build}/src/sigar.def"/>
|
||||
</antcall>
|
||||
|
||||
<antcall target="version-file">
|
||||
<param name="version.file.srcdir"
|
||||
value="../.."/>
|
||||
|
||||
Reference in new issue
Block a user