Skip to content

Commit

Permalink
Changing the build directory
Browse files Browse the repository at this point in the history
  • Loading branch information
DImuthuUpe committed Mar 16, 2022
1 parent a0c5e62 commit 127fefc
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 49 deletions.
48 changes: 24 additions & 24 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,28 @@
# under the License.

cd ../
mvn clean install
rm -rf build
mkdir -p build
cp agent/target/MFT-Agent-0.01-bin.zip build/
cp controller/target/MFT-Controller-0.01-bin.zip build/
cp services/resource-service/server/target/Resource-Service-0.01-bin.zip build/
cp services/secret-service/server/target/Secret-Service-0.01-bin.zip build/
cp api/service/target/API-Service-0.01-bin.zip build/
cp scripts/log.sh build/
cp scripts/start-mft.sh build/
cp scripts/stop-mft.sh build/
cp scripts/start-consul.sh build/
cp scripts/stop-consul.sh build/
cp command-line/target/mft-command-line-0.01-SNAPSHOT-jar-with-dependencies.jar build/mft-client.jar
#mvn clean install
rm -rf airavata-mft
mkdir -p airavata-mft
cp agent/target/MFT-Agent-0.01-bin.zip airavata-mft/
cp controller/target/MFT-Controller-0.01-bin.zip airavata-mft/
cp services/resource-service/server/target/Resource-Service-0.01-bin.zip airavata-mft/
cp services/secret-service/server/target/Secret-Service-0.01-bin.zip airavata-mft/
cp api/service/target/API-Service-0.01-bin.zip airavata-mft/
cp scripts/log.sh airavata-mft/
cp scripts/start-mft.sh airavata-mft/
cp scripts/stop-mft.sh airavata-mft/
cp scripts/start-consul.sh airavata-mft/
cp scripts/stop-consul.sh airavata-mft/
cp command-line/target/mft-command-line-0.01-SNAPSHOT-jar-with-dependencies.jar airavata-mft/mft-client.jar

unzip -o build/MFT-Agent-0.01-bin.zip -d build/
rm build/MFT-Agent-0.01-bin.zip
unzip -o build/MFT-Controller-0.01-bin.zip -d build/
rm build/MFT-Controller-0.01-bin.zip
unzip -o build/Resource-Service-0.01-bin.zip -d build/
rm build/Resource-Service-0.01-bin.zip
unzip -o build/Secret-Service-0.01-bin.zip -d build/
rm build/Secret-Service-0.01-bin.zip
unzip -o build/API-Service-0.01-bin.zip -d build/
rm build/API-Service-0.01-bin.zip
unzip -o airavata-mft/MFT-Agent-0.01-bin.zip -d airavata-mft/
rm airavata-mft/MFT-Agent-0.01-bin.zip
unzip -o airavata-mft/MFT-Controller-0.01-bin.zip -d airavata-mft/
rm airavata-mft/MFT-Controller-0.01-bin.zip
unzip -o airavata-mft/Resource-Service-0.01-bin.zip -d airavata-mft/
rm airavata-mft/Resource-Service-0.01-bin.zip
unzip -o airavata-mft/Secret-Service-0.01-bin.zip -d airavata-mft/
rm airavata-mft/Secret-Service-0.01-bin.zip
unzip -o airavata-mft/API-Service-0.01-bin.zip -d airavata-mft/
rm airavata-mft/API-Service-0.01-bin.zip
12 changes: 6 additions & 6 deletions scripts/log.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@

case $1 in
agent)
tail -100f ../build/MFT-Agent-0.01/logs/airavata.log
tail -100f ../airavata-mft/MFT-Agent-0.01/logs/airavata.log
;;
resource)
tail -100f ../build/Resource-Service-0.01/logs/airavata.log
tail -100f ../airavata-mft/Resource-Service-0.01/logs/airavata.log
;;
secret)
tail -100f ../build/Secret-Service-0.01/logs/airavata.log
tail -100f ../airavata-mft/Secret-Service-0.01/logs/airavata.log
;;
api)
tail -100f ../build/API-Service-0.01/logs/airavata.log
tail -100f ../airavata-mft/API-Service-0.01/logs/airavata.log
;;
controller)
tail -100f ../build/MFT-Controller-0.01/logs/airavata.log
tail -100f ../airavata-mft/MFT-Controller-0.01/logs/airavata.log
;;
consul)
tail -100f ../build/consul/consul.log
tail -100f ../airavata-mft/consul/consul.log
;;
-h)
echo "Usage: log.sh"
Expand Down
16 changes: 8 additions & 8 deletions scripts/start-consul.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
# specific language governing permissions and limitations
# under the License.

PID_PATH_NAME="../build/consul/service-pid"
LOG_FILE="../build/consul/consul.log"
PID_PATH_NAME="../airavata-mft/consul/service-pid"
LOG_FILE="../airavata-mft/consul/consul.log"

case $1 in
mac)
if [ ! -f $PID_PATH_NAME ]; then
mkdir -p ../build/consul
mkdir -p ../airavata-mft/consul
curl -O https://releases.hashicorp.com/consul/1.7.1/consul_1.7.1_darwin_amd64.zip
unzip -o consul_1.7.1_darwin_amd64.zip -d ../build/consul
unzip -o consul_1.7.1_darwin_amd64.zip -d ../airavata-mft/consul
rm consul_1.7.1_darwin_amd64.zip
nohup ../build/consul/consul agent -dev > $LOG_FILE 2>&1 &
nohup ../airavata-mft/consul/consul agent -dev > $LOG_FILE 2>&1 &
echo $! > $PID_PATH_NAME
echo "Consul started"
else
Expand All @@ -36,11 +36,11 @@ case $1 in
;;
linux)
if [ ! -f $PID_PATH_NAME ]; then
mkdir -p ../build/consul
mkdir -p ../airavata-mft/consul
curl -O https://releases.hashicorp.com/consul/1.7.1/consul_1.7.1_linux_amd64.zip
unzip -o consul_1.7.1_linux_amd64.zip -d ../build/consul
unzip -o consul_1.7.1_linux_amd64.zip -d ../airavata-mft/consul
rm consul_1.7.1_linux_amd64.zip
nohup ../build/consul/consul agent -dev > $LOG_FILE 2>&1 &
nohup ../airavata-mft/consul/consul agent -dev > $LOG_FILE 2>&1 &
echo $! > $PID_PATH_NAME
echo "Consul started"
else
Expand Down
10 changes: 5 additions & 5 deletions scripts/start-mft.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
# specific language governing permissions and limitations
# under the License.

./../build/API-Service-0.01/bin/api-service-daemon.sh start
./../build/MFT-Controller-0.01/bin/controller-daemon.sh start
./../build/Resource-Service-0.01/bin/resource-service-daemon.sh start
./../build/Secret-Service-0.01/bin/secret-service-daemon.sh start
./../build/MFT-Agent-0.01/bin/agent-daemon.sh start
./../airavata-mft/API-Service-0.01/bin/api-service-daemon.sh start
./../airavata-mft/MFT-Controller-0.01/bin/controller-daemon.sh start
./../airavata-mft/Resource-Service-0.01/bin/resource-service-daemon.sh start
./../airavata-mft/Secret-Service-0.01/bin/secret-service-daemon.sh start
./../airavata-mft/MFT-Agent-0.01/bin/agent-daemon.sh start
2 changes: 1 addition & 1 deletion scripts/stop-consul.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.

PID_PATH_NAME="../build/consul/service-pid"
PID_PATH_NAME="../airavata-mft/consul/service-pid"

if [ -f $PID_PATH_NAME ]; then
PID=$(cat $PID_PATH_NAME);
Expand Down
10 changes: 5 additions & 5 deletions scripts/stop-mft.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
# specific language governing permissions and limitations
# under the License.

./../build/API-Service-0.01/bin/api-service-daemon.sh stop
./../build/MFT-Controller-0.01/bin/controller-daemon.sh stop
./../build/Resource-Service-0.01/bin/resource-service-daemon.sh stop
./../build/Secret-Service-0.01/bin/secret-service-daemon.sh stop
./../build/MFT-Agent-0.01/bin/agent-daemon.sh stop
./../airavata-mft/API-Service-0.01/bin/api-service-daemon.sh stop
./../airavata-mft/MFT-Controller-0.01/bin/controller-daemon.sh stop
./../airavata-mft/Resource-Service-0.01/bin/resource-service-daemon.sh stop
./../airavata-mft/Secret-Service-0.01/bin/secret-service-daemon.sh stop
./../airavata-mft/MFT-Agent-0.01/bin/agent-daemon.sh stop

0 comments on commit 127fefc

Please sign in to comment.