mirror of
https://github.com/arduino/Arduino.git
synced 2025-03-13 10:29:35 +01:00
Fixing up Windows make.sh and dist.sh to work with new hardware/ directory organization scheme.
This commit is contained in:
parent
09cb46c4fb
commit
13df8fb11e
@ -23,7 +23,7 @@ rm -rf arduino-*
|
||||
# use 'shared' files as starting point
|
||||
cp -r ../shared arduino
|
||||
mkdir arduino
|
||||
cp -r work/lib/targets arduino/lib
|
||||
#cp -r work/lib/targets arduino/lib
|
||||
|
||||
# new style examples thing ala reas
|
||||
#cd arduino
|
||||
@ -47,9 +47,7 @@ unzip -q -d arduino jre.zip
|
||||
|
||||
# copy stuff from work/
|
||||
cp work/readme.txt arduino
|
||||
cp -r work/tools arduino
|
||||
cp -r work/bootloader arduino
|
||||
cp -r work/bootloader168 arduino
|
||||
cp -r work/hardware arduino
|
||||
cp -r work/drivers arduino
|
||||
#cp -r work/examples arduino
|
||||
|
||||
|
@ -10,7 +10,6 @@ else
|
||||
echo Setting up directories to build arduino...
|
||||
BUILD_PREPROC=true
|
||||
cp -r ../shared work
|
||||
rm -rf work/CVS
|
||||
rm -f work/.DS_Store
|
||||
#cp ../../lib/*.dll work
|
||||
cp dist/*.dll work
|
||||
@ -58,34 +57,20 @@ else
|
||||
#chmod +x work/jikes.exe
|
||||
|
||||
cp dist/ICE_JNIRegistry.dll work/
|
||||
|
||||
cp -r ../../hardware work/
|
||||
mkdir work/bootloader
|
||||
cp dist/bootloader/*.* work/bootloader
|
||||
mkdir work/bootloader168
|
||||
cp ../../bootloader168/* work/bootloader168
|
||||
cp dist/bootloader/*.* work/hardware/bootloaders/atmega8
|
||||
mkdir work/drivers
|
||||
cp -r dist/drivers/* work/drivers/
|
||||
mkdir work/tools
|
||||
|
||||
cp dist/avr_tools.zip .
|
||||
echo Extracting avr tools ...
|
||||
unzip -q -d work avr_tools.zip
|
||||
unzip -q -d work/hardware avr_tools.zip
|
||||
rm -f avr_tools.zip
|
||||
|
||||
# core/ has been replaced by targets/ and we no longer use makefiles
|
||||
#cp dist/lib/makefile.win work/Makefile
|
||||
#mkdir work/core
|
||||
#cp ../../../core/*.* work/core
|
||||
#cp dist/core/makefile.win work/core/Makefile
|
||||
cp -r ../../targets work/lib/
|
||||
|
||||
# take care of the examples
|
||||
cp -r ../shared/dist/examples work/
|
||||
#mkdir work/examples
|
||||
#cd work/examples
|
||||
#cp ../../../shared/dist/examples.zip .
|
||||
#echo Extracting examples ...
|
||||
#unzip -q -d . examples.zip
|
||||
#rm -f examples.zip
|
||||
#cd ../..
|
||||
|
||||
# chmod +x the crew
|
||||
find work -name "*.dll" -exec chmod +x {} ';'
|
||||
@ -129,11 +114,11 @@ fi
|
||||
|
||||
### -- BUILD BOOTLOADER -----------------------------------------
|
||||
|
||||
cd bootloader
|
||||
export DIRAVR=../build/windows/work/tools/avr
|
||||
make
|
||||
cp ATmegaBOOT.hex ../build/windows/work/bootloader
|
||||
cd ..
|
||||
#cd bootloader
|
||||
#export DIRAVR=../build/windows/work/tools/avr
|
||||
#make
|
||||
#cp ATmegaBOOT.hex ../build/windows/work/bootloader
|
||||
#cd ..
|
||||
|
||||
### -- BUILD PDE ------------------------------------------------
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user