Skip to content

Commit 6984104

Browse files
author
Clarke Stevens
committed
Update install.sh
1 parent 82b59e7 commit 6984104

File tree

1 file changed

+63
-49
lines changed

1 file changed

+63
-49
lines changed

‎install.sh

Lines changed: 63 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ CURPWD=`pwd`
2929
SCRIPTPATH=${CURPWD}/Project-Scripts
3030

3131
if [[ ! (${PATH} == *${SCRIPTPATH}*) ]]; then
32-
# update the PATH environment variable: NEED TO RUN THIS SCRIPT WITH "source set_path.sh"
32+
# update the PATH environment variable: NEED TO RUN THIS SCRIPT WITH "source set_path.sh"
3333
export PATH=${SCRIPTPATH}:${PATH}
3434

3535
# modify the ~/.bashrc file so things are set correctly on boot
@@ -65,41 +65,41 @@ echo "MY_COMMAND=\"cd \${OCFPATH}/DeviceBuilder\"" >> gen.sh
6565
echo "eval \${MY_COMMAND}" >> gen.sh
6666
echo "pwd" >> gen.sh
6767
echo "" >> gen.sh
68-
echo " if [ ! -e \${CURPWD}/devbuildmake ]; then" >> gen.sh
69-
echo " MY_COMMAND=\"cp \${OCFPATH}/iotivity-lite/port/\${PLATFORM}/devbuildmake \${CURPWD}/\"" >> gen.sh
70-
echo " eval \${MY_COMMAND}" >> gen.sh
71-
echo " fi" >> gen.sh
72-
echo " MY_COMMAND=\"sh ./DeviceBuilder_IotivityLiteServer.sh \${CURPWD}/\${PROJNAME}.json \${CURPWD}/device_output \\\"\${DEVICETYPE}\\\" \\\"\${DEVICENAME}\\\"\"" >> gen.sh
68+
echo "if [ ! -e \${CURPWD}/devbuildmake ]; then" >> gen.sh
69+
echo " MY_COMMAND=\"cp \${OCFPATH}/iotivity-lite/port/\${PLATFORM}/devbuildmake \${CURPWD}/\"" >> gen.sh
7370
echo " eval \${MY_COMMAND}" >> gen.sh
71+
echo "fi" >> gen.sh
72+
echo "MY_COMMAND=\"sh ./DeviceBuilder_IotivityLiteServer.sh \${CURPWD}/\${PROJNAME}.json \${CURPWD}/device_output \\\"\${DEVICETYPE}\\\" \\\"\${DEVICENAME}\\\"\"" >> gen.sh
73+
echo "eval \${MY_COMMAND}" >> gen.sh
7474
echo "" >> gen.sh
75-
echo " # copying the introspection file to the include folder" >> gen.sh
76-
echo " MY_COMMAND=\"cp -f \${CURPWD}/device_output/code/server_introspection.dat.h \${OCFPATH}/iotivity-lite/include/\"" >> gen.sh
77-
echo " eval \${MY_COMMAND}" >> gen.sh
75+
echo "# copying the introspection file to the include folder" >> gen.sh
76+
echo "MY_COMMAND=\"cp -f \${CURPWD}/device_output/code/server_introspection.dat.h \${OCFPATH}/iotivity-lite/include/\"" >> gen.sh
77+
echo "eval \${MY_COMMAND}" >> gen.sh
7878
echo "" >> gen.sh
79-
echo " if [ ! -f ../pki_certs.zip ]; then" >> gen.sh
80-
echo " # only create when the file does not exist" >> gen.sh
81-
echo " cd .." >> gen.sh
82-
echo " MY_COMMAND=\"sh ./pki.sh\"" >> gen.sh
83-
echo " eval \${MY_COMMAND}" >> gen.sh
84-
echo " fi" >> gen.sh
79+
echo "if [ ! -f ../pki_certs.zip ]; then" >> gen.sh
80+
echo " # only create when the file does not exist" >> gen.sh
81+
echo " cd .." >> gen.sh
82+
echo " MY_COMMAND=\"sh ./pki.sh\"" >> gen.sh
83+
echo " eval \${MY_COMMAND}" >> gen.sh
84+
echo "fi" >> gen.sh
8585
echo "" >> gen.sh
86-
echo " if [ -e \${CURPWD}/src/\${PROJNAME}.c ];" >> gen.sh
86+
echo "if [ -e \${CURPWD}/src/\${PROJNAME}.c ];" >> gen.sh
87+
echo "then" >> gen.sh
88+
echo " cp -f \${CURPWD}/device_output/code/simpleserver.c \${CURPWD}/src/\${PROJNAME}-gen.c" >> gen.sh
89+
echo " if cmp -s \${CURPWD}/src/\${PROJNAME}-gen.c \${CURPWD}/src/\${PROJNAME}-old.c ;" >> gen.sh
8790
echo " then" >> gen.sh
88-
echo " cp -f \${CURPWD}/device_output/code/simpleserver.c \${CURPWD}/src/\${PROJNAME}-gen.c" >> gen.sh
89-
echo " if cmp -s \${CURPWD}/src/\${PROJNAME}-gen.c \${CURPWD}/src/\${PROJNAME}-old.c ;" >> gen.sh
90-
echo " then" >> gen.sh
91-
echo " echo \"It appears that you have modified the automatically generated source file. src/\${PROJNAME}-gen.c is the file without any of your changes.\"" >> gen.sh
92-
echo " else" >> gen.sh
93-
echo " echo \"The source file built by DeviceBuilder changed. You can use diff3 to merge your own modifications.\"" >> gen.sh
94-
echo " echo \"Example: diff3 -m src/\${PROJNAME}-gen.c src/\${PROJNAME}-old.c src/\${PROJNAME}.c > src/\${PROJNAME}-new.c\"" >> gen.sh
95-
echo " echo \"Then: cp -f src/\${PROJNAME}-gen.c src/\${PROJNAME}-old.c\"" >> gen.sh
96-
echo " echo \"And: mv -f src/\${PROJNAME}-new.c src/\${PROJNAME}.c\"" >> gen.sh
97-
echo " fi" >> gen.sh
91+
echo " echo \"It appears that you have modified the automatically generated source file. src/\${PROJNAME}-gen.c is the file without any of your changes.\"" >> gen.sh
9892
echo " else" >> gen.sh
99-
echo " cp \${CURPWD}/device_output/code/simpleserver.c \${CURPWD}/src/\${PROJNAME}.c" >> gen.sh
100-
echo " cp \${CURPWD}/device_output/code/simpleserver.c \${CURPWD}/src/\${PROJNAME}-gen.c" >> gen.sh
101-
echo " cp \${CURPWD}/device_output/code/simpleserver.c \${CURPWD}/src/\${PROJNAME}-old.c" >> gen.sh
93+
echo " echo \"The source file built by DeviceBuilder changed. You can use diff3 to merge your own modifications.\"" >> gen.sh
94+
echo " echo \"Example: diff3 -m src/\${PROJNAME}-gen.c src/\${PROJNAME}-old.c src/\${PROJNAME}.c > src/\${PROJNAME}-new.c\"" >> gen.sh
95+
echo " echo \"Then: cp -f src/\${PROJNAME}-gen.c src/\${PROJNAME}-old.c\"" >> gen.sh
96+
echo " echo \"And: mv -f src/\${PROJNAME}-new.c src/\${PROJNAME}.c\"" >> gen.sh
10297
echo " fi" >> gen.sh
98+
echo "else" >> gen.sh
99+
echo " cp \${CURPWD}/device_output/code/simpleserver.c \${CURPWD}/src/\${PROJNAME}.c" >> gen.sh
100+
echo " cp \${CURPWD}/device_output/code/simpleserver.c \${CURPWD}/src/\${PROJNAME}-gen.c" >> gen.sh
101+
echo " cp \${CURPWD}/device_output/code/simpleserver.c \${CURPWD}/src/\${PROJNAME}-old.c" >> gen.sh
102+
echo "fi" >> gen.sh
103103

104104
# create the build script for the config file
105105
echo "#!/bin/bash" > build.sh
@@ -114,28 +114,42 @@ echo "OCFSUBPATH=\`jq --raw-output '.implementation_paths[0]' \${CURPWD}/\${PROJ
114114
echo "OCFPATH=\"\${OCFBASEPATH}\${OCFSUBPATH}\"" >> build.sh
115115
echo "PLATFORM=\`jq --raw-output '.platforms[0]' \${CURPWD}/\${PROJNAME}-config.json\`" >> build.sh
116116
echo "" >> build.sh
117-
echo "#TODO change this to compile from the project source direcotry, but temporarily copy the souce code over." >> build.sh
118-
echo "MY_COMMAND=\"cp \${CURPWD}/src/\${PROJNAME}.c \${OCFPATH}/iotivity-lite/apps/device_builder_server.c\"" >> build.sh
119-
echo "eval \${MY_COMMAND}" >> build.sh
120-
echo "MY_COMMAND=\"cp \${CURPWD}/src/\${PROJNAME}-main.c \${OCFPATH}/iotivity-lite/apps/device_builder_server-main.c\"" >> build.sh
121-
echo "eval \${MY_COMMAND}" >> build.sh
122-
echo "MY_COMMAND=\"cp \${CURPWD}/src/\${PROJNAME}-main.cpp \${OCFPATH}/iotivity-lite/apps/device_builder_server-main.cpp\"" >> build.sh
123-
echo "eval \${MY_COMMAND}" >> build.sh
117+
echo "if [ \"\$PLATFORM\" == \"esp32\"]" >> build.sh
118+
echo " MY_COMMAND=\"cp \${CURPWD}/src/\${PROJNAME}.c \${OCFPATH}/iotivity-lite/port/\${PLATFORM}/main/esp32-example.c\"" >> build.sh
119+
echo " eval \${MY_COMMAND}" >> build.sh
120+
echo " MY_COMMAND=\"cp \${CURPWD}/src/\${PROJNAME}-main.c \${OCFPATH}/iotivity-lite/port/\${PLATFORM}/main/main.c\"" >> build.sh
121+
echo " eval \${MY_COMMAND}" >> build.sh
122+
echo " MY_COMMAND=\"cp \${CURPWD}/src/pki_certs.h \${OCFPATH}/iotivity-lite/port/\${PLATFORM}/main/pki_certs.h\"" >> build.sh
123+
echo " eval \${MY_COMMAND}" >> build.sh
124+
echo "" >> build.sh
125+
echo " MY_COMMAND=\"cd \${OCFPATH}/iotivity-lite/port/\${PLATFORM}/\"" >> build.sh
126+
echo " eval \${MY_COMMAND}" >> build.sh
127+
echo " MY_COMMAND=\"idf.py build\"" >> build.sh
128+
echo " eval \${MY_COMMAND}" >> build.sh
124129
echo "" >> build.sh
125-
echo "MY_COMMAND=\"cd \${OCFPATH}/iotivity-lite/port/\${PLATFORM}/\"" >> build.sh
126-
echo "eval \${MY_COMMAND}" >> build.sh
127-
echo "MY_COMMAND=\"make -f \${CURPWD}/devbuildmake DYNAMIC=1 IPV4=1 device_builder_server\"" >> build.sh
128-
echo "eval \${MY_COMMAND}" >> build.sh
129-
echo "#make -f \${CURPWD}/devbuildmake DYNAMIC=1 device_builder_server" >> build.sh
130-
echo "#uncomment to make the debug version" >> build.sh
131-
echo "#make -f \${CURPWD}/devbuildmake DYNAMIC=1 DEBUG=1 device_builder_server" >> build.sh
130+
echo "else" >> build.sh
131+
echo " #TODO change this to compile from the project source direcotry, but temporarily copy the souce code over." >> build.sh
132+
echo " MY_COMMAND=\"cp \${CURPWD}/src/\${PROJNAME}.c \${OCFPATH}/iotivity-lite/apps/device_builder_server.c\"" >> build.sh
133+
echo " eval \${MY_COMMAND}" >> build.sh
134+
echo " MY_COMMAND=\"cp \${CURPWD}/src/\${PROJNAME}-main.c \${OCFPATH}/iotivity-lite/apps/device_builder_server-main.c\"" >> build.sh
135+
echo " eval \${MY_COMMAND}" >> build.sh
136+
echo " MY_COMMAND=\"cp \${CURPWD}/src/\${PROJNAME}-main.cpp \${OCFPATH}/iotivity-lite/apps/device_builder_server-main.cpp\"" >> build.sh
137+
echo " eval \${MY_COMMAND}" >> build.sh
132138
echo "" >> build.sh
133-
echo "#TODO remove this command once the above problem is fixed" >> build.sh
134-
echo "MY_COMMAND=\"cp \${OCFPATH}/iotivity-lite/port/\${PLATFORM}/device_builder_server \${CURPWD}/bin/\${PROJNAME}\"" >> build.sh
135-
echo "eval \${MY_COMMAND}" >> build.sh
136-
#echo "fi" >> build.sh
137-
#echo "" >> build.sh
138-
#echo "cd \$CURPWD" >> build.sh
139+
echo " MY_COMMAND=\"cd \${OCFPATH}/iotivity-lite/port/\${PLATFORM}/\"" >> build.sh
140+
echo " eval \${MY_COMMAND}" >> build.sh
141+
echo " MY_COMMAND=\"make -f \${CURPWD}/devbuildmake DYNAMIC=1 IPV4=1 device_builder_server\"" >> build.sh
142+
echo " eval \${MY_COMMAND}" >> build.sh
143+
echo " #make -f \${CURPWD}/devbuildmake DYNAMIC=1 device_builder_server" >> build.sh
144+
echo " #uncomment to make the debug version" >> build.sh
145+
echo " #make -f \${CURPWD}/devbuildmake DYNAMIC=1 DEBUG=1 device_builder_server" >> build.sh
146+
echo "" >> build.sh
147+
echo " #TODO remove this command once the above problem is fixed" >> build.sh
148+
echo " MY_COMMAND=\"cp \${OCFPATH}/iotivity-lite/port/\${PLATFORM}/device_builder_server \${CURPWD}/bin/\${PROJNAME}\"" >> build.sh
149+
echo " eval \${MY_COMMAND}" >> build.sh
150+
echo "fi" >> build.sh
151+
152+
echo "cd \$CURPWD" >> build.sh
139153

140154
# make scripts executable
141155
chmod +x ${CURPWD}/Project-Scripts/*.sh

0 commit comments

Comments
 (0)