Skip to content

Commit 4758296

Browse files
committed
Separated shell scripts
1 parent ce5fbd2 commit 4758296

File tree

2 files changed

+41
-4
lines changed

2 files changed

+41
-4
lines changed

Diff for: make.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ if [[ -z "$INSTALLDIR" ]]; then
55
fi
66
echo "INSTALLDIR: $INSTALLDIR"
77

8-
pde_path=`find /Applications/Arduino.app/ -name pde.jar`
9-
core_path=`find /Applications/Arduino.app/ -name arduino-core.jar`
10-
lib_path=`find /Applications/Arduino.app/ -name commons-codec-1.7.jar`
8+
pde_path=`find ../../../ -name pde.jar`
9+
core_path=`find ../../../ -name arduino-core.jar`
10+
lib_path=`find ../../../ -name commons-codec-1.7.jar`
1111
if [[ -z "$core_path" || -z "$pde_path" ]]; then
1212
echo "Some java libraries have not been built yet (did you run ant build?)"
1313
return 1
@@ -19,7 +19,7 @@ echo "lib_path: $lib_path"
1919
set -e
2020

2121
mkdir -p bin
22-
javac -source 1.8 -target 1.8 -cp "$pde_path:$core_path:$lib_path" \
22+
javac -target 1.8 -cp "$pde_path:$core_path:$lib_path" \
2323
-d bin src/ESP32FS.java
2424

2525
pushd bin

Diff for: make_mac.sh

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/usr/bin/env bash
2+
3+
if [[ -z "$INSTALLDIR" ]]; then
4+
INSTALLDIR="$HOME/Documents/Arduino"
5+
fi
6+
echo "INSTALLDIR: $INSTALLDIR"
7+
8+
pde_path=`find /Applications/Arduino.app/ -name pde.jar`
9+
core_path=`find /Applications/Arduino.app/ -name arduino-core.jar`
10+
lib_path=`find /Applications/Arduino.app/ -name commons-codec-1.7.jar`
11+
if [[ -z "$core_path" || -z "$pde_path" ]]; then
12+
echo "Some java libraries have not been built yet (did you run ant build?)"
13+
return 1
14+
fi
15+
echo "pde_path: $pde_path"
16+
echo "core_path: $core_path"
17+
echo "lib_path: $lib_path"
18+
19+
set -e
20+
21+
mkdir -p bin
22+
javac -source 1.8 -target 1.8 -cp "$pde_path:$core_path:$lib_path" \
23+
-d bin src/ESP32FS.java
24+
25+
pushd bin
26+
mkdir -p $INSTALLDIR/tools
27+
rm -rf $INSTALLDIR/tools/ESP32FS
28+
mkdir -p $INSTALLDIR/tools/ESP32FS/tool
29+
zip -r $INSTALLDIR/tools/ESP32FS/tool/esp32fs.jar *
30+
popd
31+
32+
dist=$PWD/dist
33+
rev=$(git describe --tags)
34+
mkdir -p $dist
35+
pushd $INSTALLDIR/tools
36+
zip -r $dist/ESP32FS-$rev.zip ESP32FS/
37+
popd

0 commit comments

Comments
 (0)