mirror of https://github.com/noisymime/Arduino.git
Fixed up make.sh and dist.sh; removed some CVS junk.
This commit is contained in:
David A. Mellis
parent
afad2d7347
commit
91b64b7f1a
|
|
@ -1,6 +0,0 @@
|
|||
/.cvsignore/1.3/Mon Jul 29 06:07:10 2002//
|
||||
D/dist////
|
||||
/run.sh/1.1/Wed Aug 6 02:42:46 2003//
|
||||
/dist.sh/1.22/Tue Jun 7 13:00:22 2005//
|
||||
/jre.tgz/1.4/Tue Jun 7 13:05:29 2005/-kb/
|
||||
/make.sh/1.39/Tue Jun 7 13:05:30 2005//
|
||||
|
|
@ -1 +0,0 @@
|
|||
/cvsroot/processing/processing/build/linux
|
||||
|
|
@ -1 +0,0 @@
|
|||
:pserver:anonymous@cvs.sourceforge.net:/cvsroot/processing
|
||||
|
|
@ -7,32 +7,21 @@
|
|||
# the power of open source
|
||||
|
||||
|
||||
# prefers that fink is intalled, but not required
|
||||
if test -f /sw/bin/head
|
||||
REVISION=`head -1 ../../todo.txt | cut -c 1-4`
|
||||
SHORT_REVISION=`head -1 ../../todo.txt | cut -c 3-4`
|
||||
|
||||
VERSIONED=`cat ../../app/Base.java | grep $REVISION`
|
||||
if [ -z "$VERSIONED" ]
|
||||
then
|
||||
# old 4 char version.. osx only uses the two chars
|
||||
#REVISION=`head -c 4 ../../todo.txt`
|
||||
# a more useful version of head than what's included with osx
|
||||
SHORT_REVISION=`/sw/bin/head -c 4 ../../todo.txt | tail -c 2`
|
||||
REVISION=`/sw/bin/head -c 4 ../../todo.txt`
|
||||
|
||||
VERSIONED=`cat ../../app/Base.java | grep $REVISION`
|
||||
if [ -z "$VERSIONED" ]
|
||||
then
|
||||
echo Fix the revision number in Base.java
|
||||
exit
|
||||
fi
|
||||
|
||||
else
|
||||
# can't get four bytes of head (osx doesn't support -c)
|
||||
SHORT_REVISION=00
|
||||
REVISION=0000
|
||||
echo Fix the revision number in Base.java
|
||||
exit
|
||||
fi
|
||||
|
||||
|
||||
echo REBUILDING ARDUINO
|
||||
rm -rf work
|
||||
./make.sh
|
||||
|
||||
echo Creating Arduino distribution for revision $REVISION...
|
||||
echo CREATING ARDUINO $REVISION DISTRIBUTION
|
||||
|
||||
# remove any old boogers
|
||||
rm -rf arduino
|
||||
|
|
@ -41,62 +30,10 @@ rm -rf arduino-*
|
|||
|
||||
mkdir arduino
|
||||
|
||||
# use 'work' files as starting point
|
||||
cp -r work/* arduino
|
||||
|
||||
# use 'shared' files as starting point
|
||||
cp -r ../shared arduino
|
||||
|
||||
# add the libraries folder with source
|
||||
#cp -r ../../lib arduino/libraries
|
||||
|
||||
|
||||
# new style examples thing ala reas
|
||||
# not there yet in arduino
|
||||
# cd arduino
|
||||
# unzip -q examples.zip
|
||||
# rm examples.zip
|
||||
# cd ..
|
||||
|
||||
# new style reference
|
||||
# not there yet in arduino
|
||||
# cd arduino
|
||||
# unzip -q reference.zip
|
||||
# rm reference.zip
|
||||
# cd ..
|
||||
|
||||
# get ds_store file (!)
|
||||
cp dist/DS_Store arduino/.DS_Store
|
||||
|
||||
# get package from the dist dir
|
||||
cp -R dist/Arduino.app arduino/
|
||||
chmod +x arduino/Arduino.app/Contents/MacOS/JavaApplicationStub
|
||||
|
||||
# put jar files into the resource dir, leave the rest in lib
|
||||
RES=arduino/Arduino.app/Contents/Resources/Java
|
||||
mkdir -p $RES
|
||||
mv work/lib/*.jar $RES/
|
||||
|
||||
# directories used by the app
|
||||
#mkdir arduino/lib/build
|
||||
|
||||
# grab pde.jar and export from the working dir
|
||||
cp work/Arduino.app/Contents/Resources/Java/pde.jar $RES/
|
||||
|
||||
# removed dependecies from the processing core
|
||||
#cp work/lib/core.jar arduino/lib/
|
||||
|
||||
# get platform-specific goodies from the dist dir
|
||||
#cp `which jikes` arduino
|
||||
#gunzip < dist/jikes.gz > arduino/jikes
|
||||
|
||||
# not needed in arduino
|
||||
# cp dist/jikes arduino/
|
||||
# chmod a+x arduino /jikes
|
||||
|
||||
chmod a+x arduino/Arduino.app/Contents/MacOS/JavaApplicationStub
|
||||
|
||||
#cd ../..
|
||||
#javadoc -public -d doc app/*.java app/preproc/*.java app/syntax/*.java core/*.java opengl/*.java net/*.java video/*.java serial/*.java
|
||||
#cd build/macosx
|
||||
rm -rf arduino/classes
|
||||
|
||||
# remove boogers
|
||||
find arduino -name "*~" -exec rm -f {} ';'
|
||||
|
|
@ -109,10 +46,14 @@ find arduino -name "Thumbs.db" -exec rm -f {} ';'
|
|||
find arduino -name "CVS" -exec rm -rf {} ';' 2> /dev/null
|
||||
find arduino -name ".cvsignore" -exec rm -rf {} ';'
|
||||
|
||||
# clean out the svn entries
|
||||
find arduino -name ".svn" -exec rm -rf {} ';' 2> /dev/null
|
||||
|
||||
mv arduino/Arduino.app "arduino/Arduino $SHORT_REVISION.app"
|
||||
mv arduino arduino-$REVISION
|
||||
zip -r arduino-$REVISION.zip arduino-$REVISION
|
||||
|
||||
# don't have deluxe on my laptop right now
|
||||
#` don't have deluxe on my laptop right now
|
||||
#stuff -f sitx arduino-$REVISION
|
||||
|
||||
# zip it all up for release
|
||||
|
|
|
|||
|
|
@ -15,30 +15,15 @@ if test -d work
|
|||
then
|
||||
BUILD_PREPROC=false
|
||||
else
|
||||
# if test -f /sw/bin/cp
|
||||
# then
|
||||
# echo
|
||||
# else
|
||||
# echo You need to install fink with fileutils, textutils, etc
|
||||
# exit
|
||||
# fi
|
||||
|
||||
echo Setting up directories to build under Mac OS X
|
||||
BUILD_PREPROC=true
|
||||
|
||||
echo Copying shared and dist files...
|
||||
cp -r ../shared work
|
||||
cp -r ../../core work
|
||||
|
||||
# needs to make the dir because of packaging goofiness
|
||||
echo Setting up directories to build under Mac OS X
|
||||
mkdir -p work/classes/processing/app/preproc
|
||||
mkdir -p work/classes/processing/app/syntax
|
||||
mkdir -p work/classes/processing/app/tools
|
||||
mkdir -p work/lib/build
|
||||
|
||||
cp -r dist/lib work/
|
||||
cp -r dist/core work/
|
||||
|
||||
# to have a copy of this guy around for messing with
|
||||
echo Copying Arduino.app...
|
||||
|
||||
|
|
@ -47,9 +32,10 @@ else
|
|||
chmod +x work/Arduino.app/Contents/MacOS/JavaApplicationStub
|
||||
|
||||
# copy the avr-gcc distribution
|
||||
echo Copying tools \(this may take a minute\)...
|
||||
cp -pR dist/tools.zip work/
|
||||
cd work
|
||||
unzip -q tools.zip
|
||||
unzip -oq tools.zip
|
||||
rm tools.zip
|
||||
cd ..
|
||||
|
||||
|
|
@ -59,16 +45,25 @@ else
|
|||
chmod +x work/jikes
|
||||
fi
|
||||
|
||||
echo Copying shared and core files...
|
||||
cp -r ../shared/* work
|
||||
cp -r ../../core work
|
||||
|
||||
echo Copying dist files...
|
||||
cp -r dist/lib work/
|
||||
cp -r dist/core work/
|
||||
|
||||
### -- START BUILDING -------------------------------------------
|
||||
|
||||
# move to root 'processing' directory
|
||||
# move to root 'arduino' directory
|
||||
cd ../..
|
||||
|
||||
|
||||
### -- BUILD GCC ----------------------------------------------
|
||||
### -- BUILD GCC ------------------------------------------------
|
||||
# in the future we will build avr-gcc and tools (if they don't exist)
|
||||
|
||||
### -- BUILD JAVA -----------------------------------------------
|
||||
|
||||
# set classpath
|
||||
CLASSPATH=/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Classes/ui.jar:/System/Library/Java/Extensions/MRJToolkit.jar
|
||||
export CLASSPATH
|
||||
|
|
@ -98,51 +93,16 @@ echo Building the PDE...
|
|||
# compile the code as java 1.3, so that the application will run and
|
||||
# show the user an error, rather than crapping out with some strange
|
||||
# "class not found" crap
|
||||
#../build/macosx/work/jikes -target 1.3 +D -classpath ../build/macosx/work/classes:../build/macosx/work/lib/core.jar:../build/macosx/work/lib/antlr.jar:../build/macosx/work/lib/oro.jar:../build/macosx/work/lib/registry.jar:$CLASSPATH -d ../build/macosx/work/classes *.java syntax/*.java preproc/*.java tools/*.java
|
||||
../build/macosx/work/jikes -target 1.3 +D -classpath ../build/macosx/work/classes:../build/macosx/work/lib/antlr.jar:../build/macosx/work/lib/oro.jar:../build/macosx/work/lib/registry.jar:../build/macosx/work/lib/RXTXcomm.jar:$CLASSPATH -d ../build/macosx/work/classes tools/*.java preproc/*.java syntax/*.java *.java
|
||||
../build/macosx/work/jikes -target 1.3 +D -classpath ../build/macosx/work/classes:../build/macosx/work/lib/antlr.jar:../build/macosx/work/lib/oro.jar:../build/macosx/work/lib/registry.jar:../build/macosx/work/lib/RXTXcomm.jar:$CLASSPATH -d ../build/macosx/work/classes tools/*.java preproc/*.java syntax/*.java *.java
|
||||
|
||||
cd ../build/macosx/work/classes
|
||||
rm -f ../lib/pde.jar
|
||||
zip -0rq ../lib/pde.jar .
|
||||
cd ../..
|
||||
|
||||
# i fought the packages and the packages won
|
||||
#cd ../..
|
||||
#WORKLIB=processing/build/macosx/work/lib
|
||||
#./processing/build/macosx/work/jikes -d . -target 1.3 +D -classpath $WORKLIB/core.jar:$WORKLIB/antlr.jar:$WORKLIB/oro.jar:$WORKLIB/registry.jar:$CLASSPATH -d . processing/app/*.java processing/app/preproc/*.java processing/app/syntax/*.java processing/app/tools/*.java
|
||||
#zip -rq $WORKLIB/pde.jar processing/app/*.class processing/app/preproc/*.class processing/app/syntax/*.class processing/app/tools/*.class
|
||||
|
||||
# get the libs
|
||||
mkdir -p work/Arduino.app/Contents/Resources/Java/
|
||||
cp work/lib/*.jar work/Arduino.app/Contents/Resources/Java/
|
||||
|
||||
|
||||
### -- BUILD LIBRARIES ------------------------------------------------
|
||||
|
||||
|
||||
PLATFORM=macosx
|
||||
|
||||
|
||||
CLASSPATH=../build/$PLATFORM/work/lib/core.jar:$CLASSPATH
|
||||
JIKES=../build/$PLATFORM/work/jikes
|
||||
CORE=../build/$PLATFORM/work/lib/core.jar
|
||||
LIBRARIES=../build/$PLATFORM/work/libraries
|
||||
|
||||
# move to processing/build
|
||||
cd ..
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
CLASSPATH=../$CLASSPATH
|
||||
JIKES=../../build/$PLATFORM/work/jikes
|
||||
CORE=../../build/$PLATFORM/work/lib/core.jar
|
||||
LIBRARIES=../../build/$PLATFORM/work/libraries
|
||||
|
||||
|
||||
|
||||
echo
|
||||
echo Done.
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
/.cvsignore/1.4/Sun Jan 26 17:29:58 2003//
|
||||
D/dist////
|
||||
D/launcher////
|
||||
/srun.sh/1.6/Mon Sep 20 18:01:22 2004//
|
||||
/dist.sh/1.39/Tue Jun 7 13:06:39 2005//
|
||||
/jre.zip/1.13/Tue Jun 7 13:09:45 2005/-kb/
|
||||
/make.sh/1.75/Tue Jun 7 13:09:46 2005//
|
||||
/run.sh/1.21/Tue Jun 7 13:09:46 2005//
|
||||
|
|
@ -1 +0,0 @@
|
|||
/cvsroot/processing/processing/build/windows
|
||||
|
|
@ -1 +0,0 @@
|
|||
:pserver:anonymous@cvs.sourceforge.net:/cvsroot/processing
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
D/lib////
|
||||
D/serial////
|
||||
/ICE_JNIRegistry.dll/1.1/Sun Jan 30 18:44:08 2005/-kb/
|
||||
/jikes.exe/1.3/Wed Mar 16 10:38:56 2005/-kb/
|
||||
/run-expert.bat/1.8/Tue Jun 7 13:09:46 2005//
|
||||
/run.bat/1.18/Tue Jun 7 13:09:46 2005/-kb/
|
||||
|
|
@ -1 +0,0 @@
|
|||
/cvsroot/processing/processing/build/windows/dist
|
||||
|
|
@ -1 +0,0 @@
|
|||
:pserver:anonymous@cvs.sourceforge.net:/cvsroot/processing
|
||||
|
|
@ -1 +0,0 @@
|
|||
D
|
||||
|
|
@ -1 +0,0 @@
|
|||
/cvsroot/processing/processing/build/windows/dist/lib
|
||||
|
|
@ -1 +0,0 @@
|
|||
:pserver:anonymous@cvs.sourceforge.net:/cvsroot/processing
|
||||
Loading…
Reference in New Issue