Use bem-environ

.bem/levels/benchmarks.js

@@ -1,14 +1,20 @@
-var PATH = require('path');
+var PATH = require('path'),
+    environ = require('bem-environ'),
+    join = PATH.join,
+
+    PRJ_ROOT = environ.PRJ_ROOT,
+    PRJ_TECHS = join(PRJ_ROOT, '.bem/techs'),
+    BEMBL_TECHS = environ.getLibPath('bem-bl', 'blocks-common/i-bem/bem/techs');
 
 exports.baseLevelPath = require.resolve('./bundles.js');
 
 exports.getTechs = function() {
 
     return {
-        'bemjson.js'    : PATH.resolve(__dirname, '../techs/bemjson.js'),
-        'bemdecl.js'    : 'bemdecl.js',
-        'deps.js'       : 'deps.js',
-        'bemhtml'       : PATH.resolve(__dirname, '../../bem-bl/blocks-common/i-bem/bem/techs/bemhtml.js')
+        'bemjson.js'    : join(PRJ_TECHS, 'bemjson.js'),
+        'bemdecl.js'    : 'v2/bemdecl.js',
+        'deps.js'       : 'v2/deps.js',
+        'bemhtml'       : PATH.resolve(BEMBL_TECHS, 'v2/bemhtml.js')
     };
 
 };

.bem/levels/blocks.js

@@ -1,27 +1,24 @@
 var PATH = require('path'),
-
-    pjoin = PATH.join,
-    presolve = PATH.resolve.bind(null, __dirname),
-
-    environ = require('../environ'),
+    environ = require('bem-environ'),
+    join = PATH.join,
 
     PRJ_ROOT = environ.PRJ_ROOT,
-    PRJ_TECHS = pjoin(PRJ_ROOT, '.bem/techs'),
+    PRJ_TECHS = join(PRJ_ROOT, '.bem/techs'),
     BEMBL_TECHS = environ.getLibPath('bem-bl', 'blocks-common/i-bem/bem/techs');
 
 
 exports.getTechs = function() {
 
     return {
-        'js'            : pjoin(BEMBL_TECHS, 'js.js'),
+        'js'            : join(BEMBL_TECHS, 'js.js'),
         'css'           : 'css',
         'ie.css'        : 'ie.css',
         'ie6.css'       : 'ie6.css',
         'ie7.css'       : 'ie7.css',
         'ie8.css'       : 'ie8.css',
         'ie9.css'       : 'ie9.css',
 
-        'bemhtml'       : pjoin(BEMBL_TECHS, 'bemhtml.js'),
+        'bemhtml'       : join(BEMBL_TECHS, 'bemhtml.js'),
     };
 
 };

.bem/levels/bundles.js

@@ -1,18 +1,15 @@
 var PATH = require('path'),
+    environ = require('bem-environ'),
+    join = PATH.join,
 
-    pjoin = PATH.join,
-    presolve = PATH.resolve.bind(null, __dirname),
-
-    PRJ_ROOT = presolve('../../'),
-
-    PRJ_TECHS = presolve('../techs/'),
-    BEMBL_TECHS = pjoin(PRJ_ROOT, 'bem-bl/blocks-common/i-bem/bem/techs');
-
+    PRJ_ROOT = environ.PRJ_ROOT,
+    PRJ_TECHS = join(PRJ_ROOT, '.bem/techs'),
+    BEMBL_TECHS = environ.getLibPath('bem-bl', 'blocks-common/i-bem/bem/techs');
 
 exports.getTechs = function() {
 
     return {
-        'bemjson.js'    : pjoin(PRJ_TECHS, 'bemjson.js'),
+        'bemjson.js'    : join(PRJ_TECHS, 'bemjson.js'),
         'bemdecl.js'    : 'v2/bemdecl.js',
         'deps.js'       : 'v2/deps.js',
         'js'            : 'v2/js-i',
@@ -23,8 +20,8 @@ exports.getTechs = function() {
         'ie8.css'       : 'v2/ie8.css',
         'ie9.css'       : 'v2/ie9.css',
 
-        'bemhtml'       : pjoin(BEMBL_TECHS, 'v2/bemhtml.js'),
-        'html'          : pjoin(BEMBL_TECHS, 'html.js')
+        'bemhtml'       : join(BEMBL_TECHS, 'v2/bemhtml.js'),
+        'html'          : join(BEMBL_TECHS, 'html.js')
     };
 
 };

.bem/make.js

@@ -1,11 +1,12 @@
-/*global MAKE:true */
-var PATH = require('path');
+/* jshint node:true */
+/* global MAKE */
 
-"use strict";
+require('bem-environ/lib/nodes');
 
-//process.env.YENV = 'production';
+var PATH = require('path'),
+    environ = require('bem-environ');
 
-require('./nodes/arch');
+//process.env.YENV = 'production';
 
 MAKE.decl('Arch', {
 
@@ -14,7 +15,7 @@ MAKE.decl('Arch', {
 
     libraries: [
         'bem-bl @ 0.3',
-        'bem-controls @ v1.0.0'
+        'bem-controls @ v1'
     ]
 
 });
@@ -41,7 +42,6 @@ MAKE.decl('BundleNode', {
             'js',
             'css',
             'ie.css',
-            'ie6.css',
             'ie7.css',
             'ie8.css',
             'ie9.css',
@@ -53,11 +53,16 @@ MAKE.decl('BundleNode', {
     getLevels: function(tech) {
 
         if (PATH.basename(this.level.dir) === 'benchmark.bundles') {
-            return ['../bem-bl/blocks-common',
-                    '../bem-bl/blocks-desktop',
-                    '../common.blocks',
-                    '../desktop.blocks']
-                .map(function(path) { return PATH.resolve(__dirname, path) } );
+            return [
+                'bem-bl/blocks-common',
+                'bem-bl/blocks-desktop'
+                ]
+                .map(function(path) { return PATH.resolve(environ.LIB_ROOT, path); })
+                .concat([
+                    'common.blocks',
+                    'desktop.blocks'
+                ]
+                .map(function(path) { return PATH.resolve(environ.PRJ_ROOT, path); }));
         }
 
         return this.__base(tech);