[Fusionforge-commits] FusionForge branch GUM updated. fdffbd2e7b03c5dba4bd606973fa5f41a43dc812

Sylvain Beucler beuc-inria at fusionforge.org
Fri Aug 22 09:52:03 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, GUM has been updated
       via  fdffbd2e7b03c5dba4bd606973fa5f41a43dc812 (commit)
      from  583456fac1d2b1af7f02682ec94d9a6169aae212 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fdffbd2e7b03c5dba4bd606973fa5f41a43dc812
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Aug 22 09:38:55 2014 +0200

    install: move vm/scripts/ to tests/ and initiate rpm variant

diff --git a/vm/scripts/build.sh b/tests/scripts/deb/build.sh
similarity index 93%
rename from vm/scripts/build.sh
rename to tests/scripts/deb/build.sh
index 6d58cf7..a238a1a 100755
--- a/vm/scripts/build.sh
+++ b/tests/scripts/deb/build.sh
@@ -102,9 +102,10 @@ if [ $? -eq 0 ]; then
     echo "WARNING: It is likely that the mounted /tmp could be too short. If you experience a build error bellow, Try make some room on the FS and reboot, first."
 fi
 
-debian/rules debian/control  # re-gen debian/control from packaging/*
+debian/rules debian/control  # re-gen debian/control
 dch --newversion $(dpkg-parsechangelog | sed -n 's/^Version: \([0-9.]\+\(\~rc[0-9]\)\?\).*/\1/p')+$(date +%Y%m%d%H%M)-1 --distribution local --force-distribution "Autobuilt."
-debuild --no-lintian --no-tgz-check -us -uc -tc  # using -tc so 'bzr st' is readable
+#debuild --no-lintian --no-tgz-check -us -uc -tc  # using -tc so 'bzr st' is readable
+make dist && \mv fusionforge-5.3.50.tar.bz2 ../fusionforge_5.3.50.orig.tar.bz2 && debuild
 
 # Install built packages into the local repo
 debrelease -f local
diff --git a/vm/scripts/install-gui.sh b/tests/scripts/deb/install-gui.sh
similarity index 100%
rename from vm/scripts/install-gui.sh
rename to tests/scripts/deb/install-gui.sh
diff --git a/vm/scripts/install.sh b/tests/scripts/deb/install.sh
similarity index 100%
rename from vm/scripts/install.sh
rename to tests/scripts/deb/install.sh
diff --git a/vm/scripts/mini-dinstall-sign.sh b/tests/scripts/deb/mini-dinstall-sign.sh
similarity index 100%
rename from vm/scripts/mini-dinstall-sign.sh
rename to tests/scripts/deb/mini-dinstall-sign.sh
diff --git a/vm/scripts/run-testsuite.sh b/tests/scripts/deb/run-testsuite.sh
similarity index 100%
rename from vm/scripts/run-testsuite.sh
rename to tests/scripts/deb/run-testsuite.sh
diff --git a/vm/scripts/uninstall.sh b/tests/scripts/deb/uninstall.sh
similarity index 100%
rename from vm/scripts/uninstall.sh
rename to tests/scripts/deb/uninstall.sh
diff --git a/vm/scripts/update.sh b/tests/scripts/deb/update.sh
similarity index 100%
rename from vm/scripts/update.sh
rename to tests/scripts/deb/update.sh
diff --git a/tests/scripts/rpm/build.sh b/tests/scripts/rpm/build.sh
new file mode 100755
index 0000000..355c080
--- /dev/null
+++ b/tests/scripts/rpm/build.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# Build .rpm packages
+
+# Install build dependencies
+yum install -y gettext tar bzip2 rpm-build  createrepo
+
+# Build package
+cd /usr/src/fusionforge/src/
+mkdir -p ../build/SOURCES/
+TAR_PREFIX=fusionforge-$(make version)
+make dist && mv $TAR_PREFIX.tar.bz2 ..
+ln -nfs ../../$TAR_PREFIX.tar.bz2 ../build/SOURCES/
+chown -h root: ../build/SOURCES/$TAR_PREFIX.tar.bz2
+chown root: ../$TAR_PREFIX.tar.bz2 # srpm
+#chown root: fusionforge.spec
+cp fusionforge.spec ../build/SPECS/ && rpmbuild ../build/SPECS/fusionforge.spec --define "_topdir $(pwd)/../build" -ba
+
+(cd ../build/RPMS/ && createrepo .)
+cat <<EOF > /etc/yum.repos.d/local.repo
+[local]
+name=local
+baseurl=file:///usr/src/fusionforge/build/RPMS/
+enabled=1
+gpgcheck=0
+EOF
diff --git a/tests/scripts/rpm/install.sh b/tests/scripts/rpm/install.sh
new file mode 100755
index 0000000..14f23b0
--- /dev/null
+++ b/tests/scripts/rpm/install.sh
@@ -0,0 +1,27 @@
+# postgresql-server
+# php-cli php-pgsql
+# httpd php
+# nscd  # no unscd T-T
+
+# get_news_notapproved.pl:
+# perl perl-DBI perl-Text-Autoformat perl-Mail-Sendmail
+
+# htmlpurifier  # pear
+#   pear channel-discover htmlpurifier.org
+#   pear install hp/HTMLPurifier
+#   Note: htmlpurifier requires in -common: group->forum->textsanitizer->htmlpurifier
+# arc           # vendor/
+# graphite      # vendor/
+# php-pear-CAS  # epel
+# php-simplepie # epel or common/rss/simplepie.inc
+
+# EPEL6
+# rpm -ivh http://mirror.ibcp.fr/pub/epel/6/i386/epel-release-6-8.noarch.rpm
+
+# moin: no available package for RHEL; though 'moin' is available in Fedora
+# libnss-pgsql: id., plus http://yum.postgresql.org/8.4/redhat/rhel-5-x86_64/
+
+# mediawiki (provided by mediawiki119): EPEL
+
+
+yum install fusionforge-common fusionforge-db fusionforge-plugin-mediawiki fusionforge-web fusionforge-shell
diff --git a/tests/scripts/rpm/uninstall.sh b/tests/scripts/rpm/uninstall.sh
new file mode 100755
index 0000000..b851753
--- /dev/null
+++ b/tests/scripts/rpm/uninstall.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Aggressive desinstall for testing a clean re-install
+yum remove -y 'fusionforge*'
+rm -rf /var/lib/pgsql/ /usr/share/fusionforge/ /etc/fusionforge/ /var/lib/fusionforge/
diff --git a/vm/packer/file/bashrc b/vm/packer/file/bashrc-deb
similarity index 100%
rename from vm/packer/file/bashrc
rename to vm/packer/file/bashrc-deb
diff --git a/vm/packer/file/bashrc-rpm b/vm/packer/file/bashrc-rpm
new file mode 100644
index 0000000..0770dcd
--- /dev/null
+++ b/vm/packer/file/bashrc-rpm
@@ -0,0 +1,14 @@
+# .bashrc
+
+# User specific aliases and functions
+
+alias rm='rm -i'
+alias cp='cp -i'
+alias mv='mv -i'
+
+# Source global definitions
+if [ -f /etc/bashrc ]; then
+	. /etc/bashrc
+fi
+
+PS1='DEV:[\u@\h \W]\$'
\ No newline at end of file
diff --git a/vm/packer/fusionforge-dev-centos.json b/vm/packer/fusionforge-dev-centos.json
index 68fda8b..4351910 100644
--- a/vm/packer/fusionforge-dev-centos.json
+++ b/vm/packer/fusionforge-dev-centos.json
@@ -2,7 +2,7 @@
   "provisioners": [
     {
       "type": "file",
-      "source": "file/bashrc",
+      "source": "file/bashrc-rpm",
       "destination": "/root/.bashrc"
     },
     {
diff --git a/vm/packer/fusionforge-dev-debian.json b/vm/packer/fusionforge-dev-debian.json
index aa34f39..9baa10a 100644
--- a/vm/packer/fusionforge-dev-debian.json
+++ b/vm/packer/fusionforge-dev-debian.json
@@ -7,7 +7,7 @@
 		},
 		{
 			"type": "file",
-			"source": "file/bashrc",
+			"source": "file/bashrc-deb",
 			"destination": "/root/.bashrc"
 		},
 		{

-----------------------------------------------------------------------

Summary of changes:
 {vm/scripts => tests/scripts/deb}/build.sh         |    5 ++--
 {vm/scripts => tests/scripts/deb}/install-gui.sh   |    0
 {vm/scripts => tests/scripts/deb}/install.sh       |    0
 .../scripts/deb}/mini-dinstall-sign.sh             |    0
 {vm/scripts => tests/scripts/deb}/run-testsuite.sh |    0
 {vm/scripts => tests/scripts/deb}/uninstall.sh     |    0
 {vm/scripts => tests/scripts/deb}/update.sh        |    0
 tests/scripts/rpm/build.sh                         |   26 +++++++++++++++++++
 tests/scripts/rpm/install.sh                       |   27 ++++++++++++++++++++
 tests/scripts/rpm/uninstall.sh                     |    4 +++
 vm/packer/file/{bashrc => bashrc-deb}              |    0
 vm/packer/file/bashrc-rpm                          |   14 ++++++++++
 vm/packer/fusionforge-dev-centos.json              |    2 +-
 vm/packer/fusionforge-dev-debian.json              |    2 +-
 14 files changed, 76 insertions(+), 4 deletions(-)
 rename {vm/scripts => tests/scripts/deb}/build.sh (93%)
 rename {vm/scripts => tests/scripts/deb}/install-gui.sh (100%)
 rename {vm/scripts => tests/scripts/deb}/install.sh (100%)
 rename {vm/scripts => tests/scripts/deb}/mini-dinstall-sign.sh (100%)
 rename {vm/scripts => tests/scripts/deb}/run-testsuite.sh (100%)
 rename {vm/scripts => tests/scripts/deb}/uninstall.sh (100%)
 rename {vm/scripts => tests/scripts/deb}/update.sh (100%)
 create mode 100755 tests/scripts/rpm/build.sh
 create mode 100755 tests/scripts/rpm/install.sh
 create mode 100755 tests/scripts/rpm/uninstall.sh
 rename vm/packer/file/{bashrc => bashrc-deb} (100%)
 create mode 100644 vm/packer/file/bashrc-rpm


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list