Skip to content

Commit e1bac37

Browse files
author
Jonathan Feinberg
committed
Merge pull request #37 from ralfbiedert/master
Updated to Processing 2.1
2 parents 3a48bf7 + 03e99ff commit e1bac37

File tree

5 files changed

+17
-12
lines changed

5 files changed

+17
-12
lines changed

README.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Write real [Processing](http://processing.org/) sketches in Python.
55
* Based on [Processing 2.0](http://processing.org/), and compatible with most [3rd party libraries](http://www.processing.org/reference/libraries/).
66
* Source compatible with [Python 2.7.3](http://python.org).
77

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

1010
## Quick Start ##
1111

build.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
work just fine on Linux. It is not expected to work at all on Windows.
88
99
jdf
10+
11+
Run
12+
"ant make-all-distributions" to create release.
13+
"ant –Dplatform=macosx make-distribution" to create a release for OSX.
14+
1015
====================================================================== -->
1116
<project name="processing.py" default="jar">
1217
<description>Write Processing sketches in Python</description>
@@ -71,7 +76,7 @@
7176
<fileset dir="libraries/fisica">
7277
<include name="*.jar"/>
7378
</fileset>
74-
</classpath>
79+
</classpath>
7580
</javac>
7681
<copy todir="bin">
7782
<fileset dir="runtime/src" excludes="**/*.java"/>

externals/processing

Submodule processing updated 635 files

processing-py.bat

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@echo off
1+
@echo off
22

33

44
set "ROOT=%~dp0"
@@ -11,15 +11,15 @@ set JVM_ARGS=-Xmx1024m
1111
set "SCRIPTARGUMENT=%~1"
1212

1313
if not "%SCRIPTARGUMENT%" == "" (
14-
REM Check if we run the default the given script
15-
set "DEFAULTSCRIPT=%SCRIPTARGUMENT%"
16-
)
14+
REM Check if we run the default the given script
15+
set "DEFAULTSCRIPT=%SCRIPTARGUMENT%"
16+
)
1717

1818

19-
IF exist "%ROOT%\JREs\jre7.win" (
19+
IF exist "%ROOT%\jre" (
2020
REM Check if we should override default java
21-
set "JAVA=%ROOT%\JREs\jre7.win\bin\javaw"
22-
)
21+
set "JAVA=%ROOT%\jre\bin\javaw"
22+
)
2323

2424

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

3232
if not %ERRORLEVEL% == 1 (
3333
if not %ERRORLEVEL% == 0 (
34-
echo "Unable to start Java"
34+
echo "Unable to start Java"
3535
msg "%username%" "Unable to start Java"
3636
)
3737
)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#Sun, 01 Sep 2013 15:31:06 -0400
2-
buildnumber=0202
2+
buildnumber=0210

0 commit comments

Comments
 (0)