added backwards compatible to the search for DrModelica and OMC in OM…

…Notebook and OMShell // Anders Fernström git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@2177 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 28, 2006 · 1128b33 · 1128b33
1 parent 4d6cf18
commit 1128b33
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/OMShell/QWinMosh.vcproj b/OMShell/QWinMosh.vcproj
@@ -249,15 +249,6 @@
 			Name="Generated Files"
 			Filter="moc;h;cpp"
 			UniqueIdentifier="{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}">
-			<File
-				RelativePath=".\generatedfiles\release\moc_omc_communicator.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath=".\generatedfiles\debug\moc_omc_communicator.cpp">
 				<FileConfiguration
@@ -275,7 +266,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\GeneratedFiles\release\moc_oms.cpp">
+				RelativePath=".\generatedfiles\release\moc_omc_communicator.cpp">
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE">
@@ -299,6 +290,15 @@
 						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\GeneratedFiles\release\moc_oms.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath=".\GeneratedFiles\qrc_oms.cpp">
 			</File>

diff --git a/OMShell/omcinteractiveenvironment.cpp b/OMShell/omcinteractiveenvironment.cpp
@@ -51,6 +51,7 @@ licence: http://www.trolltech.com/products/qt/licensing.html
 #include <exception>
 #include <stdexcept>
 
+#include <QtCore/QDir>
 #include <QtGui/QMessageBox>
 
 #include "omcinteractiveenvironment.h"
@@ -138,7 +139,22 @@ namespace IAEX
 				throw std::exception( "Could not find environment variable OPENMODELICAHOME" );
 
 			// location of omc in openmodelica folder
-			OMCPath += "\\bin\\";
+			QDir dir;
+			if( dir.exists( QString(OMCPath.c_str()) + "\\bin\\omc.exe" ) )
+				OMCPath += "\\bin\\";
+			else if( dir.exists( QString(OMCPath.c_str()) + "\\omc.exe" ) )
+				OMCPath;
+			else if( dir.exists( "omc.exe" ))
+				OMCPath = "";
+			else
+			{
+				string msg = "Unable to find omc.exe, searched in:\n" +
+					OMCPath + "\\bin\\\n" +
+					OMCPath + "\n" +
+					dir.absolutePath().toStdString();
+
+				throw std::exception( msg.c_str() );
+			}
 
 			STARTUPINFO startinfo;
 			PROCESS_INFORMATION procinfo;