Skip to content

Updated to Processing 2.1 #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 28, 2013
Merged

Updated to Processing 2.1 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
91111d0
Fixed class path in Eclipse.
ralfbiedert Oct 14, 2013
14a0b3b
Added note to self.
ralfbiedert Oct 28, 2013
8183cba
Moved to Processing 2.1
ralfbiedert Oct 28, 2013
1289c21
Updated note to self.
ralfbiedert Oct 28, 2013
66fd78f
Updated list of platforms Processing.py is known to run on.
ralfbiedert Oct 28, 2013
a491ed1
moved submodule to 2.1 ... now for real
ralfbiedert Oct 28, 2013
1338c45
Fixed Windows .bat local Java lookup.
ralfbiedert Oct 28, 2013
03e99ff
Removed peasycam.
ralfbiedert Oct 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Write real [Processing](http://processing.org/) sketches in Python.
* Based on [Processing 2.0](http://processing.org/), and compatible with most [3rd party libraries](http://www.processing.org/reference/libraries/).
* Source compatible with [Python 2.7.3](http://python.org).

Tested on Mac OS 10.8.3, Windows XP, Windows 7, and Ubuntu 12.10.
Tested on Mac OS 10.8 & 10.9, Windows XP, 7 & 8, and Ubuntu 12.10.

## Quick Start ##

Expand Down
7 changes: 6 additions & 1 deletion build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
work just fine on Linux. It is not expected to work at all on Windows.

jdf

Run
"ant make-all-distributions" to create release.
"ant –Dplatform=macosx make-distribution" to create a release for OSX.

====================================================================== -->
<project name="processing.py" default="jar">
<description>Write Processing sketches in Python</description>
Expand Down Expand Up @@ -71,7 +76,7 @@
<fileset dir="libraries/fisica">
<include name="*.jar"/>
</fileset>
</classpath>
</classpath>
</javac>
<copy todir="bin">
<fileset dir="runtime/src" excludes="**/*.java"/>
Expand Down
2 changes: 1 addition & 1 deletion externals/processing
Open in desktop
Submodule processing updated 635 files
16 changes: 8 additions & 8 deletions processing-py.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@echo off
@echo off


set "ROOT=%~dp0"
Expand All @@ -11,15 +11,15 @@ set JVM_ARGS=-Xmx1024m
set "SCRIPTARGUMENT=%~1"

if not "%SCRIPTARGUMENT%" == "" (
REM Check if we run the default the given script
set "DEFAULTSCRIPT=%SCRIPTARGUMENT%"
)
REM Check if we run the default the given script
set "DEFAULTSCRIPT=%SCRIPTARGUMENT%"
)


IF exist "%ROOT%\JREs\jre7.win" (
IF exist "%ROOT%\jre" (
REM Check if we should override default java
set "JAVA=%ROOT%\JREs\jre7.win\bin\javaw"
)
set "JAVA=%ROOT%\jre\bin\javaw"
)


REM msg "%username%" "%JAVA% not found!"
Expand All @@ -31,7 +31,7 @@ start "xxx" "%JAVA%" %JVM_ARGS% -splash:"%SPLASH%" -jar "%ROOT%\processing-py.ja

if not %ERRORLEVEL% == 1 (
if not %ERRORLEVEL% == 0 (
echo "Unable to start Java"
echo "Unable to start Java"
msg "%username%" "Unable to start Java"
)
)
2 changes: 1 addition & 1 deletion runtime/src/jycessing/buildnumber.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Sun, 01 Sep 2013 15:31:06 -0400
buildnumber=0202
buildnumber=0210