Merge pull request #318 from OpenZWave/bugfix/fix-fragile-build

Author: ekarak

.travis.yml

@@ -9,8 +9,6 @@ addons:
     packages:
       - libudev-dev
 
-compiler: clang
-
 before_install:
   - wget https://github.com/OpenZWave/open-zwave/archive/master.zip
   - unzip master.zip
@@ -20,11 +18,6 @@ before_install:
   - npm install -g node-gyp
   - cd ..
 
-env:
-  global:
-    - CC=/usr/bin/clang
-    - CXX=/usr/bin/clang++
-
 node_js:
   - "0.12"
   - "4"

binding.gyp

@@ -30,8 +30,8 @@
 					"OPENZWAVE_SECURITY=<!@(find <(OZW_INC) -name ZWSecurity.h | wc -l)",
 					"OPENZWAVE_EXCEPTIONS=<!@(find <(OZW_INC) -name OZWException.h | wc -l)",
 					"OPENZWAVE_16=<!@(find <(OZW_INC) -name ValueBitSet.h | wc -l)",
-					"OPENZWAVE_VALUETYPE_FROM_ENUM=<!@(nm -g --demangle  <(OZW_LIB_PATH)libopenzwave.so | grep OpenZWave::Value::GetTypeNameFromEnum | wc -l)",
-					"OPENZWAVE_VALUETYPE_FROM_VALUEID=<!@(nm -g --demangle  <(OZW_LIB_PATH)libopenzwave.so | grep OpenZWave::ValueID::GetTypeAsString | wc -l)"
+					"OPENZWAVE_VALUETYPE_FROM_ENUM=<!@(grep -r GetTypeNameFromEnum <(OZW_INC)value_classes | wc -l)",
+					"OPENZWAVE_VALUETYPE_FROM_VALUEID=<!@(grep -r GetTypeAsString <(OZW_INC)value_classes | wc -l)"
 				],
 				"cflags": [
 					"-Wno-ignored-qualifiers",
@@ -67,8 +67,8 @@
 					"OPENZWAVE_SECURITY=<!@(find <(OZW_INC) -name ZWSecurity.h | wc -l)",
 					"OPENZWAVE_EXCEPTIONS=<!@(find <(OZW_INC) -name OZWException.h | wc -l)",
 					"OPENZWAVE_16=<!@(find <(OZW_INC) -name ValueBitSet.h | wc -l)",
-					"OPENZWAVE_VALUETYPE_FROM_ENUM=<!@(symbols <(OZW_LIB_PATH)/libopenzwave.dylib | awk '{print $4}' | grep OpenZWave::Value::GetTypeNameFromEnum | wc -l)",
-					"OPENZWAVE_VALUETYPE_FROM_VALUEID=<!@(symbols <(OZW_LIB_PATH)/libopenzwave.dylib | awk '{print $4}' | grep OpenZWave::ValueID::GetTypeAsString | wc -l)",
+					"OPENZWAVE_VALUETYPE_FROM_ENUM=<!@(grep -r GetTypeNameFromEnum <(OZW_INC)value_classes | wc -l)",
+					"OPENZWAVE_VALUETYPE_FROM_VALUEID=<!@(grep -r GetTypeAsString <(OZW_INC)value_classes | wc -l)"
 				],
 				"link_settings": {
 				    "libraries": [
@@ -102,8 +102,8 @@
 					"OPENZWAVE_SECURITY=<!@(find <(OZW_INC) -name ZWSecurity.h | wc -l)",
 					"OPENZWAVE_EXCEPTIONS=<!@(find <(OZW_INC) -name OZWException.h | wc -l)",
 					"OPENZWAVE_16=<!@(find <(OZW_INC) -name ValueBitSet.h | wc -l)",
-					"OPENZWAVE_VALUETYPE_FROM_ENUM=<!@(ldconfig -p | grep 'libopenzwave.so ' | awk '{print $4}' | xargs nm -g --demangle |grep OpenZWave::Value::GetTypeNameFromEnum | wc -l)",
-					"OPENZWAVE_VALUETYPE_FROM_VALUEID=<!@(ldconfig -p | grep 'libopenzwave.so ' | awk '{print $4}' | xargs nm -g --demangle |grep OpenZWave::ValueID::GetTypeAsString | wc -l)",
+					"OPENZWAVE_VALUETYPE_FROM_ENUM=<!@(grep -r GetTypeNameFromEnum <(OZW_INC)value_classes | wc -l)",
+					"OPENZWAVE_VALUETYPE_FROM_VALUEID=<!@(grep -r GetTypeAsString <(OZW_INC)value_classes | wc -l)"
 				],
 				"link_settings": {
 					"libraries": ["-lopenzwave"]
@@ -119,6 +119,9 @@
 					"-Wno-unknown-pragmas",
 					"<!@(find <(OZW_INC) -name OZWException.h -exec echo -n \"-fexceptions\" \\;)"
 				],
+				"cflags_cc": [
+					"-std=c++11"
+				],
 				"cflags_cc!": [ 
 					"<!@(find <(OZW_INC) -name OZWException.h -exec echo -n \"-fno-exceptions\" \\;)"
 				]

src/utils.cc

@@ -275,8 +275,8 @@ namespace OZW {
 		AddStringProp (nodeobj, type,      value.GetTypeAsString());
 		AddStringProp (nodeobj, genre,     value.GetGenreAsString());
 #elif OPENZWAVE_VALUETYPE_FROM_ENUM
-		AddStringProp (nodeobj, type,      OpenZWave::Value::GetTypeNameFromEnum(value.GetType()));
-		AddStringProp (nodeobj, genre,     OpenZWave::Value::GetGenreNameFromEnum(value.GetGenre()));
+		AddStringProp (nodeobj, type,      OpenZWave::Internal::VC::ValueList::GetTypeNameFromEnum(value.GetType()));
+		AddStringProp (nodeobj, genre,     OpenZWave::Internal::VC::ValueList::GetGenreNameFromEnum(value.GetGenre()));
 #else
 		AddIntegerProp(nodeobj, type,      value.GetType());
 		AddIntegerProp(nodeobj, genre,     value.GetGenre());