From 7600925f6d769cbcfebf52ddd845c3cecd4e8911 Mon Sep 17 00:00:00 2001 From: benfry Date: Mon, 28 Jul 2008 03:12:30 +0000 Subject: [PATCH] adding ecj as compiler --- build/linux/dist.sh | 1 + build/linux/make.sh | 3 ++- build/macosx/dist.sh | 1 + build/macosx/make.sh | 3 ++- build/windows/dist.sh | 1 + build/windows/make.sh | 3 ++- todo.txt | 20 ++++++++++---------- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/build/linux/dist.sh b/build/linux/dist.sh index c50cdb3c5..b01dad506 100755 --- a/build/linux/dist.sh +++ b/build/linux/dist.sh @@ -21,6 +21,7 @@ mkdir processing cp -r ../shared/lib processing/ cp -r ../shared/libraries processing/ cp ../../app/lib/antlr.jar processing/lib/ +cp ../../app/lib/ecj.jar processing/lib/ cp ../../app/lib/jna.jar processing/lib/ cp ../shared/revisions.txt processing/ diff --git a/build/linux/make.sh b/build/linux/make.sh index 61ba19a62..c9c7ae916 100755 --- a/build/linux/make.sh +++ b/build/linux/make.sh @@ -15,6 +15,7 @@ else cp -r ../shared/libraries work/ cp ../../app/lib/antlr.jar work/lib/ + cp ../../app/lib/ecj.jar work/lib/ cp ../../app/lib/jna.jar work/lib/ echo Extracting examples... @@ -126,7 +127,7 @@ mkdir -p ../build/linux/work/classes -cp ../build/linux/work/java/lib/tools.jar \ com.sun.tools.javac.Main \ -source 1.5 -target 1.5 \ - -classpath ../build/linux/work/lib/core.jar:../build/linux/work/lib/antlr.jar:../build/linux/work/lib/jna.jar:../build/linux/work/java/lib/tools.jar \ + -classpath ../build/linux/work/lib/core.jar:../build/linux/work/lib/antlr.jar:../build/linux/work/lib/ecj.jar:../build/linux/work/lib/jna.jar:../build/linux/work/java/lib/tools.jar \ -d ../build/linux/work/classes \ src/processing/app/*.java \ src/processing/app/debug/*.java \ diff --git a/build/macosx/dist.sh b/build/macosx/dist.sh index bac337c97..4ea56a106 100755 --- a/build/macosx/dist.sh +++ b/build/macosx/dist.sh @@ -26,6 +26,7 @@ mkdir processing cp -r ../shared/lib processing/ cp -r ../shared/libraries processing/ cp ../../app/lib/antlr.jar processing/lib/ +cp ../../app/lib/ecj.jar processing/lib/ cp ../../app/lib/jna.jar processing/lib/ cp ../shared/revisions.txt processing/ diff --git a/build/macosx/make.sh b/build/macosx/make.sh index de53090ee..25e8d3005 100755 --- a/build/macosx/make.sh +++ b/build/macosx/make.sh @@ -15,6 +15,7 @@ else cp -r ../shared/libraries work/ cp ../../app/lib/antlr.jar work/lib/ + cp ../../app/lib/ecj.jar work/lib/ cp ../../app/lib/jna.jar work/lib/ echo Extracting examples... @@ -104,7 +105,7 @@ mkdir -p ../build/macosx/work/classes javac \ -source 1.5 -target 1.5 \ - -classpath ../build/macosx/work/lib/core.jar:../build/macosx/work/lib/antlr.jar:../build/macosx/work/lib/jna.jar \ + -classpath ../build/macosx/work/lib/core.jar:../build/macosx/work/lib/antlr.jar:../build/macosx/work/lib/ecj.jar:../build/macosx/work/lib/jna.jar \ -d ../build/macosx/work/classes \ src/processing/app/*.java \ src/processing/app/debug/*.java \ diff --git a/build/windows/dist.sh b/build/windows/dist.sh index c65d580de..546973da7 100755 --- a/build/windows/dist.sh +++ b/build/windows/dist.sh @@ -25,6 +25,7 @@ cp -r ../shared/lib processing/ cp -r ../shared/libraries processing/ cp ../../app/lib/antlr.jar processing/lib/ +cp ../../app/lib/ecj.jar processing/lib/ cp ../../app/lib/jna.jar processing/lib/ cp ../shared/revisions.txt processing/ diff --git a/build/windows/make.sh b/build/windows/make.sh index 17e6e3bc8..b6efb8fa4 100755 --- a/build/windows/make.sh +++ b/build/windows/make.sh @@ -15,6 +15,7 @@ else cp -r ../shared/libraries work/ cp ../../app/lib/antlr.jar work/lib/ + cp ../../app/lib/ecj.jar work/lib/ cp ../../app/lib/jna.jar work/lib/ echo Extracting examples... @@ -139,7 +140,7 @@ mkdir -p ../build/windows/work/classes -classpath "..\\build\\windows\\work\\java\\lib\\tools.jar" \ com.sun.tools.javac.Main \ -source 1.5 -target 1.5 \ - -classpath "..\\build\\windows\\work\\lib\\core.jar;..\\build\\windows\\work\\lib\antlr.jar;..\\build\\windows\\work\\lib\\jna.jar;..\\build\\windows\\work\\java\\lib\\tools.jar" \ + -classpath "..\\build\\windows\\work\\lib\\core.jar;..\\build\\windows\\work\\lib\antlr.jar;..\\build\\windows\\work\\lib\\ecj.jar;..\\build\\windows\\work\\lib\\jna.jar;..\\build\\windows\\work\\java\\lib\\tools.jar" \ -d ..\\build\\windows\\work\\classes \ src/processing/app/*.java \ src/processing/app/debug/*.java \ diff --git a/todo.txt b/todo.txt index a3b14ae98..e9aa83f3c 100644 --- a/todo.txt +++ b/todo.txt @@ -1,33 +1,33 @@ 0143 pde X fixed build problems with macosx and linux, thanks to reports +o need to compare with localized version of javac strings +X http://dev.processing.org/bugs/show_bug.cgi?id=828 +X just moving to ecj instead of javac +X preproc code showing through since it's on line 0: +X http://dev.processing.org/bugs/show_bug.cgi?id=831 +X also need to handle "unexpected type" error in that example _ draw mode apps do not shut off the run button when finished _ remove namespace stuff from xml lib? -_ Closing the last window doesn't cause PDE to save its position/contents/etc -_ http://dev.processing.org/bugs/show_bug.cgi?id=835 - _ opengl.jar with eclipse _ auto-extract native libs from opengl.jar _ to remove java.library.path problems (!) -_ need to compare with localized version of javac strings -_ http://dev.processing.org/bugs/show_bug.cgi?id=828 - -_ preproc code showing through since it's on line 0: -_ http://dev.processing.org/bugs/show_bug.cgi?id=831 -_ also need to handle "unexpected type" error in that example - _ add block comment to right-click menu _ http://dev.processing.org/bugs/show_bug.cgi?id=840 _ add increase/decrease indent to edit and right-click edit menu _ http://dev.processing.org/bugs/show_bug.cgi?id=841 +_ block comment - don't bother with last line if starting it +_ (same behavior as eclipse) new/open/close/save _ not remembering window size/placement preferences _ http://dev.processing.org/bugs/show_bug.cgi?id=837 +_ Closing the last window doesn't cause PDE to save its position/contents/etc +_ http://dev.processing.org/bugs/show_bug.cgi?id=835 _ [LaunchRunner Error] processing.app.Base.main(String[]) threw an exception _ http://dev.processing.org/bugs/show_bug.cgi?id=821 _ file-save stops running sketch