12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed wrap under windows

release/4.3a0
Richard Roberts 2012-05-23 21:23:27 +00:00
parent 6e2312294c
commit ac150043bd
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wrap/Module.cpp
View File

@ -25,12 +25,14 @@
#include <boost/spirit/include/classic_confix.hpp>
#include <boost/spirit/include/classic_clear_actor.hpp>
#include <boost/foreach.hpp>
#include <boost/filesystem.hpp>
#include <iostream>
using namespace std;
using namespace wrap;
using namespace BOOST_SPIRIT_CLASSIC_NS;
namespace fs = boost::filesystem;
typedef rule<BOOST_SPIRIT_CLASSIC_NS::phrase_scanner_t> Rule;
@ -279,8 +281,8 @@ void verifyReturnTypes(const vector<string>& validtypes, const vector<T>& vt) {
/* ************************************************************************* */
void Module::matlab_code(const string& toolboxPath,
const string& mexExt, const string& mexFlags) const {
string installCmd = "install -d " + toolboxPath;
system(installCmd.c_str());
fs::create_directories(toolboxPath);
// create make m-file
string matlabMakeFileName = toolboxPath + "/make_" + name + ".m";
@ -327,8 +329,7 @@ void Module::matlab_code(const string& toolboxPath,
BOOST_FOREACH(Class cls, classes) {
// create directory if needed
string classPath = toolboxPath + "/@" + cls.qualifiedName();
string installCmd = "install -d " + classPath;
system(installCmd.c_str());
fs::create_directories(classPath);
// create proxy class
string classFile = classPath + "/" + cls.qualifiedName() + ".m";

11
wrap/tests/testWrap.cpp
View File

@ -20,6 +20,7 @@
#include <fstream>
#include <sstream>
#include <boost/assign/std/vector.hpp>
#include <boost/filesystem.hpp>
#include <CppUnitLite/TestHarness.h>
#include <wrap/utilities.h>
@ -28,6 +29,7 @@
using namespace std;
using namespace boost::assign;
using namespace wrap;
namespace fs = boost::filesystem;
static bool enable_verbose = false;
#ifdef TOPSRCDIR
static string topdir = TOPSRCDIR;
@ -57,8 +59,7 @@ TEST( wrap, check_exception ) {
CHECK_EXCEPTION(Module("/alsonotarealpath", "geometry",enable_verbose), CantOpenFile);
// clean out previous generated code
string cleanCmd = "rm -rf actual_deps";
system(cleanCmd.c_str());
fs::remove_all("actual_deps");
string path = topdir + "/wrap/tests";
Module module(path.c_str(), "testDependencies",enable_verbose);
@ -208,8 +209,7 @@ TEST( wrap, matlab_code_namespaces ) {
string path = topdir + "/wrap";
// clean out previous generated code
string cleanCmd = "rm -rf actual_namespaces";
system(cleanCmd.c_str());
fs::remove_all("actual_namespaces");
// emit MATLAB code
string exp_path = path + "/tests/expected_namespaces/";
@ -263,8 +263,7 @@ TEST( wrap, matlab_code ) {
string path = topdir + "/wrap";
// clean out previous generated code
string cleanCmd = "rm -rf actual";
system(cleanCmd.c_str());
fs::remove_all("actual");
// emit MATLAB code
// make_geometry will not compile, use make testwrap to generate real make