Permalink
Browse files

* Updated version to 1.2.3

* Added capnproto support to gpc.pl
[skip ci]
  • Loading branch information...
jredmondson authored and TheDash committed Aug 7, 2018
1 parent 8f3df93 commit 82a5628bbb3c80428d0d967b379e084ec09287f5
Showing with 37 additions and 7 deletions.
  1. +1 −1 VERSION.txt
  2. +23 −0 scripts/projects/common/using_capnp.mpb
  3. +1 −1 scripts/projects/common/using_madara.mpb
  4. +12 −5 scripts/projects/gpc.pl
@@ -1 +1 @@
1.2.2
1.2.3
@@ -0,0 +1,23 @@
project {
includes += $(CAPNP_ROOT)/c++/src
libpaths += $(CAPNP_ROOT)/c++/.libs
libs += capnp
libs += capnp-json
libs += kj
Define_Custom (CAPN) {
command = bash -c "capnp compile -I \$$CAPNP_ROOT/c++/src -oc++ \$$0;\
capnp compile -I \$$CAPNP_ROOT/c++/src -o/bin/cat \$$0 > \$$0.bin"
inputext = .capn
source_outputext = .capn.c++
header_outputext = .capn.h
generic_outputext = .capn.bin
automatic_out = 1
}
specific(prop:microsoft) {
DisableSpecificWarnings += 4005 4251 4275 4244
macros += _CRT_SECURE_NO_WARNINGS
}
}
@@ -1,4 +1,4 @@
project : using_boost {
project : using_boost, using_capnp {
includes += $(MADARA_ROOT)/include
libpaths += $(MADARA_ROOT)/lib
@@ -2212,7 +2212,7 @@
close project_file;
}
if (not -f "$path/using_boost.mpb")
if (not -f "$path/using_boost.mpb" or not -f "$path/using_capnp.mpb")
{
my $gamsroot = $ENV{GAMS_ROOT};
@@ -2221,10 +2221,9 @@
print (" Copying base projects from $gamsroot to $path...\n");
}
copy "$gamsroot/using_vrep.mpb", "$path/";
#copy "$gamsroot/using_madara.mpb", "$path/";
#copy "$gamsroot/using_gams.mpb", "$path/";
#copy "$gamsroot/using_boost.mpb", "$path/";
copy "$script_dir/common/using_vrep.mpb", "$path/";
copy "$script_dir/common/using_boost.mpb", "$path/";
copy "$script_dir/common/using_capnp.mpb", "$path/";
}
foreach my $new_alg (@new_algorithm)
@@ -4929,9 +4928,17 @@
if (not -f "$path/using_boost.mpb")
{
copy "$script_dir/common/using_madara.mpb", "$path/";
copy "$script_dir/common/using_boost.mpb", "$path/";
}
if (not -f "$path/using_capnp.mpb")
{
# the directory needs the new using_madara and using_capnp
copy "$script_dir/common/using_capnp.mpb", "$path/";
copy "$script_dir/common/using_madara.mpb", "$path/";
}
if (not -f "$path/using_gams.mpb")
{
copy "$script_dir/common/using_gams.mpb", "$path/";

0 comments on commit 82a5628

Please sign in to comment.