build now writes to a temp file

Author: kazimuth

build.xml

@@ -20,6 +20,7 @@
 	<property name="build" 		value="build" />
 	<property name="bin" 		value="bin" />
 	<property name="dist" 		value="dist" />
+	<property name="releasedir"	value="release" />
 
 	<property name="lib.path"	value="info/sansgills/mode/python" />
 	<property name="wrap.path"	value="info/sansgills/mode/python/wrapper" />
@@ -110,7 +111,7 @@
 		RELEASE
 	- - - - - - - - - - - - - - - - - - - - - - - -->
 	<target name="release" depends="package" >
-		<zip destfile="${dist}/${lib.name}.zip" basedir="${dist}/${lib.name}" />
+		<zip destfile="${releasedir}/${lib.name}.zip" basedir="${dist}/${lib.name}" />
 	</target>
 
 	<!-- - - - - - - - - - - - - - - - - - - - - - -

release/PythonMode.zip

@@ -1,9 +1,10 @@
 package info.sansgills.mode.python;
 
+import java.io.File;
+import java.io.PrintWriter;
+
 import processing.app.Sketch;
 import processing.app.SketchCode;
-import org.python.util.*;
-import org.python.core.*;
 
 
 /**
@@ -17,8 +18,11 @@ public class PythonBuild {
 	Sketch sketch;
 	String resultProgram;	//old-school
 
+	File binFolder;
+	File outFile;
+	
 	//build tracking
-	public int buildnumber;
+	private int buildnumber;
 	private static int buildstotal = 0;
 
 
@@ -37,28 +41,67 @@ public void build() throws Exception{
 		resultProgram = "";
 
 		SketchCode[] parts = sketch.getCode();		//TODO this function doesn't work properly, it returns old code for some reason
+		
 		//concatenate code strings
 		for(int i = parts.length-1; i >= 0; i--){	//iterate backwards... it seemed like a good idea at the time
 			resultProgram += "\n";
 			resultProgram += parts[i].getProgram();
 		}
 
-		//System.out.println("output code: "+resultProgram);
+		preprocess();
 
-		//more things?
+		
+		//write output file
+		binFolder = sketch.makeTempFolder();
+		
+		outFile = new File(binFolder.getAbsolutePath()
+				+ sketch.getName().toLowerCase()
+				+ ".py");
+		outFile.createNewFile();
+		PrintWriter writer = new PrintWriter(outFile);
+		writer.write(resultProgram+"\n");
+		writer.close();
+	}
+	
+	/*
+	 * Turn .pde into valid python
+	 */
+	private void preprocess(){
+		//TODO implement
 	}
 
 	/*
 	 * The output code string
 	 */
-	public String getResults(){
+	public String getResultString(){
 		return resultProgram;
 	}
 
+	/*
+	 * The output file path
+	 */
+	public String getResultFile(){
+		return outFile.getAbsolutePath();
+	}
+	
+	/*
+	 * 
+	 */
+	public int getBuildNumber(){
+		return buildnumber;
+	}
+	
 	/*
 	 * The PApplet subclass to extract from the code
 	 */
 	public String getClassName(){
 		return "Placeholder";		//TODO implement naming scheme
 	}
+	
+	/*
+	 * The name of the output object
+	 */
+	public String getObjName(){
+		return "applet";			// TODO
+	}
 }

src/info/sansgills/mode/python/PythonBuild.java

@@ -1,11 +1,7 @@
 package info.sansgills.mode.python;
 
-import info.sansgills.mode.python.wrapper.PythonPApplet;
-
-import org.python.core.*;
-import org.python.util.InteractiveConsole;
-
 import processing.app.Base;
+import processing.core.PApplet;
 
 /**
  * 
@@ -14,26 +10,15 @@
  * 
  * TODO REPL?
  * 
- * Architecture note: Processing.py has a 'PApplet Jython Driver' class that
- * contains a private Python interpreter. It injects the PApplet variables and
- * methods into this interpreter, updating whenever it needs to. It runs the
- * input python directly, without modification.
- * 
- * I'm using a different approach, similar to vanilla Processing: preprocess the
- * .pde input into a valid python class inheriting from PApplet, run the
- * resulting code through an interpreter, and extract the class to create a
- * final Java object to run as a PApplet.
  * 
  */
 
 public class PythonRunner {
 	PythonBuild build;				// the python source we're working with
 	PythonEditor editor;
 
+	Process sketchProcess;
 
-	final String modeName = "PythonMode";	//for modifying python classpath
-	final String sep = System.getProperty("file.separator");
-
 	public PythonRunner(PythonBuild build, PythonEditor editor) {
 		this.build = build;
 		this.editor = editor;
@@ -42,7 +27,8 @@ public PythonRunner(PythonBuild build, PythonEditor editor) {
 	/*
 	 * Run the code.
 	 */
-	public void launch(boolean present) {		
+	public void launch(boolean present) {
+		
 	}
 
 	/*

src/info/sansgills/mode/python/PythonRunner.java

@@ -15,6 +15,16 @@
  * 
  * TODO REPL?
  *
+ * Architecture note: Processing.py has a 'PApplet Jython Driver' class that
+ * contains a private Python interpreter. It injects the PApplet variables and
+ * methods into this interpreter, updating whenever it needs to. It runs the
+ * input python directly, without modification.
+ * 
+ * I'm using a different approach, similar to vanilla Processing: preprocess the
+ * .pde input into a valid python class inheriting from PApplet, run the
+ * resulting code through an interpreter, and extract the class to create a
+ * final Java object to run as a PApplet.
+ *
  */
 
 public class ProcessingJythonWrapper {
@@ -36,7 +46,7 @@ public class ProcessingJythonWrapper {
 	 * 
 	 */
 	public static void main(String[] args) {
-		scriptPath = args[1];
+		scriptPath = args[0];
 		params = Arrays.copyOfRange(args, 1, args.length);
 		run();
 	}