fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX to enable $php composer.phar update

Browse Source 
this fix make composer update works file
and the script build-vendor.php file was updated to new vendors references
This commit is contained in:
Erik Amaru Ortiz
2014-01-23 17:41:52 -04:00
parent 33243ab6f8
commit 71afc2d7c5
2 changed files with 29 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
build-vendor.php
View File

@@ -35,8 +35,8 @@ if (! is_dir($vendorDir )) {
} }
$projects = array( $projects = array(
'colosa/michelangelofe', 'colosa/MichelangeloFE',
'colosa/pmui' 'colosa/pmUI'
); );
echo PHP_EOL; echo PHP_EOL;
@@ -81,36 +81,31 @@ if (! is_dir($destinationDir.'/pmUI')) {
$filesCollection = array( $filesCollection = array(
// Libs
"jquery/jquery/jquery-1.10.2.min.js" => "js/jquery-1.10.2.min.js", "jquery/jquery/jquery-1.10.2.min.js" => "js/jquery-1.10.2.min.js",
"underscore/underscore/underscore-min.js" => "js/underscore-min.js", "underscore/underscore/underscore-min.js" => "js/underscore-min.js",
//libs "colosa/pmUI/libraries/restclient/restclient-min.js" => "js/restclient-min.js",
/*"colosa/michelangelo-fe-libs/jQueryLayout/jquery.layout.min.js" => "js/jquery.layout.min.js",
"colosa/michelangelo-fe-libs/jQueryUI/jquery-ui-1.10.3.custom.min.js" => "js/jquery-ui-1.10.3.custom.min.js",
"colosa/michelangelo-fe-libs/jQueryUI/jquery-ui-1.10.3.custom.min.css" => "js/jquery-ui-1.10.3.custom.min.css",
"colosa/michelangelo-fe-libs/wz_jsgraphics/wz_jsgraphics.js" => "js/wz_jsgraphics.js",*/
"colosa/pmui/libraries/restclient/restclient-min.js" => "js/restclient-min.js", // MichelangeloFE
"colosa/MichelangeloFE/lib/wz_jsgraphics/wz_jsgraphics.js" => "js/wz_jsgraphics.js",
// michelangelofe "colosa/MichelangeloFE/build/js/designer.js" => "mafe/designer.js",
"colosa/michelangelofe/lib/wz_jsgraphics/wz_jsgraphics.js" => "js/wz_jsgraphics.js", "colosa/MichelangeloFE/build/js/mafe.min.js" => "mafe/mafe.min.js",
"colosa/michelangelofe/build/js/designer.js" => "mafe/designer.js", "colosa/MichelangeloFE/build/css/mafe.css" => "mafe/mafe.css",
"colosa/michelangelofe/build/js/mafe.min.js" => "mafe/mafe.min.js", "colosa/MichelangeloFE/build/img/*" => "img/",
"colosa/michelangelofe/build/css/mafe.css" => "mafe/mafe.css", // pmUI
"colosa/michelangelofe/build/img/*" => "img/", "colosa/pmUI/libraries/jquery.layout/LayoutPanel.css" => "css/jquery.layout.css",
// pmui "colosa/pmUI/libraries/jquery-ui/css/css-customized/jquery-ui-1.10.3.custom.css" => "css/jquery-ui-1.10.3.custom.min.css",
"colosa/pmui/libraries/jquery.layout/LayoutPanel.css" => "css/jquery.layout.css", "colosa/pmUI/libraries/dataTables/css/jquery.dataTables.css" => "css/jquery.dataTables.css",
"colosa/pmui/libraries/jquery-ui/css/css-customized/jquery-ui-1.10.3.custom.css" => "css/jquery-ui-1.10.3.custom.min.css", "colosa/pmUI/libraries/jquery.layout/jquery.layout.min.js" => "js/jquery.layout.min.js",
"colosa/pmui/libraries/dataTables/css/jquery.dataTables.css" => "css/jquery.dataTables.css", "colosa/pmUI/libraries/jquery-ui/js/jquery-ui-1.10.3.custom.min.js" => "js/jquery-ui-1.10.3.custom.min.js",
"colosa/pmui/libraries/jquery.layout/jquery.layout.min.js" => "js/jquery.layout.min.js", "colosa/pmUI/libraries/dataTables/js/jquery.dataTables.min.js" => "js/jquery.dataTables.min.js",
"colosa/pmui/libraries/jquery-ui/js/jquery-ui-1.10.3.custom.min.js" => "js/jquery-ui-1.10.3.custom.min.js",
"colosa/pmui/libraries/dataTables/js/jquery.dataTables.min.js" => "js/jquery.dataTables.min.js",
array( array(
"try_files" => array("colosa/pmui/build/js/min/pmui-1.0.0.min.js", "colosa/pmui/build/js/pmui-1.0.0.js"), "try_files" => array("colosa/pmUI/build/js/min/pmUI-1.0.0.min.js", "colosa/pmUI/build/js/pmUI-1.0.0.js"),
"to_file" => "pmUI/pmui-1.0.0.js" "to_file" => "pmUI/pmUI-1.0.0.js"
), ),
"colosa/pmui/build/css/pmui-1.0.0.css" => "pmUI/pmui-1.0.0.css", "colosa/pmUI/build/css/pmUI-1.0.0.css" => "pmUI/pmUI-1.0.0.css",
"colosa/pmui/build/img/*" => "img/", "colosa/pmUI/build/img/*" => "img/",
); );

32
composer.json
View File

@@ -29,38 +29,22 @@
} }
}, },
{ {
"type": "package", "type": "vcs",
"package": { "url": "git@bitbucket.org:colosa/pmUI.git"
"name": "colosa/pmui",
"version": "dev-master",
"source": {
"url": "git@bitbucket.org:colosa/pmui.git",
"type": "git",
"reference": "origin/master"
}
}
}, },
{ {
"type": "package", "type": "vcs",
"package": { "url": "git@bitbucket.org:colosa/MichelangeloFE.git"
"name": "colosa/michelangelofe",
"version": "dev-master",
"source": {
"url": "git@bitbucket.org:colosa/michelangelofe.git",
"type": "git",
"reference": "origin/master"
}
}
} }
], ],
"require": { "require": {
"luracast/restler" : "dev-master", "luracast/restler" : "v3.0.0",
"bshaffer/oauth2-server-php": "v1.0", "bshaffer/oauth2-server-php": "v1.0",
"jquery/jquery": "1.10.2", "jquery/jquery": "1.10.2",
"colosa/pmui": "dev-master", "underscore/underscore": "1.5.2",
"colosa/michelangelofe": "dev-master", "colosa/pmUI": "dev-master",
"underscore/underscore": "1.5.2" "colosa/MichelangeloFE": "dev-master"
}, },
"require-dev":{ "require-dev":{
"guzzle/guzzle":"~3.1.1", "guzzle/guzzle":"~3.1.1",