[Plb4jedit-cvs] plb4jedit/src/jedit/console/commando plbcmp.xml,1.3,1.4

[Peter S. <sch...@us...>]

Update of /cvsroot/plb4jedit/plb4jedit/src/jedit/console/commando
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4369/src/jedit/console/commando

Modified Files:
	plbcmp.xml 
Log Message:
includes listing and includes nested too deeply check

Index: plbcmp.xml
===================================================================
RCS file: /cvsroot/plb4jedit/plb4jedit/src/jedit/console/commando/plbcmp.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- plbcmp.xml	17 Nov 2003 09:31:27 -0000	1.3
+++ plbcmp.xml	24 Jan 2006 14:38:16 -0000	1.4
@@ -7,13 +7,16 @@
   <UI>
     <CHOICE LABEL="Source to compile" VARNAME="programName"  DEFAULT="actualBuffer">
 			<OPTION LABEL="Actual Buffer" VALUE="actualBuffer"/>
+			<OPTION LABEL="Really Buffer" VALUE="reallyBuffer"/>
 			<OPTION LABEL="last program" VALUE="lastProgram" />
 		</CHOICE>
     <!--<ENTRY LABEL="Classpath to rsiintern und jakarta-regexp" VARNAME="classpath" EVAL="jEdit.getProperty(&quot;rsi.cp.listinganalyzer&quot;)"/>-->
-		<ENTRY LABEL="plbwin.ini file" VARNAME="wininiFile" EVAL="jEdit.getProperty(&quot;rsi.plb.winini&quot;)"/>
-    <ENTRY LABEL="PLB_PATH" VARNAME="plbPath" EVAL="jEdit.getProperty(&quot;rsi.plb.path&quot;) == null ? getenv(&quot;PLB_PATH&quot;) : jEdit.getProperty(&quot;rsi.plb.path&quot;)"/>
-    <TOGGLE LABEL="debug info" VARNAME="debug" EVAL="Boolean.valueOf(jEdit.getProperty(&quot;rsi.plbcmp.debug&quot;)).booleanValue()"/>
-		<TOGGLE LABEL="assertion checks" VARNAME="assert" EVAL="Boolean.valueOf(jEdit.getProperty(&quot;rsi.plbcmp.assert&quot;)).booleanValue()"/>
+		<FILE_ENTRY LABEL="plbwin.ini file" VARNAME="wininiFile" EVAL="jEdit.getProperty(&quot;rsi.plb.winini&quot;)"/>
+		<DIR_ENTRY LABEL="Compile to" VARNAME="plcdir"  EVAL="jEdit.getProperty(&quot;rsi.dir.plc&quot;)"/>
+		<ENTRY LABEL="PLB_PATH" VARNAME="plbPath" EVAL="jEdit.getProperty(&quot;rsi.plb.path&quot;) == null ? getenv(&quot;PLB_PATH&quot;) : jEdit.getProperty(&quot;rsi.plb.path&quot;)"/>
+		<DIR_ENTRY LABEL="Path to incs_h" VARNAME="incs_h"  EVAL="jEdit.getProperty(&quot;rsi.plbcmp.incs_h&quot;)"/>
+		<TOGGLE LABEL="Compile with incs_h" VARNAME="incs_hToggle" EVAL="Boolean.valueOf(jEdit.getProperty(&quot;rsi.plbcmp.incs_hToggle&quot;)).booleanValue()"/>
+		<TOGGLE LABEL="debug info" VARNAME="debug" EVAL="Boolean.valueOf(jEdit.getProperty(&quot;rsi.plbcmp.debug&quot;)).booleanValue()"/>
   </UI>
   <COMMANDS>
 		<COMMAND SHELL="System" CONFIRM="FALSE">
@@ -46,14 +49,36 @@
       s;
 		</COMMAND>
 		<COMMAND SHELL="System" CONFIRM="FALSE">
+			if (!isInclude) {
+				if (net.sf.plb4jedit.plb.PlbPlugin.getMaxLevel() > 3) {
+						Macros.error(view,"includes nested too deeply for PLB 8.5 !"); 
+				}
+			}
+			"";
+		</COMMAND>
+		<COMMAND SHELL="System" CONFIRM="FALSE">
 			jEdit.setProperty("rsi.plbcmp.debug",String.valueOf(debug));
-			jEdit.setProperty("rsi.plbcmp.assert",String.valueOf(assert));
 			<!--jEdit.setProperty("rsi.cp.listinganalyzer",classpath);-->
 			jEdit.setProperty("rsi.plb.winini",wininiFile);
+			jEdit.setProperty("rsi.dir.plc",plcdir);
+			jEdit.setProperty("rsi.plbcmp.incs_h",incs_h);
+			jEdit.setProperty("rsi.plbcmp.incs_hToggle",String.valueOf(incs_hToggle));
+			
       if (!plbPath.equals(jEdit.getProperty("rsi.plb.path"))) {
         jEdit.setProperty("rsi.plb.path",plbPath);
-        setenv("PLB_PATH",plbPath);
       }
+			
+			//Macros.message(view,incs_hToggle);
+			
+			if (incs_hToggle) {
+				  if (File.separator.equals("/")) {	//unix
+						plbPath = incs_h + ":" + plbPath;
+					} else {
+						plbPath = incs_h + ";" + plbPath;
+					}
+			}
+			setenv("PLB_PATH",plbPath);
+			
       String sourceName = buffer.getPath();
       if (programName.equals("lastProgram")) {
         sourceName = jEdit.getProperty("rsi.plb.cmp.lastProgram");
@@ -114,7 +139,7 @@
       }
       
 			if (File.separator.equals("/")) {	//unix
-				cmd.append("bash -c 'plb plbcmp " + pureSource + extension + " "); 
+				cmd.append("bash -c '/opt/rsi/plb/plb plbcmp " + pureSource + extension + " "); 
 			} else {	// windows
 				cmd.append("plbwin ");
 				if (wininiFile != null &amp;&amp; wininiFile.length() > 0) {
@@ -123,15 +148,12 @@
 				cmd.append(" plbcmp " + pureSource + extension + " " );
 			}
 
-			String assertOption = "";
-			if (assert) { assertOption = "Vcassert=1"; }
-			
 			if (File.separator.equals("/")) {	//unix
   			cmd.append(plcdir + "/" + pureSource + ".plc " );
-				cmd.append(" -E=dbs ZH VOS=002 " + assertOption +" ZT ZG PE \\\\\"header\\\\\" 99999 ");
+				cmd.append(" -E=dbs ZH ZT ZG PE \\\\\"header\\\\\" 99999 ");
 			} else {
   			cmd.append(plcdir + "\\" + pureSource + ".plc " );
-				cmd.append(" -ZH VOS=003 " + assertOption +" ZT ZG PE 99999 \"x header\" ");
+				cmd.append(" -ZH ZT ZG PE 99999 \"x header\" ");
 			}	
       
 			if (debug) { cmd.append(" s"); }
@@ -151,13 +173,9 @@
         listing = listing.substring(0,listing.length()-4) + ".lst";
       }
       if (File.separator.equals("/")) {	//unix
-        classpath = jEdit.getSettingsDirectory() + "/jars/" + "jakarta-regexp-1.2.jar"
-                    + ":"
-                    +jEdit.getSettingsDirectory() + "/jars/" + "Plb-0.1.jar";
+         classpath = jEdit.getSettingsDirectory() + "/jars/" + "Plb-0.2.jar";
       } else {
-         classpath = jEdit.getSettingsDirectory() + "/jars/" + "jakarta-regexp-1.2.jar"
-                    + ";"
-                    +jEdit.getSettingsDirectory() + "/jars/" + "Plb-0.1.jar";
+         classpath = "\"" + jEdit.getSettingsDirectory() + "/jars/" + "Plb-0.2.jar \"";
       }
       cmd = new StringBuffer("java -cp " + classpath + " net.sf.plb4jedit.plb.ListingAnalyzer " + listing + " " + sourceName);
 			if(isInclude){