Merge branch 'add_test_option' of /home/git/repositories/minicom/datasid

build-agent.sh

@@ -22,6 +22,15 @@
 build_dir="build"
 agent_dir="agent"
 
+case "$1" in
+    -t|--test)
+        cp "${agent_dir}/conf/datasid.conf" "/tmp/datasid.conf"
+        sed "s/WEBSERVICE=\"http:\/\/simmc.c3sl.ufpr.br\/axis2\/services\/DataSID\"\
+/WEBSERVICE=\"http:\/\/bisimmcdev.c3sl.ufpr.br\/axis2\/services\/DataSID\"/g" \
+        "/tmp/datasid.conf" > "${agent_dir}/conf/datasid.conf"
+    ;;    
+esac
+
 cd "${build_dir}"
 sudo bash env-manager.sh --no-confirm delete
 sudo bash env-manager.sh --no-confirm create
@@ -31,3 +40,7 @@ cd /home/user/build/agent
 sudo -u user /bin/bash autobuild.sh
 EOF
 cd -
+
+if [ -f "/tmp/datasid.conf" ]; then
+    mv "/tmp/datasid.conf" "${agent_dir}/conf/"
+fi
\ No newline at end of file

windows-installer/Makefile

@@ -16,6 +16,7 @@ GSOAP = gsoap-$(GSOAPVER)
 INSTALLERSRC = ./src/installer.nsi
 
 COLLECTDIR = $(WININSTDIR)/../windows-collect
+AGENT = $(COLLECTDIR)/src/datasidAgent.py
 WINGSOAP = "wine win-build/$(GSOAP)/gsoap/bin/win32/"
 
 all: client collect installer
@@ -40,3 +41,12 @@ installer:
 	@mkdir -p "windows-agent"
 	@cp build/DataSID.exe "windows-agent"
 	@cp 7zS.sfx "windows-agent"
+
+test: /tmp/datasidAgent.py all
+	@mv $< $(AGENT)
+
+/tmp/datasidAgent.py:
+	@cp $(AGENT) $@ 
+	@sed "s/URL = \"http:\/\/simmc.c3sl.ufpr.br\/axis2\/services\/DataSID\"\
+	/URL = \"http:\/\/bisimmcdev.c3sl.ufpr.br\/axis2\/services\/DataSID\"/g" \
+	$@  > $(AGENT)