mirror of
https://github.com/esp8266/Arduino.git
synced 2025-07-30 16:24:09 +03:00
First integration of the Arduino code in Processing 5503: PreProcessor and Compiler have been integrated with changes to the Sketch.
Compilation still has problems (Thread error on success, and can't handle non-pde files in a sketch). Modified the Mac OS X make.sh to copy the hardware, avr tools, and example over. Removing some of the antlr stuff. Disabling the Commander (command-line execution) for now. Added Library, LibraryManager, and Target. Added support for prefixed preferences (e.g. for boards and programmers).
This commit is contained in:
@ -68,7 +68,7 @@
|
||||
<!-- In 0149, removed /System/Library/Java from the CLASSPATH because
|
||||
it can cause problems if users have installed weird files there.
|
||||
http://dev.processing.org/bugs/show_bug.cgi?id=1045 -->
|
||||
<string>$JAVAROOT/pde.jar:$JAVAROOT/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar</string>
|
||||
<string>$JAVAROOT/pde.jar:$JAVAROOT/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/oro.jar</string>
|
||||
|
||||
<key>Properties</key>
|
||||
<dict>
|
||||
|
BIN
build/macosx/dist/Processing.app/Contents/Resources/Java/librxtxSerial.jnilib
vendored
Executable file
BIN
build/macosx/dist/Processing.app/Contents/Resources/Java/librxtxSerial.jnilib
vendored
Executable file
Binary file not shown.
BIN
build/macosx/dist/tools-universal.zip
vendored
Normal file
BIN
build/macosx/dist/tools-universal.zip
vendored
Normal file
Binary file not shown.
@ -27,16 +27,22 @@ else
|
||||
cp -rX ../shared/lib "$RESOURCES/"
|
||||
cp -rX ../shared/libraries "$RESOURCES/"
|
||||
cp -rX ../shared/tools "$RESOURCES/"
|
||||
|
||||
cp -rX ../../hardware "$RESOURCES/"
|
||||
|
||||
cp -X ../../app/lib/antlr.jar "$RESOURCES/"
|
||||
cp -X ../../app/lib/ecj.jar "$RESOURCES/"
|
||||
cp -X ../../app/lib/jna.jar "$RESOURCES/"
|
||||
cp -X ../../app/lib/oro.jar "$RESOURCES/"
|
||||
|
||||
echo Extracting examples...
|
||||
unzip -q -d "$RESOURCES/" ../shared/examples.zip
|
||||
echo Copying examples...
|
||||
cp -r ../shared/examples "$RESOURCES/"
|
||||
|
||||
echo Extracting reference...
|
||||
unzip -q -d "$RESOURCES/" ../shared/reference.zip
|
||||
|
||||
echo Extracting avr tools...
|
||||
unzip -q -d "$RESOURCES/hardware" dist/tools-universal.zip
|
||||
|
||||
LIBRARIES=$RESOURCES/libraries/
|
||||
cp -rX ../../net "$LIBRARIES"
|
||||
@ -83,28 +89,6 @@ cd ../app
|
||||
|
||||
|
||||
|
||||
### -- BUILD PARSER ---------------------------------------------
|
||||
|
||||
#BUILD_PREPROC=true
|
||||
|
||||
if $BUILD_PREPROC
|
||||
then
|
||||
# build classes/grammar for preprocessor
|
||||
echo Building antlr grammar code...
|
||||
# first build the default java goop
|
||||
java -cp "$RESOURCES/antlr.jar" antlr.Tool \
|
||||
-o src/antlr/java \
|
||||
src/antlr/java/java.g
|
||||
|
||||
# hack to get around path mess
|
||||
cp -X src/antlr/java/JavaTokenTypes.txt src/processing/app/preproc/
|
||||
|
||||
# now build the pde stuff that extends the java classes
|
||||
java -cp "$RESOURCES/antlr.jar" antlr.Tool \
|
||||
-o src/processing/app/preproc \
|
||||
-glib src/antlr/java/java.g src/processing/app/preproc/pde.g
|
||||
fi
|
||||
|
||||
### -- BUILD PDE ------------------------------------------------
|
||||
|
||||
echo Building the PDE...
|
||||
@ -118,16 +102,14 @@ mkdir ../build/macosx/work/classes
|
||||
javac \
|
||||
-Xlint:deprecation \
|
||||
-source 1.5 -target 1.5 \
|
||||
-classpath "$RESOURCES/core.jar:$RESOURCES/antlr.jar:$RESOURCES/ecj.jar:$RESOURCES/jna.jar" \
|
||||
-classpath "$RESOURCES/core.jar:$RESOURCES/antlr.jar:$RESOURCES/ecj.jar:$RESOURCES/jna.jar:$RESOURCES/oro.jar" \
|
||||
-d ../build/macosx/work/classes \
|
||||
src/processing/app/*.java \
|
||||
src/processing/app/debug/*.java \
|
||||
src/processing/app/macosx/*.java \
|
||||
src/processing/app/preproc/*.java \
|
||||
src/processing/app/syntax/*.java \
|
||||
src/processing/app/tools/*.java \
|
||||
src/antlr/*.java \
|
||||
src/antlr/java/*.java
|
||||
src/processing/app/tools/*.java
|
||||
|
||||
cd ../build/macosx/work/classes
|
||||
rm -f "$RESOURCES/pde.jar"
|
||||
@ -139,110 +121,5 @@ cd ../..
|
||||
#cp work/lib/*.jar work/Processing.app/Contents/Resources/Java/
|
||||
|
||||
|
||||
### -- BUILD LIBRARIES ------------------------------------------------
|
||||
|
||||
PLATFORM=macosx
|
||||
|
||||
|
||||
CLASSPATH=$RESOURCES/core.jar
|
||||
JAVAC="javac -source 1.5 -target 1.5"
|
||||
LIBRARIES=$RESOURCES/libraries
|
||||
|
||||
# move to processing/build
|
||||
cd ..
|
||||
|
||||
|
||||
# SERIAL LIBRARY
|
||||
echo Building serial library...
|
||||
cd ../serial
|
||||
mkdir -p bin
|
||||
$JAVAC \
|
||||
-classpath "library/RXTXcomm.jar:$CLASSPATH" \
|
||||
-d bin src/processing/serial/*.java
|
||||
rm -f library/serial.jar
|
||||
#find bin -name "*~" -exec rm -f {} ';'
|
||||
cd bin && zip -rq ../library/serial.jar processing/serial/*.class && cd ..
|
||||
mkdir -p "$LIBRARIES/serial/library/"
|
||||
cp library/serial.jar "$LIBRARIES/serial/library/"
|
||||
|
||||
|
||||
# NET LIBRARY
|
||||
echo Building net library...
|
||||
cd ../net
|
||||
mkdir -p bin
|
||||
$JAVAC \
|
||||
-classpath "$CLASSPATH" \
|
||||
-d bin src/processing/net/*.java
|
||||
rm -f library/net.jar
|
||||
#find bin -name "*~" -exec rm -f {} ';'
|
||||
cd bin && zip -rq ../library/net.jar processing/net/*.class && cd ..
|
||||
mkdir -p "$LIBRARIES/net/library/"
|
||||
cp library/net.jar "$LIBRARIES/net/library/"
|
||||
|
||||
|
||||
# VIDEO LIBRARY
|
||||
echo Building video library...
|
||||
QTJAVA=/System/Library/Java/Extensions/QTJava.zip
|
||||
if test -f "${QTJAVA}"
|
||||
then
|
||||
echo "Found QuickTime for Java at $QTJAVA"
|
||||
else
|
||||
echo "QuickTime for Java must be installed before building."
|
||||
exit 1;
|
||||
fi
|
||||
cd ../video
|
||||
mkdir -p bin
|
||||
$JAVAC \
|
||||
-classpath "$QTJAVA:$CLASSPATH" \
|
||||
-d bin src/processing/video/*.java
|
||||
rm -f library/video.jar
|
||||
#find bin -name "*~" -exec rm -f {} ';'
|
||||
cd bin && zip -rq ../library/video.jar processing/video/*.class && cd ..
|
||||
mkdir -p "$LIBRARIES/video/library/"
|
||||
cp library/video.jar "$LIBRARIES/video/library/"
|
||||
|
||||
|
||||
# OPENGL LIBRARY
|
||||
echo Building OpenGL library...
|
||||
cd ../opengl
|
||||
mkdir -p bin
|
||||
$JAVAC \
|
||||
-classpath "library/jogl.jar:$CLASSPATH" \
|
||||
-d bin src/processing/opengl/*.java
|
||||
rm -f library/opengl.jar
|
||||
#find bin -name "*~" -exec rm -f {} ';'
|
||||
cd bin && zip -rq ../library/opengl.jar processing/opengl/*.class && cd ..
|
||||
mkdir -p "$LIBRARIES/opengl/library/"
|
||||
cp library/opengl.jar "$LIBRARIES/opengl/library/"
|
||||
|
||||
|
||||
# PDF LIBRARY
|
||||
echo Building PDF library...
|
||||
cd ../pdf
|
||||
mkdir -p bin
|
||||
$JAVAC \
|
||||
-classpath "library/itext.jar:$CLASSPATH" \
|
||||
-d bin src/processing/pdf/*.java
|
||||
rm -f library/pdf.jar
|
||||
#find bin -name "*~" -exec rm -f {} ';'
|
||||
cd bin && zip -rq ../library/pdf.jar processing/pdf/*.class && cd ..
|
||||
mkdir -p "$LIBRARIES/pdf/library/"
|
||||
cp library/pdf.jar "$LIBRARIES/pdf/library/"
|
||||
|
||||
|
||||
# DXF LIBRARY
|
||||
echo Building DXF library...
|
||||
cd ../dxf
|
||||
mkdir -p bin
|
||||
$JAVAC \
|
||||
-classpath "$CLASSPATH" \
|
||||
-d bin src/processing/dxf/*.java
|
||||
rm -f library/dxf.jar
|
||||
#find bin -name "*~" -exec rm -f {} ';'
|
||||
cd bin && zip -rq ../library/dxf.jar processing/dxf/*.class && cd ..
|
||||
mkdir -p "$LIBRARIES/dxf/library/"
|
||||
cp library/dxf.jar "$LIBRARIES/dxf/library/"
|
||||
|
||||
|
||||
echo
|
||||
echo Done.
|
||||
echo Done.
|
||||
|
Reference in New Issue
Block a user