Add Atmel Studio 6.1 binary blob.

diff --git a/LUFA/StudioIntegration/Blob/LUFA.dll b/LUFA/StudioIntegration/Blob/LUFA.dll
new file mode 100644 (file)
index 0000000..31cd0cc
Binary files /dev/null and b/LUFA/StudioIntegration/Blob/LUFA.dll differ

diff --git a/LUFA/StudioIntegration/Blob/LUFA.pkgdef b/LUFA/StudioIntegration/Blob/LUFA.pkgdef
new file mode 100644 (file)
index 0000000..36ef7e3
Binary files /dev/null and b/LUFA/StudioIntegration/Blob/LUFA.pkgdef differ

diff --git a/LUFA/StudioIntegration/VSIX/[Content_Types].xml b/LUFA/StudioIntegration/VSIX/[Content_Types].xml
index e54b61a..98e4522 100644 (file)
--- a/LUFA/StudioIntegration/VSIX/[Content_Types].xml
+++ b/LUFA/StudioIntegration/VSIX/[Content_Types].xml
@@ -5,4 +5,6 @@
        <Default Extension="txt" ContentType="text/plain"/>\r
        <Default Extension="xml" ContentType="text/xml"/>\r
        <Default Extension="zip" ContentType="application/octet-stream"/>\r
        <Default Extension="txt" ContentType="text/plain"/>\r
        <Default Extension="xml" ContentType="text/xml"/>\r
        <Default Extension="zip" ContentType="application/octet-stream"/>\r

+       <Default Extension="dll" ContentType="application/octet-stream" />\r
+       <Default Extension="pkgdef" ContentType="text/plain" />\r

 </Types>\r
 </Types>\r

diff --git a/LUFA/StudioIntegration/VSIX/extension.vsixmanifest b/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
index 3054ab1..ed20c2a 100644 (file)
--- a/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
+++ b/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
@@ -25,6 +25,7 @@
        <References/>\r
 \r
        <Content>\r
        <References/>\r
 \r
        <Content>\r

+               <VsPackage>LUFA.pkgdef</VsPackage>\r

                <CustomExtension Type="asf-manifest">asf-manifest.xml</CustomExtension>\r
        </Content>\r
 </Vsix>\r
                <CustomExtension Type="asf-manifest">asf-manifest.xml</CustomExtension>\r
        </Content>\r
 </Vsix>\r

diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index c47ddbe..fe9f681 100644 (file)
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -79,11 +79,13 @@ generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML)
        @cp $(LUFA_ROOT)/DoxygenPages/Images/LUFA.png $(LUFA_ROOT)/../Preview.png
        @cp $(LUFA_ROOT)/License.txt $(LUFA_ROOT)/../
        @cp "VSIX/[Content_Types].xml" $(LUFA_ROOT)/../
        @cp $(LUFA_ROOT)/DoxygenPages/Images/LUFA.png $(LUFA_ROOT)/../Preview.png
        @cp $(LUFA_ROOT)/License.txt $(LUFA_ROOT)/../
        @cp "VSIX/[Content_Types].xml" $(LUFA_ROOT)/../

+       @cp "Blob/LUFA.dll" $(LUFA_ROOT)/../
+       @cp "Blob/LUFA.pkgdef" $(LUFA_ROOT)/../

        @xsltproc --stringparam extension-version "$(EXT_VERSION_NUM)" XSLT/lufa_vsmanifest_transform.xslt VSIX/extension.vsixmanifest > $(LUFA_ROOT)/../extension.vsixmanifest
        @xsltproc --stringparam lufa-version "$(LUFA_VERSION_NUM)" XSLT/lufa_asfmanifest_transform.xslt VSIX/asf-manifest.xml > $(LUFA_ROOT)/../asf-manifest.xml
 
        @echo "Generating Atmel Studio VSIX Extension file..."
        @xsltproc --stringparam extension-version "$(EXT_VERSION_NUM)" XSLT/lufa_vsmanifest_transform.xslt VSIX/extension.vsixmanifest > $(LUFA_ROOT)/../extension.vsixmanifest
        @xsltproc --stringparam lufa-version "$(LUFA_VERSION_NUM)" XSLT/lufa_asfmanifest_transform.xslt VSIX/asf-manifest.xml > $(LUFA_ROOT)/../asf-manifest.xml
 
        @echo "Generating Atmel Studio VSIX Extension file..."

-       @cd $(LUFA_ROOT)/../ && zip $(EXT_VSIX_NAME) -q -9 contents.zip exampleProjects.xml content.xml.cache License.txt Preview.png PreviewThumb.png "[Content_Types].xml" extension.vsixmanifest asf-manifest.xml extension.xml
+       @cd $(LUFA_ROOT)/../ && zip $(EXT_VSIX_NAME) -q -9 contents.zip exampleProjects.xml content.xml.cache License.txt Preview.png PreviewThumb.png "[Content_Types].xml" extension.vsixmanifest asf-manifest.xml extension.xml LUFA.dll LUFA.pkgdef

        @echo "Atmel Studio VSIX Extension file generated."
 
 check_filenames: $(MODULE_OUTPUT_XML)
        @echo "Atmel Studio VSIX Extension file generated."
 
 check_filenames: $(MODULE_OUTPUT_XML)