Move all generated files to output directory

Author: dteteruk

build.sh

@@ -3,15 +3,16 @@ output_gen=$1
 platform=$2
 mode=$3
 
-base_output_gen=`dirname ${output_gen}`
-
 current_dir=`pwd`
 if [ -z $output_gen ];
 then
-  output_gen="."
+  output_gen=`pwd`
   platform="desktop"
 fi
 
+output_gen=`readlink -f ${output_gen}`
+base_output_gen=`dirname ${output_gen}`
+
 if [ -z $platform ];
 then
   platforms="desktop flip"

wd.gyp

@@ -31,6 +31,7 @@
           'include_dirs': [
             'inc/',
             'src/',
+            '<(INTERMEDIATE_DIR)',
             '<(QT_INC_PATH)',
           ],
 
@@ -212,6 +213,30 @@
         ],
       } ]
     ],
+    'actions': [{
+      'action_name' : 'input_dir',
+      'inputs' : [],
+      'outputs': [
+        '<(INTERMEDIATE_DIR)',
+      ],
+      'action': ['mkdir', '-p', '<(INTERMEDIATE_DIR)'],
+    }],
+
+    'rules': [         
+    {
+      'rule_name': 'generate_ui',
+      'extension': 'ui',
+      'outputs': [ '<(RULE_INPUT_DIRNAME)/ui_<(RULE_INPUT_ROOT).h' ],
+      'action': [ '<(QT_BIN_PATH)/uic', '<(RULE_INPUT_PATH)', '-o', '<(INTERMEDIATE_DIR)/ui_<(RULE_INPUT_ROOT).h' ],
+      'message': 'Generating ui_<(RULE_INPUT_ROOT).h',
+    },
+    {
+      'rule_name': 'generate_moc',
+      'extension': 'h',
+      'outputs': [ '<(RULE_INPUT_DIRNAME)/moc_<(RULE_INPUT_ROOT).cc' ],
+      'action': [ '<(QT_BIN_PATH)/moc', '<(RULE_INPUT_PATH)', '-o', '<(INTERMEDIATE_DIR)/moc_<(RULE_INPUT_ROOT).cc' ],
+      'message': 'Generating <(RULE_INPUT_ROOT).cc.',
+    } ],
   },
 
   'targets': [
@@ -227,6 +252,7 @@
         'inc/',
         'src/',
         '<(QT_INC_PATH)',
+        '<(INTERMEDIATE_DIR)',
         '<(MONGOOSE_INC_PATH)',
       ],
 
@@ -357,9 +383,9 @@
         'src/chrome/test/webdriver/webdriver_switches.cc',
         'src/chrome/test/webdriver/webdriver_util.cc',
         'src/content/public/common/content_switches.cc',
-        'src/moc_qtaskrunner.cc',
-        'src/moc_qwebviewext.cc',
-        'src/moc_webdriver_automation.cc',
+        '<(INTERMEDIATE_DIR)/moc_qtaskrunner.cc',
+        '<(INTERMEDIATE_DIR)/moc_qwebviewext.cc',
+        '<(INTERMEDIATE_DIR)/moc_webdriver_automation.cc',
         'src/net/base/file_stream.cc',
         'src/net/base/file_stream_metrics.cc',
         'src/net/base/file_stream_net_log_parameters.cc',
@@ -383,14 +409,6 @@
         'src/viewfactory.cc',
       ],
 
-      'rules': [ {
-        'rule_name': 'generate_moc',
-        'extension': 'h',
-        'outputs': [ '<(RULE_INPUT_DIRNAME)/moc_<(RULE_INPUT_ROOT).cc' ],
-        'action': [ '<(QT_BIN_PATH)/moc', '<(RULE_INPUT_PATH)', '-o', 'src/moc_<(RULE_INPUT_ROOT).cc' ],
-        'message': 'Generating <(RULE_INPUT_ROOT).cc.',
-      } ],
-
       'conditions': [
         [ '<(WD_BUILD_MONGOOSE) == 1', {
           'sources': [