gen_msvs_*proj.sh: strip SRC_PATH_BARE from obj names
authorJames Zern <jzern@google.com>
Tue, 3 Jun 2014 00:07:13 +0000 (17:07 -0700)
committerJames Zern <jzern@google.com>
Tue, 3 Jun 2014 00:09:25 +0000 (17:09 -0700)
reduces the risk of exceeding msbuild command line length limits

Change-Id: I0e4d807f42c090a709a3dc365a02b929a3071688

build/make/gen_msvs_proj.sh
build/make/gen_msvs_vcxproj.sh

index c6fef0d..660436d 100755 (executable)
@@ -67,7 +67,9 @@ generate_filter() {
             if [ "${f##*.}" == "$pat" ]; then
                 unset file_list[i]
 
-                objf=$(echo ${f%.*}.obj | sed -e 's/^[\./]\+//g' -e 's,[:/ ],_,g')
+                objf=$(echo ${f%.*}.obj \
+                       | sed -e "s,$src_path_bare,," \
+                             -e 's/^[\./]\+//g' -e 's,[:/ ],_,g')
                 open_tag File RelativePath="$f"
 
                 if [ "$pat" == "asm" ] && $asm_use_custom_step; then
index 60a56c9..4ae511e 100755 (executable)
@@ -78,7 +78,9 @@ generate_filter() {
             if [ "${f##*.}" == "$pat" ]; then
                 unset file_list[i]
 
-                objf=$(echo ${f%.*}.obj | sed -e 's/^[\./]\+//g' -e 's,[:/ ],_,g')
+                objf=$(echo ${f%.*}.obj \
+                       | sed -e "s,$src_path_bare,," \
+                             -e 's/^[\./]\+//g' -e 's,[:/ ],_,g')
 
                 if ([ "$pat" == "asm" ] || [ "$pat" == "s" ]) && $asm_use_custom_step; then
                     # Avoid object file name collisions, i.e. vpx_config.c and