include lib/ dir, use it as include path

diff --git a/bin/makephar.php b/bin/makephar.php
index 6089b0c28ca7a435105afca568eeb5812c6a6ef5..13c1acd746aa2160d85ed343635dbd78f8c46300 100755 (executable)
--- a/bin/makephar.php
+++ b/bin/makephar.php
@@ -18,7 +18,7 @@ $phar->buildFromDirectory(
     realpath(__DIR__ . '/../'),
     '#'
     . '^' . preg_quote(realpath(__DIR__ . '/../'), '#')
     realpath(__DIR__ . '/../'),
     '#'
     . '^' . preg_quote(realpath(__DIR__ . '/../'), '#')

-    . '/(data/bdrem.config.php.dist|src/bdrem/|www/|README\.rst)'
+    . '/(data/bdrem.config.php.dist|lib/|src/bdrem/|www/|README\.rst)'

     . '#'
 );
 
     . '#'
 );
 

diff --git a/src/phar-stub.php b/src/phar-stub.php
index 3c801301fceef945c1e5f269ddabae75e86db0d5..326b5cf046d3a493dbd31e5aa2f0fec1f8caed96 100644 (file)
--- a/src/phar-stub.php
+++ b/src/phar-stub.php
@@ -16,7 +16,10 @@ function rewritePath($path)
 }
 
 //Phar::interceptFileFuncs();
 }
 
 //Phar::interceptFileFuncs();

-set_include_path('phar://' . __FILE__ . PATH_SEPARATOR . get_include_path());
+set_include_path(
+    'phar://' . __FILE__
+    . PATH_SEPARATOR . 'phar://' . __FILE__ . '/lib/'
+);

 Phar::webPhar(null, $web, null, array(), 'rewritePath');
 include 'phar://' . __FILE__ . '/' . $cli;
 __HALT_COMPILER();
 Phar::webPhar(null, $web, null, array(), 'rewritePath');
 include 'phar://' . __FILE__ . '/' . $cli;
 __HALT_COMPILER();