Skip to content
Browse files

Update package file generators with new layout and commit generated t…

…he package files.

git-svn-id: http://svn.php.net/repository/pear/packages/PEAR_PackageFileManager/trunk@322110 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information...
1 parent d329d89 commit 37f2a7e83320e06ede1ceea3727c754d77d8408f Daniel Convissor committed Jan 12, 2012
Showing with 60 additions and 53 deletions.
  1. +2 −1 package.php
  2. +9 −7 package.xml
  3. +5 −4 package_PFM1.php
  4. +18 −16 package_PFM1.xml
  5. +2 −1 package_plugins.php
  6. +24 −24 package_plugins.xml
View
3 package.php
@@ -63,7 +63,8 @@
$p->setPearinstallerDep('1.8.0');
$p->addPackageDepWithChannel('required', 'PEAR_PackageFileManager_Plugins', 'pear.php.net');
$p->addPackageDepWithChannel('optional', 'PHP_CompatInfo', 'pear.php.net', '1.4.0');
-$p->addReplacement('PackageFileManager2.php', 'package-info', '@PEAR-VER@', 'version');
+$p->addReplacement('PEAR/PackageFileManager2.php', 'package-info', '@PEAR-VER@', 'version');
+$p->addReplacement('tests/setup.php.inc', 'pear-config', '@php_dir@', 'php_dir');
$p->generateContents();
if (isset($_GET['make']) || (isset($_SERVER['argv']) && @$_SERVER['argv'][1] == 'make')) {
View
16 package.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.10.0beta1" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
+<package packagerversion="1.9.4" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
<name>PEAR_PackageFileManager2</name>
<channel>pear.php.net</channel>
<summary>PEAR_PackageFileManager2 takes an existing v2 package.xml file and updates it with a new filelist and changelog</summary>
@@ -51,8 +51,8 @@ Features include
<email>arnaud@limbourg.com</email>
<active>no</active>
</developer>
- <date>2011-03-28</date>
- <time>04:01:57</time>
+ <date>2012-01-11</date>
+ <time>21:33:23</time>
<version>
<release>1.0.2</release>
<api>1.0.0</api>
@@ -77,6 +77,11 @@ Features include
<file name="makepackage.php" role="doc" />
<file name="updatepackage.php" role="doc" />
</dir> <!-- /examples -->
+ <dir name="PEAR">
+ <file name="PackageFileManager2.php" role="php">
+ <tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
+ </file>
+ </dir> <!-- /PEAR -->
<dir name="tests">
<dir name="PEAR_PackageFileManager2">
<dir name="addIgnore">
@@ -146,9 +151,6 @@ Features include
</file>
</dir> <!-- /tests -->
<file name="LICENSE" role="doc" />
- <file name="PackageFileManager2.php" role="php">
- <tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
- </file>
</dir> <!-- / -->
</contents>
<dependencies>
@@ -183,7 +185,7 @@ Features include
<release>stable</release>
<api>stable</api>
</stability>
- <date>2011-03-28</date>
+ <date>2012-01-11</date>
<license uri="http://www.opensource.org/licenses/bsd-license.php">New BSD License</license>
<notes>
* Fixed Bug #16406: addReplacement does not look for files in packagedirectory [patch by Sune Jensen, dufuz]
View
9 package_PFM1.php
@@ -72,10 +72,11 @@
$p->addSubpackageDepWithChannel('required', 'PEAR_PackageFileManager_Plugins', 'pear.php.net');
$p->addSubpackageDepWithChannel('required', 'PEAR_PackageFileManager2', 'pear.php.net');
$p->addPackageDepWithChannel('optional', 'PHP_CompatInfo', 'pear.php.net', '1.4.0');
-$p->addReplacement('PackageFileManager.php', 'package-info', '@PEAR-VER@', 'version');
-$p->addReplacement('PackageFileManager/SimpleGenerator.php', 'package-info', '@PEAR-VER@', 'version');
-$p->addReplacement('PackageFileManager/XMLOutput.php', 'package-info', '@PEAR-VER@', 'version');
-$p->addReplacement('PackageFileManager/ComplexGenerator.php', 'package-info', '@PEAR-VER@', 'version');
+$p->addReplacement('PEAR/PackageFileManager.php', 'package-info', '@PEAR-VER@', 'version');
+$p->addReplacement('PEAR/PackageFileManager/SimpleGenerator.php', 'package-info', '@PEAR-VER@', 'version');
+$p->addReplacement('PEAR/PackageFileManager/XMLOutput.php', 'package-info', '@PEAR-VER@', 'version');
+$p->addReplacement('PEAR/PackageFileManager/ComplexGenerator.php', 'package-info', '@PEAR-VER@', 'version');
+$p->addReplacement('tests/setup.php.inc', 'pear-config', '@php_dir@', 'php_dir');
$p->generateContents();
if (isset($_GET['make']) || (isset($_SERVER['argv']) && @$_SERVER['argv'][1] == 'make')) {
View
34 package_PFM1.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.10.0beta1" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
+<package packagerversion="1.9.4" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
<name>PEAR_PackageFileManager</name>
<channel>pear.php.net</channel>
<summary>PEAR_PackageFileManager takes an existing v1 package.xml file and updates it with a new filelist and changelog</summary>
@@ -55,8 +55,8 @@ PEAR_PackageFileManager is fully unit tested.</description>
<email>arnaud@limbourg.com</email>
<active>no</active>
</developer>
- <date>2011-03-27</date>
- <time>22:53:52</time>
+ <date>2012-01-11</date>
+ <time>21:33:37</time>
<version>
<release>1.7.0</release>
<api>1.7.0</api>
@@ -75,17 +75,22 @@ No changes since alpha1
<file name="createPhpDocumentor_package.xml.php" role="doc" />
<file name="generatePackage.xml.php" role="doc" />
</dir> <!-- /examples -->
- <dir name="PackageFileManager">
- <file name="ComplexGenerator.php" role="php">
+ <dir name="PEAR">
+ <dir name="PackageFileManager">
+ <file name="ComplexGenerator.php" role="php">
+ <tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
+ </file>
+ <file name="SimpleGenerator.php" role="php">
+ <tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
+ </file>
+ <file name="XMLOutput.php" role="php">
+ <tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
+ </file>
+ </dir> <!-- /PEAR/PackageFileManager -->
+ <file name="PackageFileManager.php" role="php">
<tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
</file>
- <file name="SimpleGenerator.php" role="php">
- <tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
- </file>
- <file name="XMLOutput.php" role="php">
- <tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
- </file>
- </dir> <!-- /PackageFileManager -->
+ </dir> <!-- /PEAR -->
<dir name="tests">
<dir name="addConfigureOption">
<file name="test_invalid_nosetoptions.phpt" role="test" />
@@ -157,9 +162,6 @@ No changes since alpha1
<file name="Test_file.php" role="test" />
</dir> <!-- /tests -->
<file name="LICENSE" role="doc" />
- <file name="PackageFileManager.php" role="php">
- <tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
- </file>
</dir> <!-- / -->
</contents>
<dependencies>
@@ -198,7 +200,7 @@ No changes since alpha1
<release>stable</release>
<api>stable</api>
</stability>
- <date>2011-03-27</date>
+ <date>2012-01-11</date>
<license uri="http://www.opensource.org/licenses/bsd-license.php">New BSD License</license>
<notes>
No changes since alpha1
View
3 package_plugins.php
@@ -64,7 +64,8 @@
$p->addPackageDepWithChannel('required', 'XML_Serializer', 'pear.php.net', '0.19.0');
$p->addExtensionDep('optional', 'simplexml');
-$p->addReplacement('PackageFileManager/*.php', 'package-info', '@PEAR-VER@', 'version');
+$p->addReplacement('PEAR/PackageFileManager/*.php', 'package-info', '@PEAR-VER@', 'version');
+$p->addReplacement('tests/setup.php.inc', 'pear-config', '@php_dir@', 'php_dir');
$p->generateContents();
View
48 package_plugins.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.10.0beta1" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
+<package packagerversion="1.9.4" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
<name>PEAR_PackageFileManager_Plugins</name>
<channel>pear.php.net</channel>
<summary>The plugins for PEAR_PackageFileManager to pick up what files to use, supported are File, CVS, SVN, Perforce</summary>
@@ -41,8 +41,8 @@ This package is to be used with PackageFileManager v1 and v2 and can&apos;t be u
<email>arnaud@limbourg.com</email>
<active>no</active>
</developer>
- <date>2011-03-28</date>
- <time>04:09:42</time>
+ <date>2012-01-11</date>
+ <time>21:33:45</time>
<version>
<release>1.0.2</release>
<api>1.0.0</api>
@@ -58,23 +58,25 @@ This package is to be used with PackageFileManager v1 and v2 and can&apos;t be u
</notes>
<contents>
<dir baseinstalldir="PEAR" name="/">
- <dir name="PackageFileManager">
- <file name="Cvs.php" role="php">
- <tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
- </file>
- <file name="File.php" role="php">
- <tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
- </file>
- <file name="Perforce.php" role="php">
- <tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
- </file>
- <file name="Plugins.php" role="php">
- <tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
- </file>
- <file name="Svn.php" role="php">
- <tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
- </file>
- </dir> <!-- /PackageFileManager -->
+ <dir name="PEAR">
+ <dir name="PackageFileManager">
+ <file name="Cvs.php" role="php">
+ <tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
+ </file>
+ <file name="File.php" role="php">
+ <tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
+ </file>
+ <file name="Perforce.php" role="php">
+ <tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
+ </file>
+ <file name="Plugins.php" role="php">
+ <tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
+ </file>
+ <file name="Svn.php" role="php">
+ <tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
+ </file>
+ </dir> <!-- /PEAR/PackageFileManager -->
+ </dir> <!-- /PEAR -->
<dir name="tests">
<dir name="PEAR_PackageFileManager_CVS">
<file name="setup.php.inc" role="test" />
@@ -159,9 +161,7 @@ This package is to be used with PackageFileManager v1 and v2 and can&apos;t be u
<file name="test_general_valid2.phpt" role="test" />
</dir> <!-- /tests/PEAR_PackageFileManager_Svn/dirList -->
</dir> <!-- /tests/PEAR_PackageFileManager_Svn -->
- <file name="phpt_test.php.inc" role="test">
- <tasks:replace from="@php_dir@" to="php_dir" type="pear-config" />
- </file>
+ <file name="phpt_test.php.inc" role="test" />
</dir> <!-- /tests -->
<file name="LICENSE_PLUGINS" role="doc" />
</dir> <!-- / -->
@@ -197,7 +197,7 @@ This package is to be used with PackageFileManager v1 and v2 and can&apos;t be u
<release>stable</release>
<api>stable</api>
</stability>
- <date>2011-03-28</date>
+ <date>2012-01-11</date>
<license uri="http://www.opensource.org/licenses/bsd-license.php">New BSD License</license>
<notes>
* Fixed Bug #17462: SVN entries file regression (Applies to CVS as well) [dufuz]

0 comments on commit 37f2a7e

Please sign in to comment.
Something went wrong with that request. Please try again.