Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:jdf/processing.py

  • Loading branch information...
commit 162fd896f78c631507bd6cb905fa179cfdb02d05 2 parents 33824e8 + d6aec5f
@jdf authored
View
2  .classpath
@@ -5,7 +5,7 @@
<classpathentry kind="src" path="runtime/generated"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
- <classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
<classpathentry kind="lib" path="buildtime/lib/jython/jython.jar"/>
+ <classpathentry kind="lib" path="buildtime/lib/processing/core.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
View
22 .pydevproject
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?>
-
-<pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Jython</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">jython 2.5</pydev_property>
-<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/processing.py/buildtime/lib/jython/Lib</path>
-<path>/processing.py/buildtime/py</path>
-</pydev_pathproperty>
-</pydev_project>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?>
+
+<pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">jython 2.5</pydev_property>
+<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+<path>/processing.py/buildtime/lib/jython/Lib</path>
+<path>/processing.py/buildtime/py</path>
+</pydev_pathproperty>
+</pydev_project>
View
25 build.xml
@@ -56,19 +56,18 @@
</copy>
</target>
- <target name="generate-driver"
- description="Generate DriverImpl class">
- <java classpath="buildtime/lib/jython/jython.jar:buildtime/lib/processing/core.jar"
- classname="org.python.util.jython"
- fork="true">
- <env key="JYTHONPATH" value="builtime/py/lib"/>
- <arg value="buildtime/py/cog.py"/>
- <arg value="-U"/>
- <arg value="-o"/>
- <arg value="runtime/generated/jycessing/DriverImpl.java"/>
- <arg value="buildtime/template/DriverImpl.java.cog"/>
- </java>
- </target>
+ <target name="generate-driver"
+ description="Generate DriverImpl class">
+ <java classpath="buildtime/lib/jython/jython.jar:buildtime/lib/processing/core.jar"
+ classname="org.python.util.jython"
+ fork="true">
+ <arg value="buildtime/py/cog.py"/>
+ <arg value="-U"/>
+ <arg value="-o"/>
+ <arg value="runtime/generated/jycessing/DriverImpl.java"/>
+ <arg value="buildtime/template/DriverImpl.java.cog"/>
+ </java>
+ </target>
<target name="clean">
<delete dir="bin" />
View
4 buildtime/lib/jython/Lib/cogapp/cogapp.py
@@ -4,7 +4,7 @@
Copyright 2004-2009, Ned Batchelder.
"""
-import copy, getopt, imp, os, re, string, sys, traceback
+import copy, getopt, imp, os, string, shlex, sys, traceback
from cStringIO import StringIO
# The recommended way to compute md5's changed in Python 2.5
@@ -621,7 +621,7 @@ def callableMain(self, argv):
This is used by main.
argv is the equivalent of sys.argv.
"""
- argv0 = argv.pop(0)
+ argv.pop(0)
# Provide help if asked for anywhere in the command line.
if '-?' in argv or '-h' in argv:
View
7 buildtime/py/processing_parser.py
@@ -1,10 +1,9 @@
-import __builtin__
-
import re
+
import cog
-from java.lang.reflect import Field, Method, Modifier
-from java.lang import Class, String, Void
+from java.lang.reflect import Modifier
+from java.lang import Class, Void
from processing.core import PApplet
Please sign in to comment.
Something went wrong with that request. Please try again.