Merge pull request #18 from laurentb/fixpkg

GromNaN · GromNaN · commit 916c2512e47a · 2013-08-19T04:34:04.000-07:00
Fix PEAR packaging
diff --git a/lib/command/cli.php b/lib/command/cli.php
@@ -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
 {
diff --git a/package.xml.tmpl b/package.xml.tmpl
@@ -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" />

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,17 @@`
`13`	`13`	`{`
`14`	`14`	`$autoload = dirname(__FILE__).'/../../autoload.php';`
`15`	`15`	`}`
`16`		`-require_once $autoload;`
	`16`	`+`
	`17`	`+// Fall back to classic Symfony loading`
	`18`	`+if (!file_exists($autoload))`
	`19`	`+{`
	`20`	`+ require_once(dirname(__FILE__).'/../autoload/sfCoreAutoload.class.php');`
	`21`	`+ sfCoreAutoload::register();`
	`22`	`+}`
	`23`	`+else`
	`24`	`+{`
	`25`	`+ require_once $autoload;`
	`26`	`+}`
`17`	`27`
`18`	`28`	`try`
`19`	`29`	`{`