Started implementing environment variable methods on windows.

This commit is contained in:
Adam Murdoch
2013-02-07 17:58:13 +11:00
parent ff3abfd4fd
commit 6cab15ece4
8 changed files with 328 additions and 154 deletions

View File

@@ -1,46 +1,79 @@
/*
* Copyright 2012 Adam Murdoch
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.rubygrapefruit.platform.internal;
import net.rubygrapefruit.platform.*;
import net.rubygrapefruit.platform.internal.jni.PosixProcessFunctions;
import java.io.File;
public class DefaultProcess implements net.rubygrapefruit.platform.Process {
public int getProcessId() throws NativeException {
return PosixProcessFunctions.getPid();
}
public File getWorkingDirectory() throws NativeException {
FunctionResult result = new FunctionResult();
String dir = PosixProcessFunctions.getWorkingDirectory(result);
if (result.isFailed()) {
throw new NativeException(String.format("Could not get process working directory: %s", result.getMessage()));
}
return new File(dir);
}
public void setWorkingDirectory(File directory) throws NativeException {
FunctionResult result = new FunctionResult();
PosixProcessFunctions.setWorkingDirectory(directory.getAbsolutePath(), result);
if (result.isFailed()) {
throw new NativeException(String.format("Could not set process working directory: %s", result.getMessage()));
}
System.setProperty("user.dir", directory.getAbsolutePath());
}
}
/*
* Copyright 2012 Adam Murdoch
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.rubygrapefruit.platform.internal;
import net.rubygrapefruit.platform.NativeException;
import net.rubygrapefruit.platform.Process;
import net.rubygrapefruit.platform.internal.jni.PosixProcessFunctions;
import java.io.File;
public class DefaultProcess implements Process {
private final Object workingDirectoryLock = new Object();
private final Object environmentLock = new Object();
public int getProcessId() throws NativeException {
return PosixProcessFunctions.getPid();
}
public File getWorkingDirectory() throws NativeException {
FunctionResult result = new FunctionResult();
String dir;
synchronized (workingDirectoryLock) {
dir = PosixProcessFunctions.getWorkingDirectory(result);
}
if (result.isFailed()) {
throw new NativeException(String.format("Could not get process working directory: %s",
result.getMessage()));
}
return new File(dir);
}
public void setWorkingDirectory(File directory) throws NativeException {
FunctionResult result = new FunctionResult();
synchronized (workingDirectoryLock) {
PosixProcessFunctions.setWorkingDirectory(directory.getAbsolutePath(), result);
System.setProperty("user.dir", directory.getAbsolutePath());
}
if (result.isFailed()) {
throw new NativeException(String.format("Could not set process working directory: %s",
result.getMessage()));
}
}
public String getEnvironmentVariable(String name) throws NativeException {
FunctionResult result = new FunctionResult();
String value;
synchronized (environmentLock) {
value = PosixProcessFunctions.getEnvironmentVariable(name, result);
}
if (result.isFailed()) {
throw new NativeException(String.format("Could not get the value of environment variable '%s': %s", name, result.getMessage()));
}
return value;
}
public void setEnvironmentVariable(String name, String value) throws NativeException {
FunctionResult result = new FunctionResult();
synchronized (environmentLock) {
PosixProcessFunctions.setEnvironmentVariable(name, value, result);
}
if (result.isFailed()) {
throw new NativeException(String.format("Could not set the value of environment variable '%s': %s", name, result.getMessage()));
}
}
}

View File

@@ -1,28 +1,28 @@
/*
* Copyright 2012 Adam Murdoch
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.rubygrapefruit.platform.internal.jni;
import net.rubygrapefruit.platform.internal.FunctionResult;
import net.rubygrapefruit.platform.internal.MutableSystemInfo;
public class NativeLibraryFunctions {
public static final int VERSION = 12;
public static native int getVersion();
public static native void getSystemInfo(MutableSystemInfo systemInfo, FunctionResult result);
}
/*
* Copyright 2012 Adam Murdoch
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.rubygrapefruit.platform.internal.jni;
import net.rubygrapefruit.platform.internal.FunctionResult;
import net.rubygrapefruit.platform.internal.MutableSystemInfo;
public class NativeLibraryFunctions {
public static final int VERSION = 13;
public static native int getVersion();
public static native void getSystemInfo(MutableSystemInfo systemInfo, FunctionResult result);
}

View File

@@ -1,27 +1,31 @@
/*
* Copyright 2012 Adam Murdoch
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.rubygrapefruit.platform.internal.jni;
import net.rubygrapefruit.platform.internal.FunctionResult;
public class PosixProcessFunctions {
public static native int getPid();
public static native String getWorkingDirectory(FunctionResult result);
public static native void setWorkingDirectory(String dir, FunctionResult result);
}
/*
* Copyright 2012 Adam Murdoch
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.rubygrapefruit.platform.internal.jni;
import net.rubygrapefruit.platform.internal.FunctionResult;
public class PosixProcessFunctions {
public static native int getPid();
public static native String getWorkingDirectory(FunctionResult result);
public static native void setWorkingDirectory(String dir, FunctionResult result);
public static native String getEnvironmentVariable(String var, FunctionResult result);
public static native void setEnvironmentVariable(String var, String value, FunctionResult result);
}