From 5b19370b43b13b222db81d80e5a685301456f719 Mon Sep 17 00:00:00 2001 From: "David A. Mellis" Date: Sat, 22 May 2010 20:25:06 +0000 Subject: [PATCH] Removing old build scripts. --- build/macosx/dist.sh | 84 ---------------------------- build/macosx/make.sh | 130 ------------------------------------------- build/macosx/run.sh | 12 ---- 3 files changed, 226 deletions(-) delete mode 100755 build/macosx/dist.sh delete mode 100755 build/macosx/make.sh delete mode 100755 build/macosx/run.sh diff --git a/build/macosx/dist.sh b/build/macosx/dist.sh deleted file mode 100755 index 0df062c61..000000000 --- a/build/macosx/dist.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh - - -REVISION=`head -1 ../../todo.txt | awk '{print $1}'` - -if [ $1 ] -then - RELEASE=$1 - echo Creating Arduino release $RELEASE... - INFO_SOUGHT="$RELEASE," - INFO_FOUND=`cat ./dist/Arduino.app/Contents/Info.plist | grep $INFO_SOUGHT` - if [ -z "$INFO_FOUND" ] - then - echo Fix the version number in Info.plist - exit - fi -else - RELEASE=$REVISION - echo Creating Arduino distribution for revision $REVISION... -fi - -VERSIONED=`cat ../../app/src/processing/app/Base.java | grep $REVISION` -if [ -z "$VERSIONED" ] -then - echo Fix the revision number in Base.java or todo.txt - exit -fi - -# remove any unfinished builds or old builds -rm -rf arduino -rm -rf Arduino* -rm -rf arduino-* -rm -rf work - -./make.sh - -if [ $1 ] -then - # write the release version number into the output directory - echo $1 > work/Arduino.app/Contents/Resources/Java/lib/version.txt -fi - -echo Cleaning file boogers... - -# remove boogers -find work -name "*~" -exec rm -f {} ';' -# need to leave ds store stuff cuz one of those is important -#find processing -name ".DS_Store" -exec rm -f {} ';' -find work -name "._*" -exec rm -f {} ';' -find work -name "Thumbs.db" -exec rm -f {} ';' - -# clean out the cvs entries -find work -name "CVS" -exec rm -rf {} ';' 2> /dev/null -find work -name ".cvsignore" -exec rm -rf {} ';' -find work -name ".svn" -exec rm -rf {} 2> /dev/null ';' - - -# the following was adopted from the makefile by Remko Troncon: -# http://el-tramo.be/guides/fancy-dmg - -echo Creating disk image... - -SOURCE_DIR="work" -SOURCE_FILES="Arduino.app" -OUTPUT_DMG="arduino-$RELEASE" -WORK_DMG="working.dmg" -WORK_DIR="working_dir" - -gzip -cd template.dmg.gz > "$WORK_DMG" -mkdir -p "$WORK_DIR" -hdiutil attach "$WORK_DMG" -noautoopen -quiet -mountpoint "$WORK_DIR" -for i in "$SOURCE_FILES"; do - rm -rf "$WORK_DIR/$i" - ditto -rsrc "$SOURCE_DIR/$i" "$WORK_DIR/$i" -done -WC_DEV=`hdiutil info | grep "$WORK_DIR" | awk '{print $1}'` && hdiutil detach $WC_DEV -quiet -force -hdiutil convert "$WORK_DMG" -quiet -format UDZO -imagekey zlib-level=9 -o "$OUTPUT_DMG" -rm -rf "$WORK_DIR" -rm -f "$WORK_DMG" - -# for later, if we need to resize, etc -#hdiutil resize -size 200mb -growonly -imageonly working.dmg - -echo Done. \ No newline at end of file diff --git a/build/macosx/make.sh b/build/macosx/make.sh deleted file mode 100755 index 0b1ac3eea..000000000 --- a/build/macosx/make.sh +++ /dev/null @@ -1,130 +0,0 @@ -#!/bin/sh - -# http://dev.processing.org/bugs/show_bug.cgi?id=1179 -OSX_VERSION=`sw_vers | grep ProductVersion | awk '{print $2}' | awk '{print substr($0,1,4)}'` -if [ "$OSX_VERSION" = "10.4" ] -then - echo "This script uses the -X option for cp (to disable resource forks)," - echo "which is not supported on OS X 10.4. Please either upgrade to 10.5," - echo "or modify this script to remove use of the -X switch to continue." - # and you will also need to remove this error message - exit -fi - - -### -- SETUP WORK DIR ------------------------------------------- - -RESOURCES=`pwd`/work/Arduino.app/Contents/Resources/Java -#echo $RESOURCES -#exit - -if test -d work -then - BUILD_PREPROC=false -else - echo Setting up directories to build under Mac OS X - BUILD_PREPROC=true - - mkdir work - - # to have a copy of this guy around for messing with - echo Copying Arduino.app... - #cp -a dist/Arduino.app work/ # #@$(* bsd switches - #/sw/bin/cp -a dist/Arduino.app work/ - cp -pRX dist/Arduino.app work/ - # cvs doesn't seem to want to honor the +x bit - chmod +x work/Arduino.app/Contents/MacOS/JavaApplicationStub - - cp -rX ../shared/lib "$RESOURCES/" - cp -rX ../../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/" - cp -X ../../app/lib/RXTXcomm.jar "$RESOURCES/" - - 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 -fi - - -### -- START BUILDING ------------------------------------------- - -# move to root 'processing' directory -cd ../.. - - -### -- BUILD CORE ---------------------------------------------- - -echo Building processing.core... - -cd core - -#CLASSPATH=/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Classes/ui.jar:/System/Library/Java/Extensions/QTJava.zip -#export CLASSPATH - -perl preproc.pl - -mkdir -p bin -javac -source 1.5 -target 1.5 -d bin \ - src/processing/core/*.java \ - src/processing/xml/*.java - -rm -f "$RESOURCES/core.jar" - -cd bin && \ - zip -rq "$RESOURCES/core.jar" \ - processing/core/*.class \ - processing/xml/*.class \ - && cd .. - -# head back to "processing/app" -cd ../app - - - -### -- BUILD PDE ------------------------------------------------ - -echo Building the PDE... - -# For some reason, javac really wants this folder to exist beforehand. -rm -rf ../build/macosx/work/classes -mkdir ../build/macosx/work/classes -# Intentionally keeping this separate from the 'bin' folder -# used by eclipse so that they don't cause conflicts. - -javac \ - -Xlint:deprecation \ - -source 1.5 -target 1.5 \ - -classpath "$RESOURCES/core.jar:$RESOURCES/antlr.jar:$RESOURCES/ecj.jar:$RESOURCES/jna.jar:$RESOURCES/oro.jar:$RESOURCES/RXTXcomm.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/syntax/im/*.java \ - src/processing/app/tools/*.java - -cd ../build/macosx/work/classes -rm -f "$RESOURCES/pde.jar" -zip -0rq "$RESOURCES/pde.jar" . -cd ../.. - -# get updated core.jar and pde.jar; also antlr.jar and others -#mkdir -p work/Arduino.app/Contents/Resources/Java/ -#cp work/lib/*.jar work/Arduino.app/Contents/Resources/Java/ - - -echo -echo Done. diff --git a/build/macosx/run.sh b/build/macosx/run.sh deleted file mode 100755 index 1c5fab57c..000000000 --- a/build/macosx/run.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# is qt java already included tho? -#CLASSPATH=/System/Library/Java/Extensions/QTJava.zip:lib:lib/build:lib/pde.jar:lib/core.jar:lib/antlr.jar:lib/oro.jar:lib/registry.jar - -#export CLASSPATH - -#cd work && /System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Commands/java -Dapple.laf.useScreenMenuBar=true -Dapple.awt.showGrowBox=false processing.app.Base -#cd work && java -Dapple.laf.useScreenMenuBar=true -Dapple.awt.showGrowBox=false processing.app.Base - -# starting with work on release 0120, run directly from the .app -cd work && ./Arduino.app/Contents/MacOS/JavaApplicationStub