extra directory

Author: Clarke Stevens

gen.sh

@@ -24,3 +24,48 @@ then
   MY_COMMAND="cp -f ~/Project-Scripts/settings-arduino.json ${CURPWD}/.vscode/settings.json"
   eval ${MY_COMMAND}
 else
+  MY_COMMAND="mkdir -p ./${PROJNAME}/bin"
+  eval ${MY_COMMAND}
+  MY_COMMAND="cp -f ~/Project-Scripts/settings-linux.json ${CURPWD}/.vscode/settings.json"
+  eval ${MY_COMMAND}
+  MY_COMMAND="cp -f ~/Project-Scripts/devbuildmake ${CURPWD}"
+  eval ${MY_COMMAND}
+fi
+MY_COMMAND="cd ${OCFPATH}/DeviceBuilder"
+eval ${MY_COMMAND}
+pwd
+
+if [ ! -e ${CURPWD}/devbuildmake ]; then
+  MY_COMMAND="cp ${OCFPATH}/iotivity-lite/port/${PLATFORM}/devbuildmake ${CURPWD}/"
+  eval ${MY_COMMAND}
+fi
+MY_COMMAND="sh ./DeviceBuilder_IotivityLiteServer.sh ${CURPWD}/${PROJNAME}.json ${CURPWD}/device_output \"${DEVICETYPE}\" \"${DEVICENAME}\""
+eval ${MY_COMMAND}
+
+# copying the introspection file to the include folder
+MY_COMMAND="cp -f ${CURPWD}/device_output/code/server_introspection.dat.h ${OCFPATH}/iotivity-lite/include/"
+eval ${MY_COMMAND}
+
+if [ ! -f ../pki_certs.zip ]; then
+  # only create when the file does not exist
+  cd ..
+  MY_COMMAND="sh ./pki.sh"
+  eval ${MY_COMMAND}
+fi
+
+if [ -e ${CURPWD}/main/${PROJNAME}.c ];
+then
+  cp -f ${CURPWD}/device_output/code/simpleserver.c ${CURPWD}/main/${PROJNAME}-gen.c
+  if cmp -s ${CURPWD}/main/${PROJNAME}-gen.c ${CURPWD}/main/${PROJNAME}-old.c ;
+  then
+    echo "It appears that you have modified the automatically generated source file. main/${PROJNAME}-gen.c is the file without any of your changes."
+  else
+    echo "The source file built by DeviceBuilder changed. You can use diff3 to merge your own modifications."
+    echo "Example: diff3 -m main/${PROJNAME}-gen.c main/${PROJNAME}-old.c main/${PROJNAME}.c > main/${PROJNAME}-new.c"
+    echo "Then: cp -f main/${PROJNAME}-gen.c main/${PROJNAME}-old.c"
+    echo "And: mv -f main/${PROJNAME}-new.c main/${PROJNAME}.c"
+  fi
+else
+  cp ${CURPWD}/device_output/code/simpleserver.c ${CURPWD}/main/${PROJNAME}.c
+  cp ${CURPWD}/device_output/code/simpleserver.c ${CURPWD}/main/${PROJNAME}-gen.c
+fi

install.sh

@@ -70,7 +70,7 @@ echo "then" >> gen.sh
 echo "  MY_COMMAND=\"cp -f ~/Project-Scripts/settings-arduino.json \${CURPWD}/.vscode/settings.json\"" >> gen.sh
 echo "  eval \${MY_COMMAND}" >> gen.sh
 echo "else" >> gen.sh
-echo "  MY_COMMAND=\"mkdir -p ./\${PROJNAME}/bin\"" >> gen.sh
+echo "  MY_COMMAND=\"mkdir -p ./bin\"" >> gen.sh
 echo "  eval \${MY_COMMAND}" >> gen.sh
 echo "  MY_COMMAND=\"cp -f ~/Project-Scripts/settings-linux.json \${CURPWD}/.vscode/settings.json\"" >> gen.sh
 echo "  eval \${MY_COMMAND}" >> gen.sh