From 71afc2d7c5af5f86521650b1fb5449a70844d922 Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Thu, 23 Jan 2014 17:41:52 -0400 Subject: [PATCH] FIX to enable $php composer.phar update this fix make composer update works file and the script build-vendor.php file was updated to new vendors references --- build-vendor.php | 47 +++++++++++++++++++++-------------------------- composer.json | 32 ++++++++------------------------ 2 files changed, 29 insertions(+), 50 deletions(-) diff --git a/build-vendor.php b/build-vendor.php index 571ff564c..bace7563b 100644 --- a/build-vendor.php +++ b/build-vendor.php @@ -35,8 +35,8 @@ if (! is_dir($vendorDir )) { } $projects = array( - 'colosa/michelangelofe', - 'colosa/pmui' + 'colosa/MichelangeloFE', + 'colosa/pmUI' ); echo PHP_EOL; @@ -81,36 +81,31 @@ if (! is_dir($destinationDir.'/pmUI')) { $filesCollection = array( + // Libs "jquery/jquery/jquery-1.10.2.min.js" => "js/jquery-1.10.2.min.js", "underscore/underscore/underscore-min.js" => "js/underscore-min.js", - //libs - /*"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", + "colosa/pmUI/libraries/restclient/restclient-min.js" => "js/restclient-min.js", - // michelangelofe - "colosa/michelangelofe/lib/wz_jsgraphics/wz_jsgraphics.js" => "js/wz_jsgraphics.js", - "colosa/michelangelofe/build/js/designer.js" => "mafe/designer.js", - "colosa/michelangelofe/build/js/mafe.min.js" => "mafe/mafe.min.js", - "colosa/michelangelofe/build/css/mafe.css" => "mafe/mafe.css", - "colosa/michelangelofe/build/img/*" => "img/", - // pmui - "colosa/pmui/libraries/jquery.layout/LayoutPanel.css" => "css/jquery.layout.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/dataTables/css/jquery.dataTables.css" => "css/jquery.dataTables.css", - "colosa/pmui/libraries/jquery.layout/jquery.layout.min.js" => "js/jquery.layout.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", + // MichelangeloFE + "colosa/MichelangeloFE/lib/wz_jsgraphics/wz_jsgraphics.js" => "js/wz_jsgraphics.js", + "colosa/MichelangeloFE/build/js/designer.js" => "mafe/designer.js", + "colosa/MichelangeloFE/build/js/mafe.min.js" => "mafe/mafe.min.js", + "colosa/MichelangeloFE/build/css/mafe.css" => "mafe/mafe.css", + "colosa/MichelangeloFE/build/img/*" => "img/", + // pmUI + "colosa/pmUI/libraries/jquery.layout/LayoutPanel.css" => "css/jquery.layout.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/dataTables/css/jquery.dataTables.css" => "css/jquery.dataTables.css", + "colosa/pmUI/libraries/jquery.layout/jquery.layout.min.js" => "js/jquery.layout.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( - "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" + "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" ), - "colosa/pmui/build/css/pmui-1.0.0.css" => "pmUI/pmui-1.0.0.css", - "colosa/pmui/build/img/*" => "img/", + "colosa/pmUI/build/css/pmUI-1.0.0.css" => "pmUI/pmUI-1.0.0.css", + "colosa/pmUI/build/img/*" => "img/", ); diff --git a/composer.json b/composer.json index d130d09fa..62eb78069 100644 --- a/composer.json +++ b/composer.json @@ -29,38 +29,22 @@ } }, { - "type": "package", - "package": { - "name": "colosa/pmui", - "version": "dev-master", - "source": { - "url": "git@bitbucket.org:colosa/pmui.git", - "type": "git", - "reference": "origin/master" - } - } + "type": "vcs", + "url": "git@bitbucket.org:colosa/pmUI.git" }, { - "type": "package", - "package": { - "name": "colosa/michelangelofe", - "version": "dev-master", - "source": { - "url": "git@bitbucket.org:colosa/michelangelofe.git", - "type": "git", - "reference": "origin/master" - } - } + "type": "vcs", + "url": "git@bitbucket.org:colosa/MichelangeloFE.git" } ], "require": { - "luracast/restler" : "dev-master", + "luracast/restler" : "v3.0.0", "bshaffer/oauth2-server-php": "v1.0", "jquery/jquery": "1.10.2", - "colosa/pmui": "dev-master", - "colosa/michelangelofe": "dev-master", - "underscore/underscore": "1.5.2" + "underscore/underscore": "1.5.2", + "colosa/pmUI": "dev-master", + "colosa/MichelangeloFE": "dev-master" }, "require-dev":{ "guzzle/guzzle":"~3.1.1",