Added $(appNameUpper) handling in sources and headers.

Change-Id: I420e7d45545a5e48574ca3d5ad68f4f3ab143d8a

diff --git a/tool/development/convert-tpk-to-sample-project.sh b/tool/development/convert-tpk-to-sample-project.sh
index e932b2d..f5a7fc8 100755 (executable)
--- a/tool/development/convert-tpk-to-sample-project.sh
+++ b/tool/development/convert-tpk-to-sample-project.sh
@@ -144,6 +144,7 @@ sed -i "s|value=\"inc/$appName.h\"|value=\"inc/\$\(appName\).h\"|g" sample-proje
 
 print_debug_info "Replacing LOG_TAG, APP_NAME, PACKAGE"
 
+replaceContentOfFiles "#_${appNameUpper}_H_" "_\$(appNameUpper)_H_"
 replaceContentOfFiles "#define\s\+LOG_TAG\s\+\"$appName\"" "#define LOG_TAG \"\$(appName)\""
 replaceContentOfFiles "#define\s\+APP_NAME\s\+\"$appName\"" "#define APP_NAME \"\$(appName)\""
 replaceContentOfFiles "#define\s\+PACKAGE\s\+\"$packageName\"" "#define PACKAGE \"\$(packageName)\""