diff --git a/contrib/onelab/Makefile b/contrib/onelab/Makefile
index ad88b101e7c246de23643c17adfcbfaf8aa28bde..766a1bf24fbd824718ca1bd420b7297ac41dc134 100644
--- a/contrib/onelab/Makefile
+++ b/contrib/onelab/Makefile
@@ -2,7 +2,7 @@ SOLVERS=loader
SOURCES=myOS StringUtils mathex OnelabClients OnelabMessage OnelabParser metamodel
COMMON_DIR=$(GMSH_DIR)/Common
-ONELAB_DIR=$(GMSH_DIR)/projects/onelab
+ONELAB_DIR=$(GMSH_DIR)/contrib/onelab
MATHEX_DIR=$(GMSH_DIR)/contrib/MathEx
OBJDIR=objects
diff --git a/contrib/onelab/myOS.cpp b/contrib/onelab/myOS.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..7bbbcdb3a32977269699332962249cb7e7c56a55
--- /dev/null
+++ b/contrib/onelab/myOS.cpp
@@ -0,0 +1,216 @@
+// Gmsh - Copyright (C) 1997-2012 C. Geuzaine, J.-F. Remacle
+//
+// See the LICENSE.txt file for license information. Please report all
+// bugs and problems to <gmsh@geuz.org>.
+
+// This file contains a bunch of functions that depend on OS-dependent
+// features and/or system calls
+
+// these are available on all OSes
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <signal.h>
+#include <time.h>
+#include <math.h>
+
+#if !defined(WIN32) || defined(__CYGWIN__)
+#include <unistd.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#endif
+
+#if defined(WIN32)
+#include <windows.h>
+#include <process.h>
+#include <io.h>
+#endif
+
+#if defined(__APPLE__)
+#define RUSAGE_SELF 0
+#define RUSAGE_CHILDREN -1
+#endif
+
+//#include "GmshMessage.h"
+#include "OnelabMessage.h"
+
+const char *GetEnvironmentVar(const char *var)
+{
+#if !defined(WIN32)
+ return getenv(var);
+#else
+ const char *tmp = getenv(var);
+ // Don't accept top dir or anything partially expanded like
+ // c:\Documents and Settings\%USERPROFILE%, etc.
+ if(!tmp || !strcmp(tmp, "/") || strstr(tmp, "%") || strstr(tmp, "$"))
+ return 0;
+ else
+ return tmp;
+#endif
+}
+
+double GetTimeInSeconds()
+{
+#if !defined(WIN32) || defined(__CYGWIN__)
+ struct timeval tp;
+ gettimeofday(&tp, (struct timezone *)0);
+ double t = (double)tp.tv_sec + 1.e-6 * (double)tp.tv_usec;
+ return t;
+#else
+ FILETIME ft;
+ GetSystemTimeAsFileTime(&ft);
+ double t = 1.e-7 * 4294967296. * (double)ft.dwHighDateTime +
+ 1.e-7 * (double)ft.dwLowDateTime;
+ return t;
+#endif
+}
+
+void SleepInSeconds(double s)
+{
+#if !defined(WIN32) || defined(__CYGWIN__)
+ usleep((long)(1.e6 * s));
+#else
+ Sleep((long)(1.e3 * s));
+#endif
+}
+
+static void GetResources(double *s, long *mem)
+{
+#if !defined(WIN32) || defined(__CYGWIN__)
+ static struct rusage r;
+ getrusage(RUSAGE_SELF, &r);
+ *s = (double)r.ru_utime.tv_sec + 1.e-6 * (double)r.ru_utime.tv_usec;
+ *mem = (long)r.ru_maxrss;
+#else
+ FILETIME creation, exit, kernel, user;
+ if(GetProcessTimes(GetCurrentProcess(), &creation, &exit, &kernel, &user)){
+ *s = 1.e-7 * 4294967296. * (double)user.dwHighDateTime +
+ 1.e-7 * (double)user.dwLowDateTime;
+ }
+ *mem = 0;
+#endif
+}
+
+void CheckResources()
+{
+#if !defined (WIN32) || defined(__CYGWIN__)
+ static struct rlimit r;
+
+ getrlimit(RLIMIT_STACK, &r);
+
+ // Try to get at least 16 MB of stack. Running with too small a stack
+ // can cause crashes in the recursive calls (e.g. for tet
+ // classification in 3D Delaunay)
+ if(r.rlim_cur < 16 * 1024 * 1024){
+ OLMsg::Info("Increasing process stack size (%d kB < 16 MB)", r.rlim_cur / 1024);
+ r.rlim_cur = r.rlim_max;
+ setrlimit(RLIMIT_STACK, &r);
+ }
+#endif
+}
+
+double Cpu()
+{
+ long mem = 0;
+ double s = 0.;
+ GetResources(&s, &mem);
+ return s;
+}
+
+long GetMemoryUsage()
+{
+ long mem = 0;
+ double s = 0.;
+ GetResources(&s, &mem);
+ return mem;
+}
+
+int GetProcessId()
+{
+#if !defined(WIN32) || defined(__CYGWIN__)
+ return getpid();
+#else
+ return _getpid();
+#endif
+}
+
+std::string GetHostName()
+{
+ char host[256];
+ gethostname(host, sizeof(host));
+ return std::string(host);
+}
+
+int UnlinkFile(const std::string &fileName)
+{
+#if !defined(WIN32) || defined(__CYGWIN__)
+ return unlink(fileName.c_str());
+#else
+ return _unlink(fileName.c_str());
+#endif
+}
+
+int StatFile(const std::string &fileName)
+{
+#if !defined(WIN32) || defined(__CYGWIN__)
+ struct stat buf;
+ return stat(fileName.c_str(), &buf);
+#else
+ struct _stat buf;
+ return _stat(fileName.c_str(), &buf);
+#endif
+}
+
+int KillProcess(int pid)
+{
+#if !defined(WIN32) || defined(__CYGWIN__)
+ if(kill(pid, 9))
+ return 0;
+#else
+ HANDLE hProc = OpenProcess(PROCESS_TERMINATE, FALSE, pid);
+ if(!TerminateProcess(hProc, 0)){
+ CloseHandle(hProc);
+ return 0;
+ }
+#endif
+ return 1;
+}
+
+int SystemCall(const std::string &command, bool blocking)
+{
+#if defined(WIN32)
+ STARTUPINFO suInfo;
+ PROCESS_INFORMATION prInfo;
+ memset(&suInfo, 0, sizeof(suInfo));
+ suInfo.cb = sizeof(suInfo);
+ OLMsg::Info("Calling '%s'", command.c_str());
+ if(blocking){
+ CreateProcess(NULL, (char*)command.c_str(), NULL, NULL, FALSE,
+ NORMAL_PRIORITY_CLASS, NULL, NULL,
+ &suInfo, &prInfo);
+ // wait until child process exits.
+ WaitForSingleObject(prInfo.hProcess, INFINITE);
+ // close process and thread handles.
+ CloseHandle(prInfo.hProcess);
+ CloseHandle(prInfo.hThread);
+ }
+ else{
+ // DETACHED_PROCESS removes the console (useful if the program to launch is
+ // a console-mode exe)
+ CreateProcess(NULL, (char*)command.c_str(), NULL, NULL, FALSE,
+ NORMAL_PRIORITY_CLASS|DETACHED_PROCESS, NULL, NULL,
+ &suInfo, &prInfo);
+ }
+ return 0;
+#else
+ if(!system(NULL)) {
+ OLMsg::Error("Could not find /bin/sh: aborting system call");
+ return 1;
+ }
+ std::string cmd(command);
+ if(!blocking) cmd += " &";
+ OLMsg::Info("Calling '%s'", cmd.c_str());
+ return system(cmd.c_str());
+#endif
+}
diff --git a/contrib/onelab/myOS.h b/contrib/onelab/myOS.h
new file mode 100644
index 0000000000000000000000000000000000000000..6a17031a58deee69d69386fda8017645b29bfb43
--- /dev/null
+++ b/contrib/onelab/myOS.h
@@ -0,0 +1,24 @@
+// Gmsh - Copyright (C) 1997-2012 C. Geuzaine, J.-F. Remacle
+//
+// See the LICENSE.txt file for license information. Please report all
+// bugs and problems to <gmsh@geuz.org>.
+
+#ifndef _OS_H_
+#define _OS_H_
+
+#include <string>
+
+const char *GetEnvironmentVar(const char *var);
+double GetTimeInSeconds();
+void SleepInSeconds(double s);
+void CheckResources();
+double Cpu();
+long GetMemoryUsage();
+int GetProcessId();
+std::string GetHostName();
+int UnlinkFile(const std::string &fileName);
+int StatFile(const std::string &fileName);
+int KillProcess(int pid);
+int SystemCall(const std::string &command, bool blocking=false);
+
+#endif