Skip to content

Commit 0072df2

Browse files
committed
Updated reference and fixed Windows dist (examples and run.bat).
1 parent a9af6db commit 0072df2

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

build/shared/reference.zip

3.7 KB
Binary file not shown.

build/windows/dist.sh

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,19 @@ rm -rf arduino-*
2222

2323
# use 'shared' files as starting point
2424
cp -r ../shared arduino
25+
mkdir arduino
2526
cp -r work/lib/targets arduino/lib
2627

2728
# new style examples thing ala reas
28-
cd arduino
29-
mkdir examples
30-
unzip -d examples -q dist/examples.zip
31-
rm dist/examples.zip
32-
rm -rf dist
33-
cd ..
29+
#cd arduino
30+
#mkdir examples
31+
#unzip -d examples -q dist/examples.zip
32+
#rm dist/examples.zip
33+
#rm -rf dist
34+
#cd ..
35+
36+
mv arduino/dist/examples arduino/examples
37+
rm -rf arduino/dist
3438

3539
# extract reference
3640
cd arduino
@@ -41,11 +45,11 @@ cd ..
4145
# add java (jre) files
4246
unzip -q -d arduino jre.zip
4347

44-
# copy tools from work/
48+
# copy stuff from work/
4549
cp -r work/tools arduino
46-
4750
cp -r work/bootloader arduino
4851
cp -r work/drivers arduino
52+
#cp -r work/examples arduino
4953

5054
# directories used by the app
5155
#mkdir arduino/lib/build
@@ -71,7 +75,8 @@ chmod +x arduino/*.dll
7175

7276
# get platform-specific goodies from the dist dir
7377
cp launcher/arduino.exe arduino/
74-
#cp dist/run.bat arduino/
78+
cp dist/run.bat arduino/
79+
chmod +x arduino/run.bat
7580

7681
# convert notes.txt to windows LFs
7782
# the 2> is because the app is a little chatty
@@ -112,7 +117,8 @@ cp -a $P5 $P5-expert
112117

113118
# can't use the run.bat that's tied to a local jre
114119
rm $P5-expert/run.bat
115-
cp dist/run-expert.bat $P5-expert/
120+
cp dist/run-expert.bat $P5-expert/run.bat
121+
chmod +x $P5-expert/run.bat
116122

117123
# remove enormous java runtime
118124
rm -rf $P5-expert/java

0 commit comments

Comments
 (0)