From 791b11396d6b7b8504033dd61db7fedb0a6d0fa7 Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Tue, 21 Dec 2010 12:14:15 +0000
Subject: [PATCH] 2010-12-21 Ramon Novoa <rnovoa@artica.es>
* build_src.sh, build_deb.sh, build_rpm.sh: Small fixes to build scripts.
* build_windows_agent.sh: Added to respository. Windows agent build script.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3673 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
extras/ChangeLog | 6 ++++++
extras/build_deb.sh | 16 +++++++++-------
extras/build_rpm.sh | 19 ++++++++-----------
extras/build_src.sh | 21 ++++++++++-----------
extras/build_windows_agent.sh | 12 ++++++++++++
5 files changed, 45 insertions(+), 29 deletions(-)
create mode 100755 extras/build_windows_agent.sh
diff --git a/extras/ChangeLog b/extras/ChangeLog
index 799339b823..c7485536e7 100644
--- a/extras/ChangeLog
+++ b/extras/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-21 Ramon Novoa <rnovoa@artica.es>
+
+ * build_src.sh, build_deb.sh, build_rpm.sh: Small fixes to build scripts.
+
+ * build_windows_agent.sh: Added to respository. Windows agent build script.
+
2010-11-08 Sancho Lerena <slerena@artica.es>
* build_src.sh: Removed NT4 from the unix src package.
diff --git a/extras/build_deb.sh b/extras/build_deb.sh
index 9252f5afd4..474acf82b8 100755
--- a/extras/build_deb.sh
+++ b/extras/build_deb.sh
@@ -1,34 +1,36 @@
#!/bin/bash
-
CODEHOME=~/code/pandora/trunk
-CODEHOME_ENT=~/code/artica
+CODEHOME_ENT=~/code/artica/code
RPMHOME=/usr/src/packages
+START_DIR=`pwd`
mkdir -p $RPMHOME/DEB
echo "Creating DEB packages in $RPMHOME/DEB"
cd $CODEHOME/pandora_console/DEBIAN
-sudo bash ./make_deb_package.sh
+bash ./make_deb_package.sh
cd ..
mv *.deb $RPMHOME/DEB
cd $CODEHOME/pandora_server/DEBIAN
-sudo bash ./make_deb_package.sh
+bash ./make_deb_package.sh
cd ..
mv *.deb $RPMHOME/DEB
cd $CODEHOME/pandora_agents/unix/DEBIAN
-sudo bash ./make_deb_package.sh
+bash ./make_deb_package.sh
cd ..
mv *.deb $RPMHOME/DEB
cd $CODEHOME_ENT/pandora/trunk/pandora_console/DEBIAN
-sudo bash ./make_deb_package.sh
+bash ./make_deb_package.sh
cd ..
mv *.deb $RPMHOME/DEB
cd $CODEHOME_ENT/pandora/trunk/pandora_server/PandoraFMS-Enterprise/DEBIAN
-sudo bash ./make_deb_package.sh
+bash ./make_deb_package.sh
cd ..
mv *.deb $RPMHOME/DEB
+cd $START_DIR
+
diff --git a/extras/build_rpm.sh b/extras/build_rpm.sh
index 5ef9b41aa7..1e05aa0bb8 100755
--- a/extras/build_rpm.sh
+++ b/extras/build_rpm.sh
@@ -1,17 +1,14 @@
#!/bin/bash
-
CODEHOME=~/code/pandora/trunk
-CODEHOME_ENT=~/code/artica
+CODEHOME_ENT=~/code/artica/code
RPMHOME=/usr/src/packages
-echo "Creating RPMs at $RPMHOME/RPMS"
-
-cd $CODEHOME
-sudo rpmbuild -ba pandora_console/pandora_console.spec
-sudo rpmbuild -ba pandora_agents/unix/pandora_agent.spec
-sudo rpmbuild -ba pandora_server/pandora_server.spec
-sudo rpmbuild -ba $CODEHOME_ENT/pandora/trunk/pandora_console/enterprise/pandora_console_enterprise.spec
-sudo rpmbuild -ba $CODEHOME_ENT/pandora/trunk/pandora_server/PandoraFMS-Enterprise/pandora_server_enterprise.spec
-sudo rpmbuild -ba $CODEHOME_ENT/updatemanager/keygen/pandora/pandora_keygen.spec
+echo "Creating RPM packages in $RPMHOME/RPMS"
+rpmbuild -ba $CODEHOME/pandora_console/pandora_console.spec
+rpmbuild -ba $CODEHOME/pandora_agents/unix/pandora_agent.spec
+rpmbuild -ba $CODEHOME/pandora_server/pandora_server.spec
+rpmbuild -ba $CODEHOME_ENT/pandora/trunk/pandora_console/enterprise/pandora_console_enterprise.spec
+rpmbuild -ba $CODEHOME_ENT/pandora/trunk/pandora_server/PandoraFMS-Enterprise/pandora_server_enterprise.spec
+rpmbuild -ba $CODEHOME_ENT/updatemanager/keygen/pandora/pandora_keygen.spec
diff --git a/extras/build_src.sh b/extras/build_src.sh
index ddfb1c006f..233364856d 100755
--- a/extras/build_src.sh
+++ b/extras/build_src.sh
@@ -1,34 +1,33 @@
#!/bin/bash
-
CODEHOME=~/code/pandora/trunk
-CODEHOME_ENT=~/code/artica
+CODEHOME_ENT=~/code/artica/code
RPMHOME=/usr/src/packages
VERSION=$(grep 'my $pandora_version =' $CODEHOME/pandora_server/lib/PandoraFMS/Config.pm | awk '{print substr($4, 2, length($4) - 3)}')
KEYGEN_VERSION=$(grep "%define version" $CODEHOME_ENT/updatemanager/keygen/pandora/pandora_keygen.spec | awk '{print $3}')
-echo "Creating source tarballs (/usr/src/rpm/SOURCES)"
-sudo rm -Rf /usr/src/rpm/SOURCES/pandorafms_*.tar.gz
+echo "Creating source tarballs in $RPMHOME/SOURCES"
+rm -Rf /usr/src/rpm/SOURCES/pandorafms_*.tar.gz
cd $CODEHOME/pandora_agents
-sudo tar zcvf $RPMHOME/SOURCES/pandorafms_agent-$VERSION.tar.gz --exclude \.svn --exclude nohup linux
-sudo tar zvcf $RPMHOME/SOURCES/pandorafms_agent_unix-$VERSION.tar.gz --exclude \.svn --exclude nohup --exclude NT4 unix
+tar zcvf $RPMHOME/SOURCES/pandorafms_agent-$VERSION.tar.gz --exclude \.svn --exclude nohup linux
+tar zvcf $RPMHOME/SOURCES/pandorafms_agent_unix-$VERSION.tar.gz --exclude \.svn --exclude nohup --exclude NT4 unix
cd $CODEHOME
-sudo tar zcvf $RPMHOME/SOURCES/pandorafms_server-$VERSION.tar.gz --exclude \.svn pandora_server
+tar zcvf $RPMHOME/SOURCES/pandorafms_server-$VERSION.tar.gz --exclude \.svn pandora_server
# Console OpenSource
cd $CODEHOME
-sudo tar zcvf $RPMHOME/SOURCES/pandorafms_console-$VERSION.tar.gz --exclude \.svn --exclude config.php --exclude enterprise pandora_console
+tar zcvf $RPMHOME/SOURCES/pandorafms_console-$VERSION.tar.gz --exclude \.svn --exclude config.php --exclude enterprise pandora_console
# Console Enterprise
cd $CODEHOME_ENT/pandora/trunk/pandora_console
-sudo tar zcvf $RPMHOME/SOURCES/pandorafms_console_enterprise-$VERSION.tar.gz --exclude \.svn enterprise/*
+tar zcvf $RPMHOME/SOURCES/pandorafms_console_enterprise-$VERSION.tar.gz --exclude \.svn enterprise/*
# Server OpenSource
cd $CODEHOME_ENT/pandora/trunk/pandora_server/
-sudo tar zcvf $RPMHOME/SOURCES/pandorafms_server_enterprise-$VERSION.tar.gz --exclude \.svn PandoraFMS-Enterprise
+tar zcvf $RPMHOME/SOURCES/pandorafms_server_enterprise-$VERSION.tar.gz --exclude \.svn PandoraFMS-Enterprise
# Updatemanager Client keygen
cd $CODEHOME_ENT/updatemanager/keygen
-sudo tar cvzf $RPMHOME/SOURCES/pandorafms_keygen-$KEYGEN_VERSION.tar.gz --exclude .svn --exclude keygen --exclude keygen.i386.static --exclude pandora_keygen.spec pandora
+tar cvzf $RPMHOME/SOURCES/pandorafms_keygen-$KEYGEN_VERSION.tar.gz --exclude .svn --exclude keygen --exclude keygen.i386.static --exclude pandora_keygen.spec pandora
diff --git a/extras/build_windows_agent.sh b/extras/build_windows_agent.sh
new file mode 100755
index 0000000000..5980fa6f86
--- /dev/null
+++ b/extras/build_windows_agent.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+CODEHOME=~/code/pandora/trunk
+RPMHOME=/usr/src/packages
+
+mkdir -p $RPMHOME/EXE
+
+echo "Creating Pandora FMS Agent Windows installer in $RPMHOME/EXE"
+rm -rf $CODEHOME/pandora_agents/win32/installer/output/*.exe
+cd $CODEHOME/pandora_agents/win32
+./build.sh
+cp $CODEHOME/pandora_agents/win32/installer/output/*.exe $RPMHOME/EXE/
+