- VC7 Setup fixes for new stuff in OMNotebook

- Parser fixes to handle multiple for iterators, both in array iterators and in for loops,
  Have a look at Absyn.ForIterators
- Small changes in makefiles
- Fixed stringEqual in external-rml.c
- ptplot.jar dumps the plot image in $OPENMODELICAHOME/tmp/
- OMNotebook and OMShell in windows now starts in $OPENMODELICAHOME/tmp/


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@2854 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

OMNotebook/OMNotebookQT4/graphcell.cpp

@@ -1248,9 +1248,9 @@ namespace IAEX
 				QMessageBox::critical( 0, "OpenModelica Error", "Could not find environment variable OPENMODELICAHOME; OMNotebook will therefore not work correctly" );
 
 			if( openmodelica.endsWith("/") || openmodelica.endsWith( "\\") )
-				openmodelica += "bin/";
+				openmodelica += "tmp/";
 			else
-				openmodelica += "/bin/";
+				openmodelica += "/tmp/";
 
 			//QDir dir( openmodelica );
 			QDir dir;

OMNotebook/OMNotebookQT4/inputcell.cpp

@@ -1179,13 +1179,13 @@ namespace IAEX
 				QMessageBox::critical( 0, "OpenModelica Error", "Could not find environment variable OPENMODELICAHOME; OMNotebook will therefore not work correctly" );
 
 			if( openmodelica.endsWith("/") || openmodelica.endsWith( "\\") )
-				openmodelica += "bin/";
+				openmodelica += "tmp/";
 			else
-				openmodelica += "/bin/";
+				openmodelica += "/tmp/";
 
 			//QDir dir( openmodelica );
 			QDir dir = QDir::current();
-			//dir.setPath( openmodelica );
+			dir.setPath( openmodelica );
 			QString imagename = "omc_tmp_plot.png";
 
 			QString filename = dir.absolutePath();

OMNotebook/OMNotebookQT4/notebook.cpp

@@ -2517,10 +2517,21 @@ namespace IAEX
 		try
 		{
 			QDir dir;
-			if( dir.exists( "OMNotebookHelp.onb" ) )
+			QString help( getenv( "OPENMODELICAHOME" ) );
+			if( help.isEmpty() )
+				QMessageBox::critical( 0, "OpenModelica Error", "Could not find environment variable OPENMODELICAHOME; OMNotebook will therefore not work correctly" );
+
+			if( help.endsWith("/") || help.endsWith( "\\") )
+				help += "bin/";
+			else
+				help += "/bin/";
+
+			QString helpFile = "OMNotebookHelp.onb";
+			dir.setPath( help );
+			if( dir.exists( helpFile ) )
 			{
 				application()->commandCenter()->executeCommand(
-					new OpenFileCommand( "OMNotebookHelp.onb" ));
+					new OpenFileCommand( help + helpFile ));
 			}
 			else
 			{