Re-structuring and adding js builder

Js/build.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+. config
+
+. Tools/buildBase.sh
+. Tools/buildLib.sh
+. Tools/buildUI.sh
+. Tools/build3D.sh
+. Tools/buildChart.sh
+. Tools/buildSocket.sh

Js/buildChart.sh

@@ -0,0 +1,27 @@
+# JS files
+SRC=0
+SRC[0]="${ROOT_PATH}/jsOMS/Chart/ChartAbstract.js"
+SRC[1]="${ROOT_PATH}/jsOMS/Chart/LineChart.js"
+SRC[2]="${ROOT_PATH}/jsOMS/Chart/AreaChart.js"
+SRC[3]="${ROOT_PATH}/jsOMS/Chart/DiffAreaChart.js"
+SRC[4]="${ROOT_PATH}/jsOMS/Chart/StackedAreaChart.js"
+SRC[5]="${ROOT_PATH}/jsOMS/Chart/ColumnChart.js"
+SRC[6]="${ROOT_PATH}/jsOMS/Chart/BarChart.js"
+SRC[7]="${ROOT_PATH}/jsOMS/Chart/GroupedColumnChart.js"
+SRC[8]="${ROOT_PATH}/jsOMS/Chart/GroupedBarChart.js"
+SRC[9]="${ROOT_PATH}/jsOMS/Chart/StackedColumnChart.js"
+SRC[10]="${ROOT_PATH}/jsOMS/Chart/StackedBarChart.js"
+SRC[11]="${ROOT_PATH}/jsOMS/Chart/PieChart.js"
+SRC[12]="${ROOT_PATH}/jsOMS/Chart/DonutChart.js"
+SRC[13]="${ROOT_PATH}/jsOMS/Chart/WaterfallChart.js"
+SRC[14]="${ROOT_PATH}/jsOMS/Chart/VWaterfallChart.js"
+SRC[15]="${ROOT_PATH}/jsOMS/Chart/PyramidChart.js"
+SRC[16]="${ROOT_PATH}/jsOMS/Chart/ScatterplotChart.js"
+SRC[17]="${ROOT_PATH}/jsOMS/Chart/CalendarChart.js"
+SRC[18]="${ROOT_PATH}/jsOMS/Chart/CandlestickChart.js"
+SRC[19]="${ROOT_PATH}/jsOMS/Chart/OhlcChart.js"
+
+# JS files
+OUT="${ROOT_PATH}/jsOMS/omsChart.js"
+
+. Tools/jsBuilder.sh

Tools/jsBuilder.sh

@@ -1,27 +1,20 @@
 #!/bin/bash
 
-# JS files
-LIB_SRC[0]="/var/www/html/Orange-Management/jsOMS/Uri/Http.js"
-LIB_SRC[1]="/var/www/html/Orange-Management/jsOMS/Uri/UriFactory.js"
-
-# JS files
-LIB_OUT="/home/pi/output.js"
-
-echo "" > ${LIB_OUT}
-for i in "${LIB_SRC[@]}"
+echo "" > ${OUT}
+for i in "${SRC[@]}"
 do
-    cat $i >> ${LIB_OUT}
-    echo "" >> ${LIB_OUT}
+    cat $i >> ${OUT}
+    echo "" >> ${OUT}
 done
 
 # Remove spaces at end of line
-sed -i -e 's/[[:blank:]]*$//g' ${LIB_OUT}
+sed -i -e 's/[[:blank:]]*$//g' ${OUT}
 # Make single line
-sed -i -e ':a;N;$!ba;s/\n/ /g' ${LIB_OUT}
+sed -i -e ':a;N;$!ba;s/\n/ /g' ${OUT}
 # Remove multiple spaces
-sed -i -e 's/  */ /g' ${LIB_OUT}
+sed -i -e 's/  */ /g' ${OUT}
 # Remove double js initialization
-sed -i -e 's/(function *(jsOMS) *{ *"use strict";//g' ${LIB_OUT}
-sed -i -e 's/} *(window.jsOMS = window.jsOMS || {}));//g' ${LIB_OUT}
+sed -i -e 's/(function *(jsOMS) *{ *"use strict";//g' ${OUT}
+sed -i -e 's/} *(window.jsOMS = window.jsOMS || {}));//g' ${OUT}
 
-echo "(function(jsOMS){\"use strict\";$(cat ${LIB_OUT})}(window.jsOMS = window.jsOMS || {}));" > ${LIB_OUT}
+echo "(function(jsOMS){\"use strict\";$(cat ${OUT})}(window.jsOMS = window.jsOMS || {}));" > ${OUT}

build_dev.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-# Include vars
-. var.sh
+# Include config
+. config.sh
 
 # Creating release path
 rm -r -f ${ROOT_PATH}/${RELEASE_PATH}/${VERSION_HASH}/Dev

build_public.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-# Include vars
-. var.sh
+# Include config
+. config.sh
 
 # Removing unnecessary attribute quotes (only for end user release not for dev release)
 find ${ROOT_PATH} -name "*tpl.php" | xargs -L1 sed -i -e 's/(name=")([a-zA-Z0-9\-\_]*)(")/name=\2/g'

inspect.sh

@@ -1,8 +1,16 @@
 #!/bin/bash
 
-# Include
+# Include config
 . config.sh
 
+# Setting up database for demo and testing
+mysql -e 'drop database if exists oms;' -u ${DB_USER} -p${DB_PASSWORD}
+mysql -e 'create database oms;' -u ${DB_USER} -p${DB_PASSWORD}
+#echo "USE mysql;\nUPDATE user SET password=PASSWORD('123456') WHERE user='root';\nFLUSH PRIVILEGES;\n" | mysql -u root
+
+# Build js
+. Js/build.sh
+
 # Executing unit tests
 . Inspection/Php/tests.sh
 

setup.sh

@@ -51,11 +51,6 @@ mkdir -p ${INSPECTION_PATH}/Test/Js
 # Permission handling
 chmod -R 777 ${ROOT_PATH}
 
-# Setting up database for demo and testing
-mysql -e 'drop database if exists oms;' -u ${DB_USER} -p${DB_PASSWORD}
-mysql -e 'create database oms;' -u ${DB_USER} -p${DB_PASSWORD}
-#echo "USE mysql;\nUPDATE user SET password=PASSWORD('123456') WHERE user='root';\nFLUSH PRIVILEGES;\n" | mysql -u root
-
 cd ${ROOT_PATH}
 touch private.php