Dropped modules, spruced up Dynamic class

Dropped the bootstrap submodules since the bootstrap is moving out of this project again. Also dropped LESS, relying on an installed copy (similar to SASS)
This commit is contained in:
Josh Sherman 2013-01-31 15:01:52 -05:00
parent e70dccafd7
commit 465976818c
9 changed files with 25 additions and 26 deletions

15
.gitmodules vendored
View file

@ -1,15 +0,0 @@
[submodule "vendors/twitter/bootstrap"]
path = vendors/twitter/bootstrap
url = git://github.com/twitter/bootstrap
[submodule "vendors/jquery/jquery"]
path = vendors/jquery/jquery
url = git://github.com/jquery/jquery.git
[submodule "vendors/jquery/jquery-ui"]
path = vendors/jquery/jquery-ui
url = git://github.com/jquery/jquery-ui.git
[submodule "vendors/jquery/jquery-mobile"]
path = vendors/jquery/jquery-mobile
url = git://github.com/jquery/jquery-mobile.git
[submodule "vendors/cloudhead/less.js"]
path = vendors/cloudhead/less.js
url = git@github.com:cloudhead/less.js.git

View file

@ -22,14 +22,15 @@ PICKLES is in fact not a true MVC system and won't be masquerading around as one
### Highly Recommended Software ### Highly Recommended Software
* PHP 5.2.0+ for native JSON support or PECL JSON 1.2.1 (included) * PHP 5.2.0+ for native JSON support or PECL JSON 1.2.1
### Optional Software ### Optional Software
* node, npm & lessc to compile LESS files
* sass to compile SASS files
* MySQL with PDO and PDO_MYSQL drivers * MySQL with PDO and PDO_MYSQL drivers
* PostgreSQL with PDO and PDO_PGSQL drivers * PostgreSQL with PDO and PDO_PGSQL drivers
* SQLite 3 with PDO and PDO_SQLITE drivers * SQLite 3 with PDO and PDO_SQLITE drivers
* Limited support for Mongo with Mongo driver and PECL Mongo 1.0.10 (included)
## Installation ## Installation

View file

@ -170,14 +170,23 @@ class Dynamic extends Object
if ($less) if ($less)
{ {
$command = 'export PATH=$PATH:/usr/local/bin; ' . PICKLES_PATH . 'vendors/cloudhead/less.js/bin/lessc ' . $original_filename . ' > ' . $compiled_filename; // I couldn't get getenv() to give me the PATH value... so yeah, there's that.
exec('echo $PATH', $path);
putenv('PATH=' . $path[0] . PATH_SEPARATOR . '/usr/local/bin');
$command = 'lessc ' . $original_filename . ' > ' . $compiled_filename;
} }
elseif ($sass) elseif ($sass)
{ {
$command = 'sass ' . $original_filename . ':' . $compiled_filename; $command = 'sass ' . $original_filename . ':' . $compiled_filename;
} }
exec($command); exec($command, $output, $return);
if ($return !== 0)
{
throw new Exception('There was an error executing `' . $command . '` it returned exit code ' . $return);
}
$original_filename = $compiled_filename; $original_filename = $compiled_filename;
} }

13
jar.php
View file

@ -3180,14 +3180,23 @@ class Dynamic extends Object
if ($less) if ($less)
{ {
$command = 'export PATH=$PATH:/usr/local/bin; ' . PICKLES_PATH . 'vendors/cloudhead/less.js/bin/lessc ' . $original_filename . ' > ' . $compiled_filename; // I couldn't get getenv() to give me the PATH value... so yeah, there's that.
exec('echo $PATH', $path);
putenv('PATH=' . $path[0] . PATH_SEPARATOR . '/usr/local/bin');
$command = 'lessc ' . $original_filename . ' > ' . $compiled_filename;
} }
elseif ($sass) elseif ($sass)
{ {
$command = 'sass ' . $original_filename . ':' . $compiled_filename; $command = 'sass ' . $original_filename . ':' . $compiled_filename;
} }
exec($command); exec($command, $output, $return);
if ($return !== 0)
{
throw new Exception('There was an error executing `' . $command . '` it returned exit code ' . $return);
}
$original_filename = $compiled_filename; $original_filename = $compiled_filename;
} }

@ -1 +0,0 @@
Subproject commit 8abc60ef268f55e8399e06b19506d1c985baae8d

@ -1 +0,0 @@
Subproject commit a60fed4dec85e7b0c3b6fc5741b14cee1552afc4

@ -1 +0,0 @@
Subproject commit 39aea2b93315ff668b0aea428b08b4d3d31b66cc

@ -1 +0,0 @@
Subproject commit bae06d2b1ef6bbc946dce9fae91f68cc41abccda

@ -1 +0,0 @@
Subproject commit c52368d3c5984b28e6a71e5e1240afdd788fc2e6