From 61be942505a3eb6519c0316e92156fc705f3dc2d Mon Sep 17 00:00:00 2001 From: Christian Bayle Date: Fri, 11 Mar 2011 14:45:17 +0000 Subject: [PATCH] get selenium during build --- 3rd-party/Makefile.rh | 4 +++- 3rd-party/selenium/Makefile | 5 +++++ tests/scripts/fusionforge-build-and-test-deb.sh | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/3rd-party/Makefile.rh b/3rd-party/Makefile.rh index d40f3cf9d1..b5361d9f81 100644 --- a/3rd-party/Makefile.rh +++ b/3rd-party/Makefile.rh @@ -11,7 +11,7 @@ BUILDRESULT=~/fusionforge_repo HTMLPURIFIER_VERSION=4.2.0 WEBDAV_SERVER_VERSION=1.0.0RC5 -all: php-htmlpurifier php-jpgraph php-pear-HTTP_WebDAV_Server dist +all: php-htmlpurifier php-jpgraph php-pear-HTTP_WebDAV_Server dist getselenium rpmprep: -rm -Rf $(RPM_TMP)/* @@ -27,6 +27,8 @@ dist: cp $(RPM_TMP)/RPMS/noarch/*.rpm $(BUILDRESULT) createrepo $(BUILDRESULT) +getselenium: + cd selenium ; make getselenium # # Building RPM for external components # diff --git a/3rd-party/selenium/Makefile b/3rd-party/selenium/Makefile index 4dfd7a320a..fee9d65709 100644 --- a/3rd-party/selenium/Makefile +++ b/3rd-party/selenium/Makefile @@ -9,6 +9,11 @@ run: binary/selenium-server-1.0.3 cd binary/selenium-server-1.0.3 ; LANG=C java -jar selenium-server.jar -interactive +getselenium: binary/selenium-server-current/selenium-server.jar + +binary/selenium-server-current/selenium-server.jar: binary/selenium-server-1.0.3 + ln -s selenium-server-1.0.3 binary/selenium-server-current + binary/selenium-server-1.0.3: binary/selenium-remote-control-1.0.3.zip cd binary ; [ -d selenium-server-1.0.3 ] || unzip selenium-remote-control-1.0.3.zip diff --git a/tests/scripts/fusionforge-build-and-test-deb.sh b/tests/scripts/fusionforge-build-and-test-deb.sh index e3536743ef..bdd691768d 100755 --- a/tests/scripts/fusionforge-build-and-test-deb.sh +++ b/tests/scripts/fusionforge-build-and-test-deb.sh @@ -56,6 +56,7 @@ mkdir -p $WORKSPACE/reports/coverage make -f Makefile.debian BUILDRESULT=$WORKSPACE/build/packages LOCALREPODEB=$WORKSPACE/build/debian clean (cd 3rd-party/php-mail-mbox ; dpkg-source -x php-mail-mbox_0.6.3-1coclico1.dsc) (cd 3rd-party/php-mail-mbox ; make -f Makefile.debian BUILDRESULT=$WORKSPACE/build/packages LOCALREPODEB=$WORKSPACE/build/debian rsqueeze) +(cd 3rd-party/selenium ; make getselenium) make -f Makefile.debian BUILDRESULT=$WORKSPACE/build/packages LOCALREPODEB=$WORKSPACE/build/debian rsqueeze if $KEEPVM -- 2.30.2