[Fusionforge-commits] FusionForge branch master updated. b1d74de3792f9650b599bd978ac900958128afbf

Olivier Berger olberger at fusionforge.org
Wed Apr 30 09:31:00 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, master has been updated
       via  b1d74de3792f9650b599bd978ac900958128afbf (commit)
       via  9db9ec3d420a88ab10e372f850a2f34fd059ea28 (commit)
      from  efdbe76fb4f75236a75c6d0981e37e631bcca3a6 (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 b1d74de3792f9650b599bd978ac900958128afbf
Author: Olivier Berger <olivier.berger at telecom-sudparis.eu>
Date:   Wed Apr 30 09:29:35 2014 +0200

    Don't build selenium with heavy machinery (cowbuilder + reprepro)
    
    Squashed commit of the following:
    
    commit 29601ecf4ae719cce80fa5606e237a863db59ded
    Author: Olivier Berger <olivier.berger at telecom-sudparis.eu>
    Date:   Wed Apr 30 09:25:52 2014 +0200
    
        Only rebuild selenium if it isn't installed already
    
    commit 6f8d8c98c74263148544768dff5fea4af84dd1af
    Author: Olivier Berger <olivier.berger at telecom-sudparis.eu>
    Date:   Tue Apr 29 19:00:10 2014 +0200
    
        Get rid of cowbuilder and reprepro to just build a package in the
        3rd-party subdir
    
    commit 6b3f32ef7d9161a5b036807f051184d6b1471162
    Author: Olivier Berger <olivier.berger at telecom-sudparis.eu>
    Date:   Tue Apr 29 18:56:04 2014 +0200
    
        Instead of an external Makefile, use the "classical" get-orig-source
        Debian way

diff --git a/3rd-party/selenium/selenium/debian/README.Debian b/3rd-party/selenium/selenium/debian/README.Debian
index 036bc2e..3bb3168 100644
--- a/3rd-party/selenium/selenium/debian/README.Debian
+++ b/3rd-party/selenium/selenium/debian/README.Debian
@@ -1,6 +1,7 @@
-selenium for Debian
--------------------
+Unofficial packaging of selenium for Debian
+-------------------------------------------
 
-<possible notes regarding this package - if none, delete this file>
+This is a quick and dirty packaging, to install selenium, until
+someone has done a proper package (see RFP #626545).
 
- -- Christian Bayle <bayle at debian.org>  Tue, 02 Oct 2012 00:41:34 +0200
+ -- Olivier Berger <obergix at debian.org>, Tue, 29 Apr 2014 17:17:26 +0200
diff --git a/3rd-party/selenium/selenium/debian/README.source b/3rd-party/selenium/selenium/debian/README.source
index bb21aaf..9dfe2dc 100644
--- a/3rd-party/selenium/selenium/debian/README.source
+++ b/3rd-party/selenium/selenium/debian/README.source
@@ -1,9 +1,10 @@
-selenium for Debian
--------------------
-
-<this file describes information about the source package, see Debian policy
-manual section 4.14. You WILL either need to modify or delete this file>
-
+Unofficial packaging of selenium for Debian
+-------------------------------------------
 
+The package is very basic and just contains a copy of the upstream jar.
 
+To regenerate the .orig tarball, use 'debian/rules get-orig-source' to
+download the upstream standalone distribution (see debian/rules for
+more details).
 
+ -- Olivier Berger <obergix at debian.org>, Tue, 29 Apr 2014 18:54:13 +0200
diff --git a/3rd-party/selenium/selenium/debian/rules b/3rd-party/selenium/selenium/debian/rules
index b760bee..c4bebc5 100755
--- a/3rd-party/selenium/selenium/debian/rules
+++ b/3rd-party/selenium/selenium/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
+# debian/rules that uses debhelper.
 # This file was originally written by Joey Hess and Craig Small.
 # As a special exception, when this file is copied by dh-make into a
 # dh-make output file, you may use that output file without restriction.
@@ -9,5 +9,15 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# Elements for regeneration of the orig tarball using the get-orig-source target
+PKD  = $(abspath $(dir $(MAKEFILE_LIST)))/
+PKG  = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
+VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
+
+.PHONY: get-orig-source
+get-orig-source:  $(info I: $(PKG)_$(VER))
+	@echo "# Downloading..."
+	[ -f $(PKD)../../selenium_$(VER).orig.tar.gz ] || (cd $(PKD)/../../ ; wget -O - http://selenium.googlecode.com/files/selenium-server-standalone-$(VER).jar > selenium/selenium-server.jar ; tar cvzf selenium_$(VER).orig.tar.gz selenium/selenium-server.jar)
+
 %:
 	dh $@ 
diff --git a/vm/scripts/run-testsuite.sh b/vm/scripts/run-testsuite.sh
index 1b64f7e..4093de8 100755
--- a/vm/scripts/run-testsuite.sh
+++ b/vm/scripts/run-testsuite.sh
@@ -1,19 +1,17 @@
 #!/bin/bash
 
-# Selenium dependencies
-aptitude -y install default-jre iceweasel
-
-# Build selenium
-aptitude -y install cowbuilder
-mkdir -p ~/builder/cow/
-DISTROLIST=wheezy /usr/src/fusionforge/tests/scripts/manage-cowbuilder.sh
-
-mkdir -p /usr/src/build/debian/conf/
-aptitude -y install reprepro
-echo -e "Codename: wheezy\nArchitectures: amd64 source\nComponents: main" > /usr/src/build/debian/conf/distributions
-cd /usr/src/fusionforge/3rd-party/selenium
-make
-dpkg -i /usr/src/build/debian/pool/main/s/selenium/selenium_*_all.deb
+
+# Build an unofficial package for selenium and install it
+if ! dpkg -l selenium | grep -q ^ii ; then
+    cd /usr/src/fusionforge/3rd-party/selenium/selenium
+    debian/rules get-orig-source
+    debuild --no-lintian --no-tgz-check -us -uc
+    dpkg -i /usr/src/fusionforge/3rd-party/selenium/selenium_*_all.deb
+
+    # Selenium dependencies
+    aptitude -y install default-jre iceweasel
+
+fi
 
 
 # Test dependencies

commit 9db9ec3d420a88ab10e372f850a2f34fd059ea28
Author: Olivier Berger <olivier.berger at telecom-sudparis.eu>
Date:   Tue Apr 29 19:23:56 2014 +0200

    More comments on what happens in the VM scripts

diff --git a/vm/scripts/build.sh b/vm/scripts/build.sh
index 3d6cecd..ce9e11f 100755
--- a/vm/scripts/build.sh
+++ b/vm/scripts/build.sh
@@ -16,12 +16,12 @@
 #set -x
 
 
-# Build dependencies
+# Install build dependencies
 aptitude -y install mini-dinstall dput devscripts equivs
 mk-build-deps -i /usr/src/fusionforge/src/debian/control -t 'apt-get -y' -r
 
 
-# Populate the repo
+# Populate a local Debian packages repository for APT managed with mini-dinstall
 #rm -rf /usr/src/debian-repository
 mkdir -p /usr/src/debian-repository
 
@@ -67,7 +67,7 @@ apt-key add /usr/src/debian-repository/key.asc
 
 mini-dinstall -b
 
-
+# Configure debian package building tools so as to use the local repo
 if [ ! -f /root/.dput.cf ]; then
     cat > /root/.dput.cf <<EOF
 [local]
@@ -88,7 +88,7 @@ DEBUILD_DPKG_BUILDPACKAGE_OPTS=-i
 EOF
 fi
 
-
+# Finally, build the FusionForge packages
 cd /usr/src/fusionforge/src
 f=$(mktemp)
 cp debian/changelog $f
@@ -105,8 +105,10 @@ fi
 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
 
+# Install built packages into the local repo
 debrelease -f local
 mv $f debian/changelog
 
+# Declare the repo so that packages become installable
 echo 'deb file:///usr/src/debian-repository local/' > /etc/apt/sources.list.d/local.list
 apt-get update
diff --git a/vm/scripts/install.sh b/vm/scripts/install.sh
index 6f9703c..34cabef 100755
--- a/vm/scripts/install.sh
+++ b/vm/scripts/install.sh
@@ -14,15 +14,20 @@
 #set -x
 set -e
 
+# Optional argument '-minimal' for fusionforge-minimal install instead of fusionforge-full
 variant=${1:-full}
 
-# "Backport" recent dependency
+# fusionforge-plugin-scmbzr depends on loggerhead (>= 1.19~bzr477~),
+# but wheezy only has 1.19~bzr461-1, so we need to manually "Backport"
+# a more recent dependency
 if ! dpkg -l loggerhead | grep -q ^ii ; then
     wget -c http://snapshot.debian.org/archive/debian/20121107T152130Z/pool/main/l/loggerhead/loggerhead_1.19%7Ebzr477-1_all.deb
     aptitude install gdebi-core
+    # FIXME : why not dpkg -i ? ... fix or explain...
     gdebi --non-interactive loggerhead_1.19~bzr477-1_all.deb
 fi
 
+# Install FusionForge packages (by default, the fusionforge-full meta-package and all dependencies
 aptitude update
 if dpkg -l fusionforge-$variant | grep -q ^ii ; then
     # Already installed, upgrading
@@ -30,6 +35,8 @@ if dpkg -l fusionforge-$variant | grep -q ^ii ; then
 else
     # Initial installation
     UCF_FORCE_CONFFNEW=yes LANG=C DEBIAN_FRONTEND=noninteractive aptitude -y install fusionforge-$variant
+
+    # Initial configuration
     /usr/share/gforge/bin/forge_set_password admin myadmin
     a2dissite default
     invoke-rc.d apache2 restart
diff --git a/vm/scripts/update.sh b/vm/scripts/update.sh
index dbd8bd2..e0a6fdb 100755
--- a/vm/scripts/update.sh
+++ b/vm/scripts/update.sh
@@ -13,6 +13,7 @@ aptitude -y dist-upgrade
 
 set -e
 
+# Then update the checked-out sources of FusionForge
 cd /usr/src/fusionforge/
 # If using bzr, or git, update accordingly
 if [ -d .bzr/ ] ; then

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

Summary of changes:
 3rd-party/selenium/selenium/debian/README.Debian |    9 ++++----
 3rd-party/selenium/selenium/debian/README.source |   13 ++++++-----
 3rd-party/selenium/selenium/debian/rules         |   12 +++++++++-
 vm/scripts/build.sh                              |   10 +++++----
 vm/scripts/install.sh                            |    9 +++++++-
 vm/scripts/run-testsuite.sh                      |   26 ++++++++++------------
 vm/scripts/update.sh                             |    1 +
 7 files changed, 50 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list