[Libreoffice-commits] core.git: bin/gbuild-to-ide

[Federico Bassini]

 bin/gbuild-to-ide |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 99860ffc53aa1f423fe60a2f484fdfed7b045d5e
Author: Federico Bassini <kurogan21 at gmail.com>
Date:   Thu Feb 2 20:20:56 2017 +0100

    gbuild-to-ide fix the double .cxx in the .filters
    
    double ".ccx" for each source files in the .filters in the
    testVS2013Ide.
    this patch fix that.
    
    Change-Id: Ic06800c260800f72254038e30119db40fe048037
    Reviewed-on: https://gerrit.libreoffice.org/33892
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index f38be79..7dd6142 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -94,7 +94,7 @@ class GbuildParser:
         # Relation between json object and file extension
         jsonSrc = {
                     'CXXOBJECTS': '.cxx', 'OBJCOBJECTS': '.m', 'OBJCXXOBJECTS': '.mm', 'COBJECTS': '.c',
-                    'FLEXOBJECTS': '.l',   'YACCOBJECTS': '.y',
+                    'LEXOBJECTS': '.l',   'YACCOBJECTS': '.y',
 
                     'GENCXXOBJECTS': '.cxx', # remark is in workdir/GenCxxObject
                     'ASMOBJECTS': '.s',      #not in json, due to Blacklist ?
@@ -529,7 +529,7 @@ class testVS2013Ide(IdeIntegrationGenerator):
             filter_ext_node.text = '{%s}' % filter_value
         sources_node=ET.SubElement(proj_node,'{%s}ItemGroup' % ns)
         for cxxfile in target['CXXOBJECTS']:
-            cxx_file_name = cxxfile.split('/')[-1] + '.cxx'
+            cxx_file_name = cxxfile.split('/')[-1]
             clinclude_node=ET.SubElement(sources_node,'{%s}ClInclude' % ns, Include='%s' % cxx_file_name)
             header_filter=ET.SubElement(clinclude_node,'{%s}Filter' % ns)
             header_filter.text="sources"