[Pkg-owncloud-commits] [php-sabredav] 13/33: Added a few missing files, made sure the installer works correctly

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag version-1.0.10
in repository php-sabredav.

commit 4a87cf17cc33f8aca96fc122c7515c477846810a
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Mon Mar 1 18:02:46 2010 +0900

    Added a few missing files, made sure the installer works correctly
---
 bin/pearpackage2.php | 16 ++++++++++++----
 build.xml            |  4 ++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/bin/pearpackage2.php b/bin/pearpackage2.php
old mode 100644
new mode 100755
index 0cd468e..6a47f4b
--- a/bin/pearpackage2.php
+++ b/bin/pearpackage2.php
@@ -1,3 +1,4 @@
+#!/usr/bin/env php
 <?php
 
 include dirname(__FILE__) . '/../lib/Sabre/DAV/Version.php';
@@ -64,23 +65,25 @@ $rootDir = realpath(dirname(__FILE__) . '/../');
 $fileList  = parsePath($rootDir.'/lib','php','/^(.*)\.php$/');
 $fileList .= parsePath($rootDir.'/examples','doc');
 $fileList .= parsePath($rootDir.'/tests','test','/^(.*)\.(php|xml)$/');
-$fileList .= parsePath($rootDir.'/bin','script','/^(.*)\.py$/');
+$fileList .= parsePath($rootDir.'/bin','script','/^naturalselection\.py$/');
+$fileList .= parsePath($rootDir.'/ChangeLog','doc');
+$fileList .= parsePath($rootDir.'/LICENSE','doc');
 
 // Lastly the install-list
 $directory = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($rootDir.'/lib'));
 
 $installList = '';
 foreach($directory as $path) {
-
     $basePath = trim(substr($path,strlen($rootDir)),'/');
 
     // This just takes the 'lib/' off every path name, so it will be installed in the correct location
     $installList .= '        <install name="' . $basePath . '" as="' . substr($basePath,4) . "\" />\n";
 
 }
+$installList .= '        <install name="bin/naturalselection.py" as="naturalselection" />';
 
 
-echo <<<XML
+$package = <<<XML
 <?xml version="1.0"?>
 <package version="2.0" 
     xmlns="http://pear.php.net/dtd/package-2.0"> 
@@ -114,7 +117,7 @@ echo <<<XML
     <dependencies>
       <required>
         <php><min>{$minPHPVersion}</min></php>
-        <pearinstaller><min>1.8</min></pearinstaller>
+        <pearinstaller><min>1.4</min></pearinstaller>
       </required>
     </dependencies>
     <phprelease>
@@ -125,3 +128,8 @@ echo <<<XML
 </package>
 XML;
   
+if (isset($argv) && in_array('make',$argv)) {
+    file_put_contents('package.xml',$package);
+} else {
+    echo $package;
+}
diff --git a/build.xml b/build.xml
index 8aa36be..d5d854e 100644
--- a/build.xml
+++ b/build.xml
@@ -2,10 +2,10 @@
 <project name="SabreDAV" default="build" basedir=".">
 
     <target name="build" depends="init,test">
-        <exec command="bin/pearpackage.php make pearfarm" checkreturn="true" />
+        <exec command="bin/pearpackage2.php make pearfarm" checkreturn="true" />
         <exec command="pear package" passthru="1" />
         <move file="Sabre_DAV-${sabredav.version}.tgz" tofile="Sabre_DAV-${sabredav.version}_PEARFARM.tgz" />
-        <exec command="bin/pearpackage.php make" checkreturn="true" />
+        <exec command="bin/pearpackage2.php make" checkreturn="true" />
         <exec command="pear package" passthru="1" />
     </target>
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git