Skip to content

Commit

Permalink
Modified how to specify CORBA related library in CMake setting file. #8
Browse files Browse the repository at this point in the history
  • Loading branch information
@ga-sakamoto
ga-sakamoto committed Jan 29, 2019
1 parent aaa632a commit b42244a
Show file tree
Hide file tree
Showing 28 changed files with 697 additions and 284 deletions.
9 changes: 6 additions & 3 deletions jp.go.aist.rtm.rtcbuilder/resource/100/DataPortIDL/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
set(comp_srcs MarkerPosition.cpp )
set(standalone_srcs MarkerPositionComp.cpp)

if(${OPENRTM_VERSION_MAJOR} LESS 2)
set(OPENRTM_CFLAGS ${OPENRTM_CFLAGS} ${OMNIORB_CFLAGS})
set(OPENRTM_INCLUDE_DIRS ${OPENRTM_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIRS})
set(OPENRTM_LIBRARY_DIRS ${OPENRTM_LIBRARY_DIRS} ${OMNIORB_LIBRARY_DIRS})
endif()

if (DEFINED OPENRTM_INCLUDE_DIRS)
string(REGEX REPLACE "-I" ";"
OPENRTM_INCLUDE_DIRS "${OPENRTM_INCLUDE_DIRS}")
Expand All @@ -27,14 +33,11 @@ include_directories(${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME})
include_directories(${PROJECT_BINARY_DIR})
include_directories(${PROJECT_BINARY_DIR}/idl)
include_directories(${OPENRTM_INCLUDE_DIRS})
include_directories(${OMNIORB_INCLUDE_DIRS})
add_definitions(${OPENRTM_CFLAGS})
add_definitions(${OMNIORB_CFLAGS})

MAP_ADD_STR(comp_hdrs "../" comp_headers)

link_directories(${OPENRTM_LIBRARY_DIRS})
link_directories(${OMNIORB_LIBRARY_DIRS})

add_library(${PROJECT_NAME} ${LIB_TYPE} ${comp_srcs}
${comp_headers} ${ALL_IDL_SRCS})
Expand Down
22 changes: 10 additions & 12 deletions jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/GuiRtcBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

import java.util.List;

import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;

import jp.go.aist.rtm.rtcbuilder.Generator.MergeHandler;
import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
import jp.go.aist.rtm.rtcbuilder.generator.HeaderException;
Expand All @@ -11,15 +18,6 @@
import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
import jp.go.aist.rtm.rtcbuilder.ui.compare.CompareResultDialog;
import jp.go.aist.rtm.rtcbuilder.ui.compare.CompareTarget;
import jp.go.aist.rtm.rtcbuilder.ui.editors.IMessageConstants;

import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;

/**
* GUIのRtcBuilderを実行する際のメインとなるクラス
Expand All @@ -31,7 +29,7 @@ public class GuiRtcBuilder {
Generator generator = new Generator();
/**
* ジェネレート・マネージャを追加する
*
*
* @param genManager　生成対象のジェネレート・マネージャ
*/
public void addGenerateManager(GenerateManager genManager) {
Expand All @@ -45,7 +43,7 @@ public void clearGenerateManager() {
}
/**
* ジェネレートを行い、ファイル出力を行う
*
*
* @param generatorParam
* パラメータ
*/
Expand All @@ -55,7 +53,7 @@ public boolean doGenerateWrite(GeneratorParam generatorParam) {
}
/**
* ジェネレートを行い、ファイル出力を行う
*
*
* @param generatorParam パラメータ
* @param isShowDialog 完了時にダイアログを表示するか
*/
Expand Down
93 changes: 91 additions & 2 deletions jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/corba/idl/parser/IDLParser.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,97 @@
package jp.go.aist.rtm.rtcbuilder.corba.idl.parser;
/* Generated By:JavaCC: Do not edit this line. IDLParser.java */
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.*;
import java.util.Vector;

/* Generated By:JavaCC: Do not edit this line. IDLParser.java */
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.NodeChoice;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.NodeList;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.NodeListOptional;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.NodeOptional;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.NodeSequence;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.NodeToken;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.add_expr;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.and_expr;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.any_type;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.array_declarator;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.attr_dcl;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.base_type_spec;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.boolean_literal;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.boolean_type;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.case_label;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.casex;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.char_type;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.character_literal;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.complex_declarator;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.const_dcl;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.const_exp;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.const_type;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.constr_type_spec;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.context_expr;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.declarator;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.declarators;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.definition;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.element_spec;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.enum_type;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.enumerator;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.except_dcl;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.export;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.fixed_array_size;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.floating_pt_literal;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.floating_pt_type;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.forward_dcl;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.identifier;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.inheritance_spec;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.integer_literal;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.integer_type;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.interface_body;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.interface_dcl;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.interface_header;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.interfacex;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.literal;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.member;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.member_list;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.module;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.mult_expr;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.octet_type;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.op_attribute;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.op_dcl;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.op_type_spec;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.or_expr;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.param_attribute;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.param_dcl;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.param_type_spec;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.parameter_dcls;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.positive_int_const;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.primary_expr;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.raises_expr;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.scoped_name;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.sequence_type;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.shift_expr;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.signed_int;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.signed_long_double_int;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.signed_long_int;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.signed_long_long_int;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.signed_short_int;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.simple_declarator;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.simple_type_spec;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.specification;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.string_literal;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.string_type;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.struct_type;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.switch_body;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.switch_type_spec;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.template_type_spec;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.type_dcl;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.type_declarator;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.type_spec;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.unary_expr;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.unary_operator;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.union_type;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.unsigned_int;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.unsigned_long_int;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.unsigned_long_long_int;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.unsigned_short_int;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.xor_expr;


public class IDLParser implements IDLParserConstants {
public static void main(String args[])
Expand Down
73 changes: 35 additions & 38 deletions ....rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/corba/idl/parser/IDLParserTokenManager.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
package jp.go.aist.rtm.rtcbuilder.corba.idl.parser;
/* Generated By:JavaCC: Do not edit this line. IDLParserTokenManager.java */
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.*;
import java.util.Vector;

public class IDLParserTokenManager implements IDLParserConstants
{
Expand Down Expand Up @@ -304,7 +301,7 @@ private final int jjMoveStringLiteralDfa1_0(long active0, long active1)
private final int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1)
{
if (((active0 &= old0) | (active1 &= old1)) == 0L)
return jjStartNfa_0(0, old0, old1);
return jjStartNfa_0(0, old0, old1);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(1, active0, active1);
Expand Down Expand Up @@ -358,7 +355,7 @@ private final int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1,
private final int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1)
{
if (((active0 &= old0) | (active1 &= old1)) == 0L)
return jjStartNfa_0(1, old0, old1);
return jjStartNfa_0(1, old0, old1);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(2, active0, active1);
Expand Down Expand Up @@ -418,7 +415,7 @@ private final int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1,
private final int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long active1)
{
if (((active0 &= old0) | (active1 &= old1)) == 0L)
return jjStartNfa_0(2, old0, old1);
return jjStartNfa_0(2, old0, old1);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(3, active0, active1);
Expand Down Expand Up @@ -476,7 +473,7 @@ else if ((active1 & 0x8L) != 0L)
private final int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long active1)
{
if (((active0 &= old0) | (active1 &= old1)) == 0L)
return jjStartNfa_0(3, old0, old1);
return jjStartNfa_0(3, old0, old1);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(4, active0, active1);
Expand Down Expand Up @@ -530,7 +527,7 @@ else if ((active0 & 0x4000000000L) != 0L)
private final int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long active1)
{
if (((active0 &= old0) | (active1 &= old1)) == 0L)
return jjStartNfa_0(4, old0, old1);
return jjStartNfa_0(4, old0, old1);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(5, active0, active1);
Expand Down Expand Up @@ -576,7 +573,7 @@ else if ((active1 & 0x20L) != 0L)
private final int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long active1)
{
if (((active0 &= old0) | (active1 &= old1)) == 0L)
return jjStartNfa_0(5, old0, old1);
return jjStartNfa_0(5, old0, old1);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(6, active0, 0L);
Expand Down Expand Up @@ -1401,48 +1398,48 @@ else if (curChar < 128)
}
}
static final int[] jjnextStates = {
89, 90, 92, 20, 93, 94, 79, 82, 64, 71, 77, 40, 41, 43, 27, 29,
53, 56, 2, 3, 4, 7, 7, 8, 11, 9, 10, 7, 8, 9, 10, 7,
9, 10, 7, 8, 11, 21, 22, 25, 36, 38, 40, 41, 45, 43, 40, 41,
47, 43, 49, 51, 40, 41, 50, 43, 54, 55, 85, 87, 91, 22, 25, 5,
6, 23, 24, 30, 31, 33, 35, 42, 44, 46, 48, 80, 81, 95, 96,
89, 90, 92, 20, 93, 94, 79, 82, 64, 71, 77, 40, 41, 43, 27, 29,
53, 56, 2, 3, 4, 7, 7, 8, 11, 9, 10, 7, 8, 9, 10, 7,
9, 10, 7, 8, 11, 21, 22, 25, 36, 38, 40, 41, 45, 43, 40, 41,
47, 43, 49, 51, 40, 41, 50, 43, 54, 55, 85, 87, 91, 22, 25, 5,
6, 23, 24, 30, 31, 33, 35, 42, 44, 46, 48, 80, 81, 95, 96,
};
private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
{
switch(hiByte)
{
case 0:
return ((jjbitVec2[i2] & l2) != 0L);
default :
default :
if ((jjbitVec0[i1] & l1) != 0L)
return true;
return false;
}
}
public static final String[] jjstrLiteralImages = {
"", null, null, null, null, null, null, null, null, null, null, "\73",
"\155\157\144\165\154\145", "\173", "\175", "\151\156\164\145\162\146\141\143\145", "\72", "\54",
"\72\72", "\143\157\156\163\164", "\75", "\174", "\136", "\46", "\76\76", "\74\74",
"\53", "\55", "\52", "\57", "\45", "\176", "\50", "\51", "\124\122\125\105",
"\106\101\114\123\105", "\164\171\160\145\144\145\146", "\146\154\157\141\164",
"\144\157\165\142\154\145", "\154\157\156\147", "\163\150\157\162\164",
"\165\156\163\151\147\156\145\144", "\143\150\141\162", "\142\157\157\154\145\141\156", "\157\143\164\145\164",
"\141\156\171", "\163\164\162\165\143\164", "\165\156\151\157\156",
"\163\167\151\164\143\150", "\143\141\163\145", "\144\145\146\141\165\154\164", "\145\156\165\155",
"\163\145\161\165\145\156\143\145", "\74", "\76", "\163\164\162\151\156\147", "\167\163\164\162\151\156\147",
"\133", "\135", "\162\145\141\144\157\156\154\171",
"\141\164\164\162\151\142\165\164\145", "\145\170\143\145\160\164\151\157\156",
"\145\170\143\145\160\164\151\157\156\137\142\157\144\171", "\157\156\145\167\141\171", "\166\157\151\144", "\151\156", "\157\165\164",
"\151\156\157\165\164", "\162\141\151\163\145\163", "\143\157\156\164\145\170\164", null, null, null,
"", null, null, null, null, null, null, null, null, null, null, "\73",
"\155\157\144\165\154\145", "\173", "\175", "\151\156\164\145\162\146\141\143\145", "\72", "\54",
"\72\72", "\143\157\156\163\164", "\75", "\174", "\136", "\46", "\76\76", "\74\74",
"\53", "\55", "\52", "\57", "\45", "\176", "\50", "\51", "\124\122\125\105",
"\106\101\114\123\105", "\164\171\160\145\144\145\146", "\146\154\157\141\164",
"\144\157\165\142\154\145", "\154\157\156\147", "\163\150\157\162\164",
"\165\156\163\151\147\156\145\144", "\143\150\141\162", "\142\157\157\154\145\141\156", "\157\143\164\145\164",
"\141\156\171", "\163\164\162\165\143\164", "\165\156\151\157\156",
"\163\167\151\164\143\150", "\143\141\163\145", "\144\145\146\141\165\154\164", "\145\156\165\155",
"\163\145\161\165\145\156\143\145", "\74", "\76", "\163\164\162\151\156\147", "\167\163\164\162\151\156\147",
"\133", "\135", "\162\145\141\144\157\156\154\171",
"\141\164\164\162\151\142\165\164\145", "\145\170\143\145\160\164\151\157\156",
"\145\170\143\145\160\164\151\157\156\137\142\157\144\171", "\157\156\145\167\141\171", "\166\157\151\144", "\151\156", "\157\165\164",
"\151\156\157\165\164", "\162\141\151\163\145\163", "\143\157\156\164\145\170\164", null, null, null,
null, null, null, null, null, };
public static final String[] lexStateNames = {
"DEFAULT",
"DEFAULT",
};
static final long[] jjtoToken = {
0xfffffffffffff801L, 0x3fffL,
0xfffffffffffff801L, 0x3fffL,
};
static final long[] jjtoSkip = {
0x7feL, 0x0L,
0x7feL, 0x0L,
};
protected JavaCharStream input_stream;
private final int[] jjrounds = new int[98];
Expand Down Expand Up @@ -1504,7 +1501,7 @@ protected Token jjFillToken()
int jjmatchedPos;
int jjmatchedKind;

public Token getNextToken()
public Token getNextToken()
{
int kind;
Token specialToken = null;
Expand All @@ -1513,13 +1510,13 @@ public Token getNextToken()

EOFLoop :
for (;;)
{
try
{
{
try
{
curChar = input_stream.BeginToken();
}
}
catch(java.io.IOException e)
{
{
jjmatchedKind = 0;
matchedToken = jjFillToken();
return matchedToken;
Expand Down
Loading

0 comments on commit b42244a

Please sign in to comment.