From 7a6add3a0fd9351afebf34939621fe0734495c45 Mon Sep 17 00:00:00 2001
From: victor <taehoon@falinux.com>
Date: Fri, 23 Jun 2017 10:23:24 +0900
Subject: [PATCH] =?UTF-8?q?Release=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8?=
 =?UTF-8?q?=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/app-prime-modbus/app/app-prime-modbus/Makefile |  2 +-
 app/app-prime-modbus/make.sh                       | 17 +++++++++++++++++
 app/gui/make.sh                                    |  2 +-
 app/make.sh                                        | 15 +++++++++++++++
 app/modbus-data-viewer/build.sh                    |  4 +++-
 app/modbus-data-viewer/release.sh                  | 18 ++++++++++++++++++
 app/superdaemon/make.sh                            |  8 ++++++++
 release.sh                                         | 12 ++++++++++++
 8 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100755 app/app-prime-modbus/make.sh
 create mode 100755 app/make.sh
 create mode 100755 app/superdaemon/make.sh

diff --git a/app/app-prime-modbus/app/app-prime-modbus/Makefile b/app/app-prime-modbus/app/app-prime-modbus/Makefile
index fe7be9d..a707bf2 100644
--- a/app/app-prime-modbus/app/app-prime-modbus/Makefile
+++ b/app/app-prime-modbus/app/app-prime-modbus/Makefile
@@ -4,7 +4,7 @@
 
 CROSS_PREFIX    = arm-buildroot-linux-gnueabihf
 
-CP_DIR          = /nfs/prime_oven/
+CP_DIR          = ../../release
 
 ## 사용자 소스
 TARGET          = app-prime-modbus
diff --git a/app/app-prime-modbus/make.sh b/app/app-prime-modbus/make.sh
new file mode 100755
index 0000000..845248a
--- /dev/null
+++ b/app/app-prime-modbus/make.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+make -C app/app-prime-modbus/
+
+RET=$?
+if [ ${RET} -ne 0 ]
+then
+  exit ${RET}
+fi
+
+if [ -z ${CP_DIR} ]
+then
+  CP_DIR=../release
+fi
+
+mkdir -p ${CP_DIR}
+cp -v release/* ${CP_DIR}
diff --git a/app/gui/make.sh b/app/gui/make.sh
index e04e9fe..93bcc3a 100755
--- a/app/gui/make.sh
+++ b/app/gui/make.sh
@@ -9,7 +9,7 @@ fi
 
 if [ -z "$CP_DIR" ]
 then
-  CP_DIR=/nfs/prime-oven
+  CP_DIR=/nfs/prime_oven
 fi
 
 image_filename=${TARGET}
diff --git a/app/make.sh b/app/make.sh
new file mode 100755
index 0000000..96c6991
--- /dev/null
+++ b/app/make.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+cd app-prime-modbus
+./make.sh
+cd -
+
+cd gui
+./make.sh
+cd -
+
+cd modbus-data-viewer
+./release.sh
+cd -
+
+
diff --git a/app/modbus-data-viewer/build.sh b/app/modbus-data-viewer/build.sh
index bb730ca..e685794 100755
--- a/app/modbus-data-viewer/build.sh
+++ b/app/modbus-data-viewer/build.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
 
-GOPATH=$PWD go get -v service-web
+GOPATH=$PWD go get -v service-web && \
 GOPATH=$PWD GOARCH=arm GOOS=linux go install service-web
+
+exit $?
diff --git a/app/modbus-data-viewer/release.sh b/app/modbus-data-viewer/release.sh
index 4b430dd..23cf1ad 100755
--- a/app/modbus-data-viewer/release.sh
+++ b/app/modbus-data-viewer/release.sh
@@ -2,6 +2,12 @@
 
 ./build.sh
 
+RET=$?
+if [ ${RET} -ne 0 ]
+then
+  exit ${RET}
+fi
+
 if [ ! -d release ]; then
   mkdir release
 else
@@ -10,3 +16,15 @@ fi
 
 cp bin/linux_arm/service-web release/service-web
 cp -rf src/service-web/templates release/
+
+if [ -z "$CP_DIR" ]
+then
+  CP_DIR=/nfs/prime_oven
+fi
+
+for DEST_DIR in ${CP_DIR}
+do
+  echo "copy from release to ${DEST_DIR}"
+  mkdir -p ${DEST_DIR}/
+  cp -rf release/* ${DEST_DIR}
+done
diff --git a/app/superdaemon/make.sh b/app/superdaemon/make.sh
new file mode 100755
index 0000000..f69abaa
--- /dev/null
+++ b/app/superdaemon/make.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ -z ${CP_DIR} ]
+then
+  CP_DIR=../release
+fi
+
+make && cp -v superdaemon ${CP_DIR}
diff --git a/release.sh b/release.sh
index 0dec64b..0ff1b69 100755
--- a/release.sh
+++ b/release.sh
@@ -12,6 +12,9 @@ KERNEL_OUT_DIR=kernel/output-linux-imx6_3.14.28
 BUILDROOT_SRC_DIR=buildroot/buildroot-2016.08.1
 BUILDROOT_OUT_DIR=buildroot/output-buildroot-2016.08.1
 
+APP_SRC_DIR=app
+APP_OUT_DIR=app/release
+
 TAG=`git log -1 --pretty=format:%h`
 IMAGE_DIR=`realpath $(pwd)/../images_${TAG}`
 
@@ -42,4 +45,13 @@ echo "=============================================="
 CP_DIR=${IMAGE_DIR} ./make.sh image
 cd -
 
+cd ${APP_SRC_DIR}
+echo "=============================================="
+echo " Build applications [ $(pwd) ]"
+echo " IMAGE_DIR: ${IMAGE_DIR}"
+echo "=============================================="
+
+CP_DIR=${IMAGE_DIR} ./make.sh
+cd -
+
 cp -Ra files/* ${IMAGE_DIR}
-- 
2.1.4