Skip to content

Commit a357c63

Browse files
author
Clarke Stevens
committed
typo
1 parent 70851f5 commit a357c63

File tree

2 files changed

+1
-42
lines changed

2 files changed

+1
-42
lines changed

gen.sh

-41
Original file line numberDiff line numberDiff line change
@@ -24,44 +24,3 @@ then
2424
MY_COMMAND="cp -f ~/Project-Scripts/settings-arduino.json ${CURPWD}/.vscode/settings.json"
2525
eval ${MY_COMMAND}
2626
else
27-
MY_COMMAND="cp -f ~/Project-Scripts/settings-linux.json ${CURPWD}/.vscode/settings.json"
28-
eval ${MY_COMMAND}
29-
fi
30-
MY_COMMAND="cd ${OCFPATH}/DeviceBuilder"
31-
eval ${MY_COMMAND}
32-
pwd
33-
34-
if [ ! -e ${CURPWD}/devbuildmake ]; then
35-
MY_COMMAND="cp ${OCFPATH}/iotivity-lite/port/${PLATFORM}/devbuildmake ${CURPWD}/"
36-
eval ${MY_COMMAND}
37-
fi
38-
MY_COMMAND="sh ./DeviceBuilder_IotivityLiteServer.sh ${CURPWD}/${PROJNAME}.json ${CURPWD}/device_output \"${DEVICETYPE}\" \"${DEVICENAME}\""
39-
eval ${MY_COMMAND}
40-
41-
# copying the introspection file to the include folder
42-
MY_COMMAND="cp -f ${CURPWD}/device_output/code/server_introspection.dat.h ${OCFPATH}/iotivity-lite/include/"
43-
eval ${MY_COMMAND}
44-
45-
if [ ! -f ../pki_certs.zip ]; then
46-
# only create when the file does not exist
47-
cd ..
48-
MY_COMMAND="sh ./pki.sh"
49-
eval ${MY_COMMAND}
50-
fi
51-
52-
if [ -e ${CURPWD}/main/${PROJNAME}.c ];
53-
then
54-
cp -f ${CURPWD}/device_output/code/simpleserver.c ${CURPWD}/main/${PROJNAME}-gen.c
55-
if cmp -s ${CURPWD}/main/${PROJNAME}-gen.c ${CURPWD}/main/${PROJNAME}-old.c ;
56-
then
57-
echo "It appears that you have modified the automatically generated source file. main/${PROJNAME}-gen.c is the file without any of your changes."
58-
else
59-
echo "The source file built by DeviceBuilder changed. You can use diff3 to merge your own modifications."
60-
echo "Example: diff3 -m main/${PROJNAME}-gen.c main/${PROJNAME}-old.c main/${PROJNAME}.c > main/${PROJNAME}-new.c"
61-
echo "Then: cp -f main/${PROJNAME}-gen.c main/${PROJNAME}-old.c"
62-
echo "And: mv -f main/${PROJNAME}-new.c main/${PROJNAME}.c"
63-
fi
64-
else
65-
cp ${CURPWD}/device_output/code/simpleserver.c ${CURPWD}/main/${PROJNAME}.c
66-
cp ${CURPWD}/device_output/code/simpleserver.c ${CURPWD}/main/${PROJNAME}-gen.c
67-
fi

install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ echo "then" >> gen.sh
7070
echo " MY_COMMAND=\"cp -f ~/Project-Scripts/settings-arduino.json \${CURPWD}/.vscode/settings.json\"" >> gen.sh
7171
echo " eval \${MY_COMMAND}" >> gen.sh
7272
echo "else" >> gen.sh
73-
echo " MY_COMMAND=\"mkdir -p ./\${PROJNAME}/bin\"" >> >> gen.sh
73+
echo " MY_COMMAND=\"mkdir -p ./\${PROJNAME}/bin\"" >> gen.sh
7474
echo " eval \${MY_COMMAND}" >> gen.sh
7575
echo " MY_COMMAND=\"cp -f ~/Project-Scripts/settings-linux.json \${CURPWD}/.vscode/settings.json\"" >> gen.sh
7676
echo " eval \${MY_COMMAND}" >> gen.sh

0 commit comments

Comments
 (0)