From 4dc1e3e922b08abdc67f22a588929f1ca22dcc21 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 26 Jul 2017 21:37:05 +0200 Subject: [PATCH] Re-structuring and adding js builder --- Js/build.sh | 10 ++++++++++ Js/build3D.sh | 0 Js/buildBase.sh | 0 Js/buildChart.sh | 27 +++++++++++++++++++++++++++ Js/buildLib.sh | 0 Js/buildSocket.sh | 0 Js/buildUI.sh | 0 Tools/jsBuilder.sh | 27 ++++++++++----------------- build_dev.sh | 4 ++-- build_public.sh | 4 ++-- inspection.sh => inspect.sh | 10 +++++++++- setup.sh | 5 ----- 12 files changed, 60 insertions(+), 27 deletions(-) create mode 100644 Js/build.sh create mode 100644 Js/build3D.sh create mode 100644 Js/buildBase.sh create mode 100644 Js/buildChart.sh create mode 100644 Js/buildLib.sh create mode 100644 Js/buildSocket.sh create mode 100644 Js/buildUI.sh rename inspection.sh => inspect.sh (52%) diff --git a/Js/build.sh b/Js/build.sh new file mode 100644 index 0000000..b6a8757 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/Js/build3D.sh b/Js/build3D.sh new file mode 100644 index 0000000..e69de29 diff --git a/Js/buildBase.sh b/Js/buildBase.sh new file mode 100644 index 0000000..e69de29 diff --git a/Js/buildChart.sh b/Js/buildChart.sh new file mode 100644 index 0000000..30fa1c9 --- /dev/null +++ b/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 diff --git a/Js/buildLib.sh b/Js/buildLib.sh new file mode 100644 index 0000000..e69de29 diff --git a/Js/buildSocket.sh b/Js/buildSocket.sh new file mode 100644 index 0000000..e69de29 diff --git a/Js/buildUI.sh b/Js/buildUI.sh new file mode 100644 index 0000000..e69de29 diff --git a/Tools/jsBuilder.sh b/Tools/jsBuilder.sh index 9a9571f..75fe29d 100644 --- a/Tools/jsBuilder.sh +++ b/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} \ No newline at end of file +echo "(function(jsOMS){\"use strict\";$(cat ${OUT})}(window.jsOMS = window.jsOMS || {}));" > ${OUT} \ No newline at end of file diff --git a/build_dev.sh b/build_dev.sh index c8769c8..0846189 100644 --- a/build_dev.sh +++ b/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 diff --git a/build_public.sh b/build_public.sh index 9444707..14a3372 100644 --- a/build_public.sh +++ b/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' diff --git a/inspection.sh b/inspect.sh similarity index 52% rename from inspection.sh rename to inspect.sh index 23457df..5874d46 100644 --- a/inspection.sh +++ b/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 diff --git a/setup.sh b/setup.sh index a6a4cf5..7b8a749 100644 --- a/setup.sh +++ b/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