http://www.mediawiki.org/wiki/Special:Code/MediaWiki/99756
Revision: 99756
Author: wikinaut
Date: 2011-10-14 07:23:02 +0000 (Fri, 14 Oct 2011)
Log Message:
-----------
Makefile changed. 0.944 improved the Makefile by adding a test if patch
(program) exists. Some users reported that patch program is installed by
default in all Linux distributions like Ubuntu
Modified Paths:
--------------
trunk/extensions/OpenID/Makefile
trunk/extensions/OpenID/OpenID.php
trunk/extensions/OpenID/README.OpenID-mediawiki-extension
Modified: trunk/extensions/OpenID/Makefile
===================================================================
--- trunk/extensions/OpenID/Makefile 2011-10-14 06:53:00 UTC (rev 99755)
+++ trunk/extensions/OpenID/Makefile 2011-10-14 07:23:02 UTC (rev 99756)
@@ -1,31 +1,65 @@
VER=2.2.2
SUBDIR=openid-php-openid-782224d
+SHELL = /bin/sh
+
# how to make that one predictable easily?
# http://www.mediawiki.org/wiki/Extension:OpenID
#
# This makefile automates the installation of a prerequisite for the MediaWiki
OpenID extension.
#
-# First download the extension which includes this makefile from
-# http://www.mediawiki.org/wiki/Special:ExtensionDistributor/OpenID
+# MediaWiki OpenID extensions depends on the
+# OpenIDEnabled.com PHP library for OpenID which in turn depends on the
+# OpenIDEnabled.com PHP library for YADIS.
#
-# MediaWiki OpenID depends on the OpenIDEnabled.com PHP library for OpenID,
-# which in turn depends on the OpenIDEnabled.com PHP library for YADIS.
+# STEP 1:
+# Get the extension by method (a) or (b) or (c).
#
-# Installation:
+# (a) First download the MediaWiki OpenID extension which includes this
makefile from
+# http://www.mediawiki.org/wiki/Special:ExtensionDistributor/OpenID
#
-# cd $IP/extensions/OpenID
-# make
+# or by checking out from SVN as explained in (b) or (c)
#
+# (b) anonymous users checkout using this command:
+# cd $IP/extensions
+# svn checkout
svn://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/OpenID OpenID
+#
+# (c) developers however checkout using this command:
+# cd $IP/extensions
+# svn checkout
svn+ssh://[email protected]/svnroot/mediawiki/trunk/extensions/OpenID
OpenID
+#
+# STEP 2
# The makefile downloads the openid-php library from
http://www.openidenabled.com/php-openid/
# and applies a patch to avoid PHP errors because Call-time pass-by-reference
is deprecated
# since PHP 5.3.x see https://github.com/openid/php-openid/issues#issue/8 and
# the patch and fork of user kost
https://github.com/openid/php-openid/pull/44/files
#
-# T. Gries 20110203
+# Go to the extensions/OpenID subdirectors and start the installation
+# which also downloads and patches the pre-requisites:
+#
+# cd $IP/extensions/OpenID
+# make
+#
+# initially written by Brion Vibber
+# 20110203 T. Gries
+# 20111014 added a test whether "patch" (program) exists before starting it
blindly
-php-openid: Auth
+install: check-if-patch-exists Auth
+# test if "patch" program is installed
+# some distributions don't have it installed by default
+# alternative rule: patch-exists: ; patch --version >/dev/null
+# http://www.gnu.org/s/hello/manual/make/Standard-Targets.html
+
+check-if-patch-exists:
+ @if $(SHELL) -c 'which patch' >/dev/null 2>&1; then \
+ # echo "...The 'patch' program exists." ; \
+ true; \
+ else \
+ echo "...The 'patch' program does not exist on your system.
Please install it before running make."; \
+ false; \
+ fi
+
Auth: php-openid-$(VER).tar.gz
tar -xzf php-openid-$(VER).tar.gz $(SUBDIR)/Auth
rm -f php-openid-$(VER).tar.gz
Modified: trunk/extensions/OpenID/OpenID.php
===================================================================
--- trunk/extensions/OpenID/OpenID.php 2011-10-14 06:53:00 UTC (rev 99755)
+++ trunk/extensions/OpenID/OpenID.php 2011-10-14 07:23:02 UTC (rev 99756)
@@ -27,7 +27,7 @@
exit( 1 );
}
-define( 'MEDIAWIKI_OPENID_VERSION', '0.943-beta 20111013' );
+define( 'MEDIAWIKI_OPENID_VERSION', '0.944-beta 20111014' );
$path = dirname( __FILE__ );
set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR .
get_include_path() );
Modified: trunk/extensions/OpenID/README.OpenID-mediawiki-extension
===================================================================
--- trunk/extensions/OpenID/README.OpenID-mediawiki-extension 2011-10-14
06:53:00 UTC (rev 99755)
+++ trunk/extensions/OpenID/README.OpenID-mediawiki-extension 2011-10-14
07:23:02 UTC (rev 99756)
@@ -1,5 +1,5 @@
MediaWiki OpenID extension README.OpenID-mediawiki-extension file
-version 0.941-beta 20111011
+version 0.944-beta 20111014
Homepage and manual http://www.mediawiki.org/wiki/Extension:OpenID
@@ -467,6 +467,8 @@
into that account now
== CHANGES ==
+* 0.944 improved the Makefile by adding a test if "patch" (program) exists
+ some users reported that this is not standard in all distrubtions
* 0.942 code cosmetic db schema updater
* 0.940 changed database schema updater; tested for MySQL
* 0.939 function name changes
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
