Skip to content

Fix PEAR packaging #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 19, 2013
Merged

Fix PEAR packaging #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcff6f7
Documentation files were renamed
laurentb Aug 17, 2013
6d0f4af
Fall back to classic Symfony loading
laurentb Aug 17, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion lib/command/cli.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,17 @@
{
$autoload = dirname(__FILE__).'/../../autoload.php';
}
require_once $autoload;

// Fall back to classic Symfony loading
if (!file_exists($autoload))
{
require_once(dirname(__FILE__).'/../autoload/sfCoreAutoload.class.php');
sfCoreAutoload::register();
}
else
{
require_once $autoload;
}

try
{
Expand Down
8 changes: 4 additions & 4 deletions package.xml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@

<file role="script" baseinstalldir="/" name="data/bin/symfony.bat" />

<file role="doc" baseinstalldir="symfony" name="CHANGELOG" />
<file role="doc" baseinstalldir="symfony" name="COPYRIGHT" />
<file role="doc" baseinstalldir="symfony" name="LICENSE" />
<file role="doc" baseinstalldir="symfony" name="README" />
<file role="doc" baseinstalldir="symfony" name="CHANGELOG.md" />
<file role="doc" baseinstalldir="symfony" name="COPYRIGHT.md" />
<file role="doc" baseinstalldir="symfony" name="LICENSE.md" />
<file role="doc" baseinstalldir="symfony" name="README.md" />
<file role="doc" baseinstalldir="symfony" name="licenses/LICENSE.ICU" />
<file role="doc" baseinstalldir="symfony" name="licenses/LICENSE.lime" />
<file role="doc" baseinstalldir="symfony" name="licenses/LICENSE.prado" />
Expand Down