Permalink
Browse files

Merge pull request #37 from ralfbiedert/master

Updated to Processing 2.1
  • Loading branch information...
2 parents 3a48bf7 + 03e99ff commit e1bac37469a11fc2563b50619dcc0dffc9e08e66 @jdf committed Oct 28, 2013
Showing with 17 additions and 12 deletions.
  1. +1 −1 README.markdown
  2. +6 −1 build.xml
  3. +1 −1 externals/processing
  4. +8 −8 processing-py.bat
  5. +1 −1 runtime/src/jycessing/buildnumber.properties
View
@@ -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 ##
View
@@ -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>
@@ -71,7 +76,7 @@
<fileset dir="libraries/fisica">
<include name="*.jar"/>
</fileset>
- </classpath>
+ </classpath>
</javac>
<copy todir="bin">
<fileset dir="runtime/src" excludes="**/*.java"/>
Submodule processing updated 635 files
View
@@ -1,4 +1,4 @@
-@echo off
+@echo off
set "ROOT=%~dp0"
@@ -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!"
@@ -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"
)
)
@@ -1,2 +1,2 @@
#Sun, 01 Sep 2013 15:31:06 -0400
-buildnumber=0202
+buildnumber=0210

0 comments on commit e1bac37

Please sign in to comment.