added release_dbg option and WD_BUILD_MONGOOSE and WD_BUILD_MODP_B64

Author: vvavrychuk

wd.gyp

@@ -8,6 +8,8 @@
     'WD_CONFIG_QWIDGET_VIEW%': '0',
     'WD_CONFIG_QWIDGET_VIEW_ACCESSABILITY%': '0',
     'WD_CONFIG_QML_VIEW%': '0',
+    'WD_BUILD_MONGOOSE%': '0',
+    'WD_BUILD_MODP_B64%': '0',
   },
 
   'conditions': [
@@ -25,6 +27,7 @@
 
           'include_dirs': [
             'inc/',
+            'src/',
             '<(QT_INC_PATH)',
           ],
 
@@ -34,7 +37,6 @@
 
           'sources': [
             'src/Test/main.cc',
-            'src/third_party/mongoose/mongoose.c',
           ],
 
           'conditions': [
@@ -74,6 +76,18 @@
                 '-ldl',
               ],
             } ],
+
+            [ '<(WD_BUILD_MONGOOSE) == 0', {
+              'sources': [
+                'src/third_party/mongoose/mongoose.c',
+              ],
+            } ],
+
+            [ '<(WD_BUILD_MODP_B64) == 0', {
+              'sources': [
+                'src/third_party/modp_b64/modp_b64.cc',
+              ],
+            } ],
           ],
         },
       ],
@@ -90,7 +104,6 @@
 
   'target_defaults': {
     'cflags': [
-      '-g',
       '-fPIC',
       '-Wall',
       '-W',
@@ -121,11 +134,27 @@
           'WD_CONFIG_QML_VIEW',
         ],
       } ],
+      [ 'mode == "debug"', {
+        'cflags': [
+          '-O0',
+          '-g',
+        ],
+      } ],
       [ 'mode == "release"', {
+        'cflags': [
+          '-O3',
+        ],
+
         'defines': [
           'NDEBUG',
         ],
       } ],
+      [ 'mode == "release_dbg"', {
+        'cflags': [
+          '-O3',
+          '-g',
+        ],
+      } ]
     ],
   },
 
@@ -305,7 +334,6 @@
         'src/qtaskrunner.cc',
         'src/qwebviewext.h',
         'src/qwebviewext.cc',
-        'src/third_party/modp_b64/modp_b64.cc',
         'src/third_party/webdriver/atoms.cc',
         'src/third_party/zlib/adler32.c',
         'src/third_party/zlib/contrib/minizip/ioapi.c',
@@ -326,6 +354,20 @@
         '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': [
+            'src/third_party/mongoose/mongoose.c',
+          ],
+        } ],
+
+        [ '<(WD_BUILD_MODP_B64) == 1', {
+          'sources': [
+            'src/third_party/modp_b64/modp_b64.cc',
+          ],
+        } ],
+      ],
     }, {
       'target_name': 'WebDriverShared',
       'type': 'shared_library',

wd.gypi

@@ -4,6 +4,8 @@
     'WD_CONFIG_QWIDGET_VIEW': '1',
     'WD_CONFIG_QWIDGET_VIEW_ACCESSABILITY': '0',
     'WD_CONFIG_QML_VIEW': '1',
+    'WD_BUILD_MONGOOSE': '1',
+    'WD_BUILD_MODP_B64': '1',
     'CISCO_QT_BIN_PATH':   '/opt/qt4_nds/linux2_2/release/bin/',
     'CISCO_QT_INC_PATH':   '/opt/qt4_nds/linux2_2/release/include/',
     'CISCO_QT_LIB_PATH':   '/opt/qt4_nds/linux2_2/release/lib/',

wd.gypi.sample

@@ -5,6 +5,8 @@
     'WD_CONFIG_QWIDGET_VIEW': '1',
     'WD_CONFIG_QWIDGET_VIEW_ACCESSABILITY': '0',
     'WD_CONFIG_QML_VIEW': '1',
+    'WD_BUILD_MONGOOSE': '1',
+    'WD_BUILD_MODP_B64': '1',
     'CISCO_QT_BIN_PATH':   '/opt/qt4_nds/linux2_2/release/bin/',
     'CISCO_QT_INC_PATH':   '/opt/qt4_nds/linux2_2/release/include/',
     'CISCO_QT_LIB_PATH':   '/opt/qt4_nds/linux2_2/release/lib/',