Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Marc Alexander
2015-06-15 23:17:06 +02:00
parent f64825e730 ba921a8eae
commit 72f6db8577
5 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
build.xml
View File

@@ -53,6 +53,7 @@
-->
<target name="clean">
<delete dir="${build-directory}" />
<mkdir dir="${build-directory}" />
</target>
<target name="composer">
@@ -62,9 +63,8 @@
</target>
<target name="prepare-tests" depends="clean,composer">
<exec command="if [ -d '${build-directory}/../../../../../' ]; then echo 'true'; else echo 'false'; fi;" outputProperty="output.IS_DIRECTORY_EXISTS" />
<if>
<equals arg1="${output.IS_DIRECTORY_EXISTS}" arg2="true" />
<available property="phpbb-is-available" file="${phpbb-root}/phpBB/vendor/bin/phpunit" type="file" />
<then>
<echo msg="phpBB is already set up." />
</then>
@@ -72,7 +72,7 @@
<!-- Move Board3 Portal and set up phpBB -->
<exec command="CURRENT_BUILD_REV=$(git rev-parse --abbrev-ref HEAD)" passthru="true" />
<exec command="echo $GIT_BRANCH" passthru="true" />
<exec command="git clone https://github.com/phpbb/phpbb.git phpbb" passthru="true" />
<exec command="git clone -v --progress https://github.com/phpbb/phpbb.git phpbb" passthru="true" />
<exec dir="${build-directory}/../phpbb/phpBB" command="php ../composer.phar install" passthru="true" />
<mkdir dir="phpbb/phpBB/ext/board3" />
<exec dir="${build-directory}/../phpbb/phpBB/ext/board3" command="git clone https://github.com/board3/Board3-Portal.git portal" passthru="true" />
@@ -88,6 +88,27 @@
<exec dir="${build-directory}/../phpbb" command="chmod 777 phpBB/images/avatars/upload" passthru="true" />
</else>
</if>
<if>
<equals arg1="$JENKINS_URL" arg2="" />
<then>
<echo msg="JENKINS_URL is not set" />
</then>
<else>
<exec dir="${build-directory}/../phpbb/phpBB/ext/board3/portal" command="wget https://phar.phpunit.de/phploc.phar" passthru="true" />
<if>
<available property="logs-dir-available" file="${build-directory}/logs" type="dir" />
<then>
<echo msg="Logs dir already set up." />
</then>
<else>
<mkdir dir="${build-directory}/logs" />
<exec dir="${build-directory}/logs" command="touch phploc.csv" />
</else>
</if>
<exec dir="${build-directory}/../phpbb/phpBB/ext/board3" command="php portal/phploc.phar --exclude=portal/vendor,portal/language,portal/styles,portal/tests,portal/travis --log-csv ../../../../build/logs/phploc.csv --progress portal/" passthru="true" />
<exec dir="${build-directory}/../phpbb/phpBB/ext/board3/portal" command="rm phploc.phar" passthru="true" />
</else>
</if>
</target>
<target name="test" depends="clean,composer,prepare-tests">

10
composer.lock generated
View File

@@ -1,22 +1,22 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "b5a11feb74a85a9825b7b83aaaf8fa0e",
"hash": "c994b2b8ddc0cceee41f2d5c294b6677",
"packages": [
{
"name": "nickvergessen/phpbb-tool-trimmessage",
"version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/nickvergessen/phpbb-tool-trimmessage.git",
"url": "https://github.com/nickv-phpbb/phpbb-tool-trimmessage.git",
"reference": "0ed883bc2d473ec2e84cabb9c9395785daeeebcf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nickvergessen/phpbb-tool-trimmessage/zipball/0ed883bc2d473ec2e84cabb9c9395785daeeebcf",
"url": "https://api.github.com/repos/nickv-phpbb/phpbb-tool-trimmessage/zipball/0ed883bc2d473ec2e84cabb9c9395785daeeebcf",
"reference": "0ed883bc2d473ec2e84cabb9c9395785daeeebcf",
"shasum": ""
},
@@ -157,7 +157,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpbb/epv/zipball/75df9936ffbb8f05a1351cf622cf6f41c7d2d9f2",
"url": "https://api.github.com/repos/phpbb/epv/zipball/d837a835dfdfdac233854d9e50d58565542764cb",
"reference": "75df9936ffbb8f05a1351cf622cf6f41c7d2d9f2",
"shasum": ""
},

BIN
composer.phar
View File

Binary file not shown.

4
styles/prosilver/template/portal/modules/clock_side.html
View File

@@ -33,9 +33,9 @@
<!-- ELSE -->
<div style="text-align: center;">
<br />
<object type="application/x-shockwave-flash" data="{T_THEME_PATH}/images/portal/{B3P_CLOCK_SRC}" width="140">
<object type="application/x-shockwave-flash" data="{T_EXT_THEME_PATH}/images/portal/{B3P_CLOCK_SRC}" width="140" height="140">
<param name="wmode" value="transparent" />
<param name="movie" value="{T_THEME_PATH}/images/portal/{B3P_CLOCK_SRC}" />
<param name="movie" value="{T_EXT_THEME_PATH}/images/portal/{B3P_CLOCK_SRC}" />
</object>
</div>
<!-- ENDIF -->

4
styles/subsilver2/template/portal/modules/clock_side.html
View File

@@ -33,9 +33,9 @@
<!-- ELSE -->
<td style="text-align:center;">
<br />
<object type="application/x-shockwave-flash" data="{T_THEME_PATH}/images/portal/{B3P_CLOCK_SRC}" width="140">
<object type="application/x-shockwave-flash" data="{T_EXT_THEME_PATH}/images/portal/{B3P_CLOCK_SRC}" width="140" height="140">
<param name="wmode" value="transparent" />
<param name="movie" value="{T_THEME_PATH}/images/portal/{B3P_CLOCK_SRC}" />
<param name="movie" value="{T_EXT_THEME_PATH}/images/portal/{B3P_CLOCK_SRC}" />
</object>
</td>
<!-- ENDIF -->