Skip to content

Commit

Permalink
Merge pull request #88 from RosettaCommons/roccomoretti/boost_submod
Browse files Browse the repository at this point in the history 
Add boost_submod to tool directory scripts.

To support full testing of RosettaCommons/main#4360, we need to have support/changes for the new boost location in the tools repo (for tests like the header only and serialization code quality tests, which use scripts in the tools directory which hard code the compiler include paths.)

To support both current master and the new submodule approach, I've added the boost_submod directory to the compilation command line in addition the the old boost_1_55_0 one. That should hopefully work for both versions, as nonexistant include directories should be ignored. (We can remove the old directory if/when we officially merge the submodule approach.)
  • Loading branch information
@roccomoretti
roccomoretti authored Nov 19, 2019
2 parents 2607833 + 4a53159 commit 16534f8
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion clang_ast_transform/add_serialization_code.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ $CLANG_BIN/rosetta-refactor-tool -matchers=add_serialization_code $OUT_DIR $FILE
clang++ -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS \
-std=c++11 \
-isystem external/boost_1_55_0/ \
-isystem external/boost_submod/ \
-isystem external/ \
-isystem external/include/ \
-isystem external/dbio/ \
Expand All @@ -27,7 +28,6 @@ $CLANG_BIN/rosetta-refactor-tool -matchers=add_serialization_code $OUT_DIR $FILE
-Isrc/platform/linux/64/clang \
-Isrc/platform/linux/64 \
-Isrc/platform/linux \
-Iexternal/boost_1_55_0 \
-Iexternal/dbio \
-I/usr/include \
-I/usr/local/include
2 changes: 1 addition & 1 deletion clang_ast_transform/code_qual_check_file.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ $CLANG_BIN/rosetta-refactor-tool -matchers=code_quality_check /tmp/ $FILE -- \
clang++ -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS \
-std=c++11 \
-isystem external/boost_1_55_0/ \
-isystem external/boost_submod/ \
-isystem external/ \
-isystem external/include/ \
-isystem external/dbio/ \
Expand All @@ -26,7 +27,6 @@ $CLANG_BIN/rosetta-refactor-tool -matchers=code_quality_check /tmp/ $FILE -- \
-Isrc/platform/linux/64/clang \
-Isrc/platform/linux/64 \
-Isrc/platform/linux \
-Iexternal/boost_1_55_0 \
-Iexternal/dbio \
-I/usr/include \
-I/usr/local/include
2 changes: 1 addition & 1 deletion clang_ast_transform/debug_run_rrt_matchers_on_file.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ $CLANG_BIN/rosetta-refactor-tool -matchers=$MATCHERS $FILE -- \
clang++ -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS \
-std=c++11 \
-isystem $SOURCE/external/boost_1_55_0/ \
-isystem $SOURCE/external/boost_submod/ \
-isystem $SOURCE/external \
-isystem $SOURCE/external/include/ \
-isystem $SOURCE/external/dbio/ \
Expand All @@ -53,7 +54,6 @@ $CLANG_BIN/rosetta-refactor-tool -matchers=$MATCHERS $FILE -- \
-I$SOURCE/src/platform/linux/64/clang \
-I$SOURCE/src/platform/linux/64 \
-I$SOURCE/src/platform/linux \
-I$SOURCE/external/boost_1_55_0 \
-I$SOURCE/external/dbio \
-I/usr/include \
-I/usr/local/include
2 changes: 1 addition & 1 deletion clang_ast_transform/dump_ast.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ $CLANG_BUILD/bin/clang-check -ast-dump $1 -ast-dump-filter=$2 -- \
clang++ -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS \
-std=c++11 \
-isystem $ROSETTA_SOURCE/external/boost_1_55_0/ \
-isystem $ROSETTA_SOURCE/external/boost_submod/ \
-isystem $ROSETTA_SOURCE/external/ \
-isystem $ROSETTA_SOURCE/external/include/ \
-isystem $ROSETTA_SOURCE/external/dbio/ \
Expand All @@ -41,7 +42,6 @@ $CLANG_BUILD/bin/clang-check -ast-dump $1 -ast-dump-filter=$2 -- \
-I$ROSETTA_SOURCE/src/platform/linux/64/clang \
-I$ROSETTA_SOURCE/src/platform/linux/64 \
-I$ROSETTA_SOURCE/src/platform/linux \
-I$ROSETTA_SOURCE/external/boost_1_55_0 \
-I$ROSETTA_SOURCE/external/dbio \
-I/usr/include \
-I/usr/local/include
2 changes: 1 addition & 1 deletion clang_ast_transform/emit_ast.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ SRC=/local/luki/clang/llvm
$BD/bin/clang++ $1 -emit-ast -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS \
-std=c++11 \
-isystem external/boost_1_55_0/ \
-isystem external/boost_submod/ \
-isystem external/ \
-isystem external/include/ \
-isystem external/dbio/ \
Expand All @@ -19,7 +20,6 @@ $BD/bin/clang++ $1 -emit-ast -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS \
-Isrc/platform/linux/64/clang \
-Isrc/platform/linux/64 \
-Isrc/platform/linux \
-Iexternal/boost_1_55_0 \
-Iexternal/dbio \
-I/usr/include \
-I/usr/local/include
2 changes: 1 addition & 1 deletion clang_ast_transform/extract_serialization_data.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ $CLANG_BIN/rosetta-refactor-tool -matchers=find_record_decl,find_constructor_dec
clang++ -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS \
-std=c++11 \
-isystem $SOURCE/external/boost_1_55_0/ \
-isystem $SOURCE/external/boost_submod/ \
-isystem $SOURCE/external/ \
-isystem $SOURCE/external/include/ \
-isystem $SOURCE/external/dbio/ \
Expand All @@ -48,7 +49,6 @@ $CLANG_BIN/rosetta-refactor-tool -matchers=find_record_decl,find_constructor_dec
-I$SOURCE/src/platform/linux/64/clang \
-I$SOURCE/src/platform/linux/64 \
-I$SOURCE/src/platform/linux \
-I$SOURCE/external/boost_1_55_0 \
-I$SOURCE/external/dbio \
-I$SOURCE/external/libxml2/include/ \
-I/usr/include \
Expand Down
2 changes: 1 addition & 1 deletion clang_ast_transform/rewrite_file.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ $CLANG_BIN/rosetta-refactor-tool -matchers=rewrite -verbose $OUT_DIR $FILE -- \
clang++ -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS \
-std=c++11 \
-isystem external/boost_1_55_0/ \
-isystem external/boost_submod/ \
-isystem external/ \
-isystem external/include/ \
-isystem external/dbio/ \
Expand All @@ -27,7 +28,6 @@ $CLANG_BIN/rosetta-refactor-tool -matchers=rewrite -verbose $OUT_DIR $FILE -- \
-Isrc/platform/linux/64/clang \
-Isrc/platform/linux/64 \
-Isrc/platform/linux \
-Iexternal/boost_1_55_0 \
-Iexternal/dbio \
-I/usr/include \
-I/usr/local/include
2 changes: 1 addition & 1 deletion clang_ast_transform/rewrite_file_test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ $CLANG_BIN/rosetta-refactor-tool -matchers=rewrite $OUT_DIR $FILE -- \
clang++ -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS \
-std=c++11 \
-isystem external/boost_1_55_0/ \
-isystem external/boost_submod/ \
-isystem external/ \
-isystem external/include/ \
-isystem external/dbio/ \
Expand All @@ -29,7 +30,6 @@ $CLANG_BIN/rosetta-refactor-tool -matchers=rewrite $OUT_DIR $FILE -- \
-Isrc/platform/linux/64/clang \
-Isrc/platform/linux/64 \
-Isrc/platform/linux \
-Iexternal/boost_1_55_0 \
-Iexternal/dbio \
-Iexternal/cxxtest/ \
-Itest/ \
Expand Down
2 changes: 1 addition & 1 deletion clang_ast_transform/rewrite_test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ $CLANG_BIN/rosetta-refactor-tool -matchers=rewrite $1 -- \
clang++ -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS \
-std=c++11 \
-isystem external/boost_1_55_0/ \
-isystem external/boost_submod/ \
-isystem external/ \
-isystem external/include/ \
-isystem external/dbio/ \
Expand All @@ -24,7 +25,6 @@ $CLANG_BIN/rosetta-refactor-tool -matchers=rewrite $1 -- \
-Isrc/platform/linux/64/clang \
-Isrc/platform/linux/64 \
-Isrc/platform/linux \
-Iexternal/boost_1_55_0 \
-Iexternal/dbio \
-I/usr/include \
-I/usr/local/include
2 changes: 1 addition & 1 deletion clang_ast_transform/run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ $CLANG_BIN/rosetta-refactor-tool ${*:2} $FILE -- \
clang++ -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS \
-std=c++11 \
-isystem $SOURCE/external/boost_1_55_0/ \
-isystem $SOURCE/external/boost_submod/ \
-isystem $SOURCE/external/ \
-isystem $SOURCE/external/include/ \
-isystem $SOURCE/external/dbio/ \
Expand All @@ -24,7 +25,6 @@ $CLANG_BIN/rosetta-refactor-tool ${*:2} $FILE -- \
-I$SOURCE/src/platform/linux/64/clang \
-I$SOURCE/src/platform/linux/64 \
-I$SOURCE/src/platform/linux \
-I$SOURCE/external/boost_1_55_0 \
-I$SOURCE/external/dbio \
-I/usr/include \
-I/usr/local/include
2 changes: 1 addition & 1 deletion clang_ast_transform/run_rrt_matchers_on_file.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ $CLANG_BIN/rosetta-refactor-tool -matchers=$MATCHERS $FILE -- \
clang++ -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS \
-std=c++11 \
-isystem $SOURCE/external/boost_1_55_0/ \
-isystem $SOURCE/external/boost_submod/ \
-isystem $SOURCE/external/ \
-isystem $SOURCE/external/include/ \
-isystem $SOURCE/external/dbio/ \
Expand All @@ -53,7 +54,6 @@ $CLANG_BIN/rosetta-refactor-tool -matchers=$MATCHERS $FILE -- \
-I$SOURCE/src/platform/linux/64/clang \
-I$SOURCE/src/platform/linux/64 \
-I$SOURCE/src/platform/linux \
-I$SOURCE/external/boost_1_55_0 \
-I$SOURCE/external/dbio \
-I/usr/include \
-I/usr/local/include
2 changes: 1 addition & 1 deletion clang_ast_transform/run_serialization_validator_on_file.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
"-ffor-scope " + \
"-DEXIT_THROWS_EXCEPTION " + \
"-isystem " + rosetta_source_dir + "/external/boost_1_55_0/ " + \
"-isystem " + rosetta_source_dir + "/external/boost_submod/ " + \
"-isystem " + rosetta_source_dir + "/external/ " + \
"-isystem " + rosetta_source_dir + "/external/include/ " + \
"-isystem " + rosetta_source_dir + "/external/dbio/ " + \
Expand All @@ -85,7 +86,6 @@
"-I" + rosetta_source_dir + "/src/platform/linux/64/clang " + \
"-I" + rosetta_source_dir + "/src/platform/linux/64 " + \
"-I" + rosetta_source_dir + "/src/platform/linux " + \
"-I" + rosetta_source_dir + "/external/boost_1_55_0 " + \
"-I" + rosetta_source_dir + "/external/dbio " + \
"-I" + rosetta_source_dir + "/external/libxml2/include " + \
"-I/usr/include " + \
Expand Down
4 changes: 2 additions & 2 deletions python_cc_reader/test_compile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def central_compile_command() :
# if your compiler doesn't support -S, you might see this error:
# cc1plus: error: output filename specified twice

include_directories = " -I./ -I../external -I../external/include -Iplatform/" + os + "/" + nbits + "/gcc -Iplatform/" + os + "/" + nbits + " -Iplatform/" + os + " -I../external/boost_1_55_0 -I/usr/local/include -I/usr/include/ -I../external/dbio -I../external/libxml2/include"
include_directories = " -I./ -I../external -I../external/include -Iplatform/" + os + "/" + nbits + "/gcc -Iplatform/" + os + "/" + nbits + " -Iplatform/" + os + " -I../external/boost_1_55_0 -I../external/boost_submod -I/usr/local/include -I/usr/include/ -I../external/dbio -I../external/libxml2/include"

generic_command = " -c -std=c++11 -pipe -ffor-scope -w -pedantic -Wno-long-long -O0 -ffloat-store -DPTR_MODERN -DPTR_STD" + include_directories
return compiler, generic_command
Expand All @@ -53,7 +53,7 @@ def cxxtest_testgen_command() :


def cxxtest_gcc_compile_command() :
return "g++ -c -isystem ../external/boost_1_55_0/boost/ -O0 -g -ggdb -ffloat-store -I../external/cxxtest -I../. -I../test -I../src -I../external -I../external/include -Iplatform/linux/64/gcc -Iplatform/linux/64 -Iplatform/linux -I../external/boost_1_55_0 -I../external/dbio -I/usr/local/include -I/usr/include -o "
return "g++ -c -isystem ../external/boost_1_55_0/ -isystem ../external/boost_submod/ -O0 -g -ggdb -ffloat-store -I../external/cxxtest -I../. -I../test -I../src -I../external -I../external/include -Iplatform/linux/64/gcc -Iplatform/linux/64 -Iplatform/linux -I../external/dbio -I/usr/local/include -I/usr/include -o "

def cxxtest_test_compile( cxx_hh, verbose=False, id="" ) :
out_log = "out.log"
Expand Down

0 comments on commit 16534f8

Please sign in to comment.