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
@@ -2956,39 +2956,5 @@ EOF
|
||||
$self->SUPER::finish;
|
||||
}
|
||||
|
||||
#XXX not currently supporting netware
|
||||
package SigarWrapper::Netware;
|
||||
|
||||
use vars qw(@ISA);
|
||||
@ISA = qw(SigarWrapper);
|
||||
|
||||
sub start {
|
||||
my $self = shift;
|
||||
$self->SUPER::start;
|
||||
$self->{dfh} = $self->create('javasigar_generated.def');
|
||||
}
|
||||
|
||||
sub finish {
|
||||
my $self = shift;
|
||||
my $fh = $self->{dfh};
|
||||
for my $func (@{ $self->{nativefunc} }) {
|
||||
#$fh->println($nativefunc) if $impl;
|
||||
}
|
||||
my $jsigar = "../../src/jni/javasigar.c";
|
||||
my(%alias) = (x => 'Sigar');
|
||||
open JSIGAR, $jsigar or die "open $jsigar: $!";
|
||||
while (<JSIGAR>) {
|
||||
next unless /SIGAR_JNI([a-z]?)\(([A-Za-z_]+)\)/;
|
||||
my $class = "";
|
||||
if ($1) {
|
||||
$class = $alias{$1} . "_";
|
||||
}
|
||||
$fh->println("Java_org_hyperic_sigar_$class$2");
|
||||
}
|
||||
close JSIGAR;
|
||||
|
||||
$self->SUPER::finish;
|
||||
}
|
||||
|
||||
1;
|
||||
__END__
|
||||
@@ -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