Skip to content

Commit 6b410c7

Browse files
author
Federico Fissore
committed
More cross compatible way of calling tar
Windows does not support symlinks: squash them into real files using zip
1 parent 62741f3 commit 6b410c7

5 files changed

+15
-21
lines changed

arch.arm.build.bash

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
./build.all.bash
1919

20-
rm -f *arduino*.tar.bz2
20+
rm -f *arduino*.tar.bz2 *arduino*.zip
2121

22-
tar -cjvf avr-gcc-4.8.1-arduino2-armhf-pc-linux-gnu.tar.bz2 avr/
22+
tar -cjvf ./avr-gcc-4.8.1-arduino2-armhf-pc-linux-gnu.tar.bz2 avr/
2323

24-
tar -cjvf avrdude-6.0.1-arduino2-armhf-pc-linux-gnu.tar.bz2 avrdude-6.0.1/
24+
tar -cjvf ./avrdude-6.0.1-arduino2-armhf-pc-linux-gnu.tar.bz2 avrdude-6.0.1/
2525

arch.linux32.build.bash

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
CC="gcc -m32" CXX="g++ -m32" ./build.all.bash
1919

20-
rm -f *arduino*.tar.bz2
20+
rm -f *arduino*.tar.bz2 *arduino*.zip
2121

22-
tar -cjvf avr-gcc-4.8.1-arduino2-i686-pc-linux-gnu.tar.bz2 avr/
22+
tar -cjvf ./avr-gcc-4.8.1-arduino2-i686-pc-linux-gnu.tar.bz2 avr/
2323

24-
tar -cjvf avrdude-6.0.1-arduino2-i686-pc-linux-gnu.tar.bz2 avrdude-6.0.1/
24+
tar -cjvf ./avrdude-6.0.1-arduino2-i686-pc-linux-gnu.tar.bz2 avrdude-6.0.1/
2525

arch.linux64.build.bash

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
./build.all.bash
1919

20-
rm -f *arduino*.tar.bz2
20+
rm -f *arduino*.tar.bz2 *arduino*.zip
2121

22-
tar -cjvf avr-gcc-4.8.1-arduino2-x86_64-pc-linux-gnu.tar.bz2 avr/
22+
tar -cjvf ./avr-gcc-4.8.1-arduino2-x86_64-pc-linux-gnu.tar.bz2 avr/
2323

24-
tar -cjvf avrdude-6.0.1-arduino2-x86_64-pc-linux-gnu.tar.bz2 avrdude-6.0.1/
24+
tar -cjvf ./avrdude-6.0.1-arduino2-x86_64-pc-linux-gnu.tar.bz2 avrdude-6.0.1/
2525

arch.mac32.build.bash

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ export PATH=/opt/local/libexec/gnubin/:$PATH
1919

2020
CC="gcc -arch i386 -mmacosx-version-min=10.5" CXX="g++ -arch i386 -mmacosx-version-min=10.5" ./build.all.bash
2121

22-
rm -f *arduino*.tar.bz2
22+
rm -f *arduino*.tar.bz2 *arduino*.zip
2323

24-
tar -cjvf avr-gcc-4.8.1-arduino2-i386-apple-darwin11.tar.bz2 avr/
24+
tar -cjvf ./avr-gcc-4.8.1-arduino2-i386-apple-darwin11.tar.bz2 avr/
2525

26-
tar -cjvf avrdude-6.0.1-arduino2-i386-apple-darwin11.tar.bz2 avrdude-6.0.1/
26+
tar -cjvf ./avrdude-6.0.1-arduino2-i386-apple-darwin11.tar.bz2 avrdude-6.0.1/
2727

arch.win32.build.bash

+3-9
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,9 @@
1818
export PATH=$PATH:/c/MinGW/bin/:/c/cygwin/bin/
1919
CFLAGS="-DWIN32 -static" CXXFLAGS="-DWIN32 -static" LDFLAGS="-DWIN32 -static" CC="mingw32-gcc -m32" CXX="mingw32-g++ -m32" ./build.all.bash
2020

21-
cd avr
22-
for folder in avr/bin bin libexec/gcc/avr/4.8.1/
23-
do
24-
cp /c/MinGW/bin/libiconv-2.dll $folder
25-
done
21+
rm -f *arduino*.tar.bz2 *arduino*.zip
2622

27-
rm -f *arduino*.tar.bz2
23+
zip -r -9 ./avr-gcc-4.8.1-arduino2-i686-mingw32.zip avr/
2824

29-
tar -cjvf avr-gcc-4.8.1-arduino2-i686-mingw32.tar.bz2 avr/
30-
31-
tar -cjvf avrdude-6.0.1-arduino2-i686-mingw32.tar.bz2 avrdude-6.0.1/
25+
zip -r -9 ./avrdude-6.0.1-arduino2-i686-mingw32.zip avrdude-6.0.1/
3226

0 commit comments

Comments
 (0)