Clean up VSIX generation scripts.

diff --git a/LUFA/StudioIntegration/VSIX/asf-manifest.xml b/LUFA/StudioIntegration/VSIX/asf-manifest.xml
index cd77a76..e90e875 100644 (file)
--- a/LUFA/StudioIntegration/VSIX/asf-manifest.xml
+++ b/LUFA/StudioIntegration/VSIX/asf-manifest.xml
@@ -3,7 +3,7 @@
     <Org>FourWalledCubicle</Org>\r
     <ShortName>LUFA</ShortName>\r
     <Author>Dean Camera</Author>\r
     <Org>FourWalledCubicle</Org>\r
     <ShortName>LUFA</ShortName>\r
     <Author>Dean Camera</Author>\r

-    <Description></Description>\r
+    <Description/>\r

     <FollowFolderStructure>True</FollowFolderStructure>\r
   </Identifier>\r
   <AsfContent Type="zip" Path="contents.zip">\r
     <FollowFolderStructure>True</FollowFolderStructure>\r
   </Identifier>\r
   <AsfContent Type="zip" Path="contents.zip">\r

diff --git a/LUFA/StudioIntegration/XSLT/lufa_asfmanifest_transform.xslt b/LUFA/StudioIntegration/XSLT/lufa_asfmanifest_transform.xslt
index 8cbb8af..8fc9841 100644 (file)
--- a/LUFA/StudioIntegration/XSLT/lufa_asfmanifest_transform.xslt
+++ b/LUFA/StudioIntegration/XSLT/lufa_asfmanifest_transform.xslt
@@ -8,7 +8,8 @@
 
 <!-- Atmel Studio framework VSIX XML transform file -->
 
 
 <!-- Atmel Studio framework VSIX XML transform file -->
 

-
+<!-- Updates an asf-manifest.xml document to add appropriate version
+     information. -->

 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
        <xsl:output method="xml" omit-xml-declaration="yes"/>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
        <xsl:output method="xml" omit-xml-declaration="yes"/>
 

diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index 55efdcd..41b95a6 100644 (file)
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -72,8 +72,10 @@ generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML)
 check_filenames: $(MODULE_OUTPUT_XML)
        @echo Verifying referenced filenames of ASF.xml modules...
        @for f in `find $(LUFA_ROOT)/../ -name "asf.xml"`; do \
 check_filenames: $(MODULE_OUTPUT_XML)
        @echo Verifying referenced filenames of ASF.xml modules...
        @for f in `find $(LUFA_ROOT)/../ -name "asf.xml"`; do \

-               xsltproc XSLT/lufa_filelist_transform.xslt $$f | grep -v "^<" | sed -e "/^$$/d" | while read -r i; do \
-                       if ( ! test -f "`dirname $$f`/$$i" ); then \
+               echo "Checking $$f..."; \
+               asf_file_dir=`dirname $$f`; \
+               xsltproc XSLT/lufa_filelist_transform.xslt $$f | sed -e "/^$$/d" | while read -r i; do \
+                       if ( ! test -f "$$asf_file_dir/$$i" ); then \

                                echo "Source file \"$$i\" referenced in $$f does not exist!"; \
                                exit 1; \
                        fi; \
                                echo "Source file \"$$i\" referenced in $$f does not exist!"; \
                                exit 1; \
                        fi; \