Attachment #159467 for bug #230685

View | Details | Raw Unified | Return to bug 230685
Collapse All | Expand All

Lines 1916-1922 Link Here

(-)OpenModelica/Compiler/Ceval.mo (-1 / +1 lines)
1916	pd = System.pathDelimiter();	1916	pd = System.pathDelimiter();
1917	executableSuffixedExe = stringAppend(executable, System.getExeExt());	1917	executableSuffixedExe = stringAppend(executable, System.getExeExt());
1918	sim_call = Util.stringAppendList(	1918	sim_call = Util.stringAppendList(
1919	{cit,executableSuffixedExe,cit," > output.log 2>&1"});	1919	{cit,"./",executableSuffixedExe,cit," > output.log 2>&1"});
1920	0 = System.systemCall(sim_call);	1920	0 = System.systemCall(sim_call);
1921	result_file = Util.stringAppendList({executable,"_res.plt"});	1921	result_file = Util.stringAppendList({executable,"_res.plt"});
1922	simValue = Values.RECORD(Absyn.IDENT("SimulationResult"),	1922	simValue = Values.RECORD(Absyn.IDENT("SimulationResult"),

Lines 36-44 Link Here

(-)OpenModelica/Compiler/omc_debug/Makefile.in (-2 / +2 lines)
36		36
37	ifeq ($(OSTYP),$(OS_MSYS))	37	ifeq ($(OSTYP),$(OS_MSYS))
38	LIBSOCKET=	38	LIBSOCKET=
39	CORBALIB=-L$(CORBAHOME)/lib -lmico -lwsock32	39	CORBALIB=-L$(CORBAHOME)/lib -lmico2.3.12 -lwsock32
40	else	40	else
41	CORBALIB=-L$(CORBAHOME)/lib -lmico -lcrypto -lssl -lpthread -lreadline	41	CORBALIB=-L$(CORBAHOME)/lib -lmico2.3.12 -lcrypto -lssl -lpthread -lreadline
42	endif	42	endif
43		43
44	ifdef USE_CORBA	44	ifdef USE_CORBA

Lines 36-44 Link Here

(-)OpenModelica/Compiler/omc_release/Makefile.in (-2 / +2 lines)
36		36
37	ifeq ($(OSTYP),$(OS_MSYS))	37	ifeq ($(OSTYP),$(OS_MSYS))
38	LIBSOCKET=	38	LIBSOCKET=
39	CORBALIB=-L$(CORBAHOME)/lib -lmico -lwsock32	39	CORBALIB=-L$(CORBAHOME)/lib -lmico2.3.12 -lwsock32
40	else	40	else
41	CORBALIB=-L$(CORBAHOME)/lib -lmico -lcrypto -lssl -lpthread	41	CORBALIB=-L$(CORBAHOME)/lib -lmico2.3.12 -lcrypto -lssl -lpthread
42	endif	42	endif
43		43
44	ifdef USE_CORBA	44	ifdef USE_CORBA




{	
}

void errmsg_CORBA() {
  cerr << "CORBA disabled. Configure with --with-CORBA and recompile for enabling." << endl;
}

RML_BEGIN_LABEL(Corba__initialize)
{
  errmsg_CORBA();
  RML_TAILCALLK(rmlFC);
}
RML_END_LABEL


RML_BEGIN_LABEL(Corba__waitForCommand)
{
  errmsg_CORBA();
  RML_TAILCALLK(rmlFC);
}
RML_END_LABEL

RML_BEGIN_LABEL(Corba__sendreply)
{
  errmsg_CORBA();
  RML_TAILCALLK(rmlFC);
}
RML_END_LABEL

RML_BEGIN_LABEL(Corba__close)
{
  errmsg_CORBA();
  RML_TAILCALLK(rmlFC);
}
RML_END_LABEL

Lines 142-147 Link Here

(-)OpenModelica/Compiler/SimCodegen.mo (+1 lines)
142	" $(CFLAGS)",	142	" $(CFLAGS)",
143	" -I.",	143	" -I.",
144	" -o ",cname,"$(EXEEXT) ",cpp_file,	144	" -o ",cname,"$(EXEEXT) ",cpp_file,
		145	" -static",
145	" -lsim",	146	" -lsim",
146	" $(LDFLAGS)",	147	" $(LDFLAGS)",
147	" -lf2c",	148	" -lf2c",





echo "$as_me:$LINENO: checking for rml includefiles in $RMLHOME" >&5
echo $ECHO_N "checking for rml includefiles in $RMLHOME... $ECHO_C" >&6
rmlinc=`find ${RMLHOME}/include -follow -type d -name plain |grep include/plain`
if test -z "$rmlinc" ; then
  { { echo "$as_me:$LINENO: error: rml headers not found" >&5
echo "$as_me: error: rml headers not found" >&2;}


echo "$as_me:$LINENO: checking for antlr header files" >&5
echo $ECHO_N "checking for antlr header files... $ECHO_C" >&6
antlrinc=`find ${ANTLRHOME}/include /usr/local/include /usr/include -type f -name TreeParser.hpp -print | head -1 | awk -F/ '{ total="";for (i = 1 ; i < NF-1; i++) total= total $i "/"; print total}'`
if test -z "$antlrinc" ; then
  { { echo "$as_me:$LINENO: error: Could not find antlr include files" >&5
echo "$as_me: error: Could not find antlr include files" >&2;}


echo "$as_me:$LINENO: checking for antlr libs" >&5
echo $ECHO_N "checking for antlr libs... $ECHO_C" >&6
antlrlib=`find -L ${ANTLRHOME}/lib /usr/local/lib /usr/lib -type f -name libantlr.a -print | head -1 | awk -F/ '{ total="";for (i = 1 ; i < NF; i++) total= total $i "/"; print total}'`
if test -z "$antlrlib" ; then
  { { echo "$as_me:$LINENO: error: Could not find antlr lib file" >&5
echo "$as_me: error: Could not find antlr lib file" >&2;}

  echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
  readlinelib=`find -L /usr/lib /usr/local/lib -name libreadline.a | tail -1 | awk -F/ '{ total="";for (i = 1 ; i < NF; i++) total= total $i "/"; print total}'`
  if test -z "$readlinelib" ; then
     echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6

Lines 6-12 Link Here

(-)OpenModelica/c_runtime/Makefile (-1 / +1 lines)
6	CC = gcc	6	CC = gcc
7	FC = g77	7	FC = g77
8	AR = ar -ru	8	AR = ar -ru
9	CFLAGS = -O -fexceptions -Wall -ansi -pedantic -I$(top_builddir)/mosh/src/ $(EXTRA_CFLAGS)	9	CFLAGS = -O -fexceptions -fPIC -Wall -ansi -pedantic -I$(top_builddir)/mosh/src/ $(EXTRA_CFLAGS)
10	CPPFLAGS = $(CFLAGS)	10	CPPFLAGS = $(CFLAGS)
11	FFLAGS = -O -fexceptions	11	FFLAGS = -O -fexceptions
12	# P.A: before, g77 had -O3 or -O2 but that caused a bug in DDASRT, giving infinite loop.	12	# P.A: before, g77 had -O3 or -O2 but that caused a bug in DDASRT, giving infinite loop.

Lines 1-8 Link Here

(-)OpenModelica/OMShell/OMShell.pro (-2 / +4 lines)
1	TEMPLATE = app	1	TEMPLATE = app
2		2
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += /home/adrpo/dev/mico-2.3.12/include	4	INCLUDEPATH += .
5	LIBS+=-L/home/adrpo/dev/mico-2.3.12/lib -lmico2.3.12 -lssl -lcrypto -ldl -lbsd -lm -lpthread	5	LIBS+= $$system(mico-config --libs)
6	CONFIG += warn_on	6	CONFIG += warn_on
7	QT += network xml	7	QT += network xml
8		8
Lines 18-20 Link Here
18	oms.cpp \	18	oms.cpp \
19	main.cpp	19	main.cpp
20		20
		21	RESOURCES += oms.qrc
		22




<RCC>
    <qresource prefix="/" >
        <file>Resources/OMS.bmp</file>
        <file>Resources/OMS.ico</file>
        <file>Resources/clear.bmp</file>
        <file>Resources/copy.bmp</file>
        <file>Resources/cut.bmp</file>
        <file>Resources/help.bmp</file>
        <file>Resources/paste.bmp</file>
        <file>Resources/print.bmp</file>
        <file>Resources/start.bmp</file>
        <file>Resources/stop.bmp</file>
    </qresource>
</RCC>

Return to bug 230685

Lines 25-37 Link Here

(-)OpenModelica/Compiler/runtime/corbaimpl_stub.cpp (-5 / +5 lines)
25	{	25	{
26	}	26	}
27		27
28	void errmsg() {	28	void errmsg_CORBA() {
29	cerr << "CORBA disabled. Configure with --with-CORBA and recompile for enabling." << endl;	29	cerr << "CORBA disabled. Configure with --with-CORBA and recompile for enabling." << endl;
30	}	30	}
31		31
32	RML_BEGIN_LABEL(Corba__initialize)	32	RML_BEGIN_LABEL(Corba__initialize)
33	{	33	{
34	errmsg();	34	errmsg_CORBA();
35	RML_TAILCALLK(rmlFC);	35	RML_TAILCALLK(rmlFC);
36	}	36	}
37	RML_END_LABEL	37	RML_END_LABEL
Lines 39-59 Link Here
39		39
40	RML_BEGIN_LABEL(Corba__waitForCommand)	40	RML_BEGIN_LABEL(Corba__waitForCommand)
41	{	41	{
42	errmsg();	42	errmsg_CORBA();
43	RML_TAILCALLK(rmlFC);	43	RML_TAILCALLK(rmlFC);
44	}	44	}
45	RML_END_LABEL	45	RML_END_LABEL
46		46
47	RML_BEGIN_LABEL(Corba__sendreply)	47	RML_BEGIN_LABEL(Corba__sendreply)
48	{	48	{
49	errmsg();	49	errmsg_CORBA();
50	RML_TAILCALLK(rmlFC);	50	RML_TAILCALLK(rmlFC);
51	}	51	}
52	RML_END_LABEL	52	RML_END_LABEL
53		53
54	RML_BEGIN_LABEL(Corba__close)	54	RML_BEGIN_LABEL(Corba__close)
55	{	55	{
56	errmsg();	56	errmsg_CORBA();
57	RML_TAILCALLK(rmlFC);	57	RML_TAILCALLK(rmlFC);
58	}	58	}
59	RML_END_LABEL	59	RML_END_LABEL

Lines 3232-3238 Link Here

(-)OpenModelica/configure (-4 / +4 lines)
3232		3232
3233	echo "$as_me:$LINENO: checking for rml includefiles in $RMLHOME" >&5	3233	echo "$as_me:$LINENO: checking for rml includefiles in $RMLHOME" >&5
3234	echo $ECHO_N "checking for rml includefiles in $RMLHOME... $ECHO_C" >&6	3234	echo $ECHO_N "checking for rml includefiles in $RMLHOME... $ECHO_C" >&6
3235	rmlinc=`find $RMLHOME -follow -type d -name plain \|grep include/plain`	3235	rmlinc=`find ${RMLHOME}/include -follow -type d -name plain \|grep include/plain`
3236	if test -z "$rmlinc" ; then	3236	if test -z "$rmlinc" ; then
3237	{ { echo "$as_me:$LINENO: error: rml headers not found" >&5	3237	{ { echo "$as_me:$LINENO: error: rml headers not found" >&5
3238	echo "$as_me: error: rml headers not found" >&2;}	3238	echo "$as_me: error: rml headers not found" >&2;}
Lines 3246-3252 Link Here
3246		3246
3247	echo "$as_me:$LINENO: checking for antlr header files" >&5	3247	echo "$as_me:$LINENO: checking for antlr header files" >&5
3248	echo $ECHO_N "checking for antlr header files... $ECHO_C" >&6	3248	echo $ECHO_N "checking for antlr header files... $ECHO_C" >&6
3249	antlrinc=`find $ANTLRHOME /usr/local/include /usr/include -type f -name TreeParser.hpp -print \| head -1 \| awk -F/ '{ total="";for (i = 1 ; i < NF-1; i++) total= total $i "/"; print total}'`	3249	antlrinc=`find ${ANTLRHOME}/include /usr/local/include /usr/include -type f -name TreeParser.hpp -print \| head -1 \| awk -F/ '{ total="";for (i = 1 ; i < NF-1; i++) total= total $i "/"; print total}'`
3250	if test -z "$antlrinc" ; then	3250	if test -z "$antlrinc" ; then
3251	{ { echo "$as_me:$LINENO: error: Could not find antlr include files" >&5	3251	{ { echo "$as_me:$LINENO: error: Could not find antlr include files" >&5
3252	echo "$as_me: error: Could not find antlr include files" >&2;}	3252	echo "$as_me: error: Could not find antlr include files" >&2;}
Lines 3258-3264 Link Here
3258		3258
3259	echo "$as_me:$LINENO: checking for antlr libs" >&5	3259	echo "$as_me:$LINENO: checking for antlr libs" >&5
3260	echo $ECHO_N "checking for antlr libs... $ECHO_C" >&6	3260	echo $ECHO_N "checking for antlr libs... $ECHO_C" >&6
3261	antlrlib=`find $ANTLRHOME /usr/local/lib /usr/lib -type f -name libantlr.a -print \| head -1 \| awk -F/ '{ total="";for (i = 1 ; i < NF; i++) total= total $i "/"; print total}'`	3261	antlrlib=`find -L ${ANTLRHOME}/lib /usr/local/lib /usr/lib -type f -name libantlr.a -print \| head -1 \| awk -F/ '{ total="";for (i = 1 ; i < NF; i++) total= total $i "/"; print total}'`
3262	if test -z "$antlrlib" ; then	3262	if test -z "$antlrlib" ; then
3263	{ { echo "$as_me:$LINENO: error: Could not find antlr lib file" >&5	3263	{ { echo "$as_me:$LINENO: error: Could not find antlr lib file" >&5
3264	echo "$as_me: error: Could not find antlr lib file" >&2;}	3264	echo "$as_me: error: Could not find antlr lib file" >&2;}
Lines 3310-3316 Link Here
3310	echo "$as_me:$LINENO: result: yes" >&5	3310	echo "$as_me:$LINENO: result: yes" >&5
3311	echo "${ECHO_T}yes" >&6	3311	echo "${ECHO_T}yes" >&6
3312	else	3312	else
3313	readlinelib=`find /usr/lib /usr/local/lib -name libreadline.a \| tail -1 \| awk -F/ '{ total="";for (i = 1 ; i < NF; i++) total= total $i "/"; print total}'`	3313	readlinelib=`find -L /usr/lib /usr/local/lib -name libreadline.a \| tail -1 \| awk -F/ '{ total="";for (i = 1 ; i < NF; i++) total= total $i "/"; print total}'`
3314	if test -z "$readlinelib" ; then	3314	if test -z "$readlinelib" ; then
3315	echo "$as_me:$LINENO: result: no" >&5	3315	echo "$as_me:$LINENO: result: no" >&5
3316	echo "${ECHO_T}no" >&6	3316	echo "${ECHO_T}no" >&6

Lines 1-14 Link Here

(-)OpenModelica/OMShell/oms.qrc (-10 / +10 lines)
1	<RCC>	1	<RCC>
2	<qresource prefix="/" >	2	<qresource prefix="/" >
3	<file>Resources\OMS.bmp</file>	3	<file>Resources/OMS.bmp</file>
4	<file>Resources\OMS.ico</file>	4	<file>Resources/OMS.ico</file>
5	<file>Resources\clear.bmp</file>	5	<file>Resources/clear.bmp</file>
6	<file>Resources\copy.bmp</file>	6	<file>Resources/copy.bmp</file>
7	<file>Resources\cut.bmp</file>	7	<file>Resources/cut.bmp</file>
8	<file>Resources\help.bmp</file>	8	<file>Resources/help.bmp</file>
9	<file>Resources\paste.bmp</file>	9	<file>Resources/paste.bmp</file>
10	<file>Resources\print.bmp</file>	10	<file>Resources/print.bmp</file>
11	<file>Resources\start.bmp</file>	11	<file>Resources/start.bmp</file>
12	<file>Resources\stop.bmp</file>	12	<file>Resources/stop.bmp</file>
13	</qresource>	13	</qresource>
14	</RCC>	14	</RCC>