change OMShellGUI from corba to direct interface

Author: hkiel

Makefile.in

@@ -33,5 +33,5 @@ Makefile: Makefile.in config.status
 	./config.status
 config.status: configure
 	./config.status -recheck
-configure: configure.ac common/m4/corba.m4 common/m4/omhome.m4 common/m4/qmake.m4
+configure: configure.ac common/m4/omhome.m4 common/m4/qmake.m4
 	autoconf

OMShell/OMShellGUI/Makefile.omdev.mingw

@@ -18,17 +18,9 @@ Makefile: OMShellGUI.pro
 
 clean: Makefile
 	test ! -f Makefile || $(MAKE) -f Makefile clean
-	rm -rf ../bin/$(NAME)$(EXE) omc_communication.* Makefile Makefile.Debug Makefile.Release object_script.*
+	rm -rf ../bin/$(NAME)$(EXE) Makefile Makefile.Debug Makefile.Release object_script.*
 
-omc_communication.cc: $(builddir_share)/omc/omc_communication.idl
-ifeq (MINGW32,$(findstring MINGW32,$(shell uname)))
-	$(OMDEV)/lib/omniORB-4.2.0-mingw32/bin/x86_win32/omniidl -T -bcxx -Wbh=.h -Wbs=.cc -p../../lib/python -Wbdebug $<
-else
-	$(OMDEV)/lib/omniORB-4.2.0-mingw64/bin/x86_win32/omniidl -T -bcxx -Wbh=.h -Wbs=.cc -p../../lib/python -Wbdebug $<
-endif
-omc_communication.h: omc_communication.cc
-
-$(NAME): omc_communication.cc omc_communication.h Makefile
+$(NAME): Makefile
 	$(MAKE) -f Makefile
 
 build: $(NAME)
@@ -37,5 +29,3 @@ build: $(NAME)
 	cp -p commands.xml $(builddir_share)/omshell/
 	cp -p OMShell_*.qm $(builddir_share)/omshell/nls/
 	cp -puf ../../common/pre-commit.sh $(shell git rev-parse --git-dir)/hooks/pre-commit
-
-

OMShell/OMShellGUI/Makefile.unix.in

@@ -11,12 +11,9 @@ Makefile: OMShell.config
 	$(QMAKE)
 
 clean: Makefile
-	rm -rf ../bin/$(NAME) ../bin/$(NAME)$(APP) omc_communication.* Makefile
+	rm -rf ../bin/$(NAME) ../bin/$(NAME)$(APP) Makefile
 
-omc_communication.cc omc_communication.h: @OPENMODELICAHOME@/share/omc/omc_communication.idl
-	@IDLCMD@ $<
-
-$(NAME): Makefile OMShell.config omc_communication.cc
+$(NAME): Makefile OMShell.config
 	$(MAKE) -f Makefile
 
 build: $(NAME)

OMShell/OMShellGUI/OMShell.config.in

@@ -1,10 +1,8 @@
 QMAKE_CC  = @CC@
 QMAKE_CXX = @CXX@
 QMAKE_LINK = @CXX@
-CORBALIBS = @CORBALIBS@
-CORBAINC = @CORBA_QMAKE_INCLUDES@
-USE_CORBA = @QT_USE_CORBA@
+OMCLIBS = -L@OMBUILDDIR@/lib/@host_short@/omc -Wl,-rpath,@loader_path/../../../../lib/@host_short@/omc,-rpath,@loader_path/../../../../lib/,-rpath,@OMBUILDDIR@/lib/@host_short@/omc,-rpath,@OMBUILDDIR@/lib/ -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lfmilib_shared -lModelicaExternalC -lomcgc -lomantlr3
 INCLUDEPATH += $$system(echo @CFLAGS@ | sed "s/\ //g" | grep ^-I | sed s/^-I//)
-QMAKE_CFLAGS = @CFLAGS@ @CPPFLAGS@
-QMAKE_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@
+QMAKE_CFLAGS = -g @CFLAGS@ @CPPFLAGS@
+QMAKE_CXXFLAGS = -g @CXXFLAGS@ @CPPFLAGS@
 QMAKE_LFLAGS += @LDFLAGS@

OMShell/OMShellGUI/OMShellGUI.pro

@@ -11,15 +11,11 @@ TARGET = OMShell
 TEMPLATE = app
 
 SOURCES += commandcompletion.cpp \
-    omc_communication.cc \
-    omc_communicator.cpp \
     omcinteractiveenvironment.cpp \
     oms.cpp \
     main.cpp
 
 HEADERS += commandcompletion.h \
-    omc_communication.h \
-    omc_communicator.h \
     omcinteractiveenvironment.h \
     oms.h
 
@@ -32,15 +28,11 @@ win32 {
   ISMINGW32 = $$find(UNAME, MINGW32)
   message(uname: $$UNAME)
   count( ISMINGW32, 1 ) {
-    CORBAINC = $$(OMDEV)/lib/omniORB-4.2.0-mingw32/include
-    CORBALIBS = -L$$(OMDEV)/lib/omniORB-4.2.0-mingw32/lib/x86_win32 -lomniORB420_rt -lomnithread40_rt
     DEFINES += __x86__ \
                __NT__ \
                __OSVERSION__=4 \
                __WIN32__
   } else {
-    CORBAINC = $$(OMDEV)/lib/omniORB-4.2.0-mingw64/include
-    CORBALIBS = -L$$(OMDEV)/lib/omniORB-4.2.0-mingw64/lib/x86_win32 -lomniORB420_rt -lomnithread40_rt
     DEFINES += __x86__ \
 	           __x86_64__ \
 	           __NT__ \
@@ -54,8 +46,8 @@ win32 {
 }
 #---------End OMNIorb
 
-INCLUDEPATH += $${CORBAINC}
-LIBS += $${CORBALIBS}
+LIBS += $${OMCLIBS}
+INCLUDEPATH += ../../../build/include/omc/c
 
 CONFIG += warn_off
 

OMShell/OMShellGUI/inputcelldelegate.h

@@ -55,9 +55,6 @@ namespace IAEX
    public:
       virtual QString getResult() = 0;
       virtual void evalExpression(QString expr) = 0;
-    virtual void closeConnection() = 0;        // Added 2006-02-02 AF
-      virtual void reconnect() = 0;            // Added 2006-02-09 AF
-    virtual bool startDelegate() = 0;          // Added 2006-02-09 AF
    };
 
 }

OMShell/OMShellGUI/main.cpp

@@ -90,11 +90,9 @@ int main(int argc, char *argv[])
 {
   QApplication app(argc, argv);
 
-  OMS::startServer();
-
-  IAEX::OmcInteractiveEnvironment env;
-  env.evalExpression("getInstallationDirectoryPath()");
-  QString dir = unparse(env.getResult()) + "/share/omshell/nls";
+  IAEX::OmcInteractiveEnvironment *env = IAEX::OmcInteractiveEnvironment::getInstance();
+  env->evalExpression("getInstallationDirectoryPath()");
+  QString dir = unparse(env->getResult()) + "/share/omshell/nls";
   QString locale = QString("OMShell_") + QLocale::system().name();
 
   QTranslator translator;