Fix broken Atmel Studio blob - ensure Help menu items are correctly generated.

diff --git a/LUFA/StudioIntegration/Blob/Atmel.Studio.Services.Interfaces.dll b/LUFA/StudioIntegration/Blob/Atmel.Studio.Services.Interfaces.dll
new file mode 100644 (file)
index 0000000..67f975e
Binary files /dev/null and b/LUFA/StudioIntegration/Blob/Atmel.Studio.Services.Interfaces.dll differ

diff --git a/LUFA/StudioIntegration/Blob/LUFA.dll b/LUFA/StudioIntegration/Blob/LUFA.dll
index daca593..a57ad8a 100644 (file)
Binary files a/LUFA/StudioIntegration/Blob/LUFA.dll and b/LUFA/StudioIntegration/Blob/LUFA.dll differ

diff --git a/LUFA/StudioIntegration/Blob/LUFA.pkgdef b/LUFA/StudioIntegration/Blob/LUFA.pkgdef
index 36ef7e3..4188853 100644 (file)
Binary files a/LUFA/StudioIntegration/Blob/LUFA.pkgdef and b/LUFA/StudioIntegration/Blob/LUFA.pkgdef differ

diff --git a/LUFA/StudioIntegration/VSIX/extension.vsixmanifest b/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
index ed20c2a..2539a28 100644 (file)
--- a/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
+++ b/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 \r
 <Vsix xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="1.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">\r
 <?xml version="1.0" encoding="utf-8"?>\r
 \r
 <Vsix xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="1.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">\r

-       <Identifier Id="FourWalledCubicle.LUFA.0e160d5c-e331-48d9-850b-e0387912171b">\r
+       <Identifier Id="2cfcbce0-84cb-45dc-8315-cad3f82b9467">\r

                <Name>LUFA Library</Name>\r
                <Author>Dean Camera</Author>\r
                <Version>0</Version>\r
                <Name>LUFA Library</Name>\r
                <Author>Dean Camera</Author>\r
                <Version>0</Version>\r

diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index dff6e7c..58f4295 100644 (file)
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -83,13 +83,14 @@ generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML)
        @cp "VSIX/ASFWizard.png" $(LUFA_ROOT)/../
        @cp "VSIX/NewExampleWizard.png" $(LUFA_ROOT)/../
        @cp "VSIX/GettingStarted.htm" $(LUFA_ROOT)/../
        @cp "VSIX/ASFWizard.png" $(LUFA_ROOT)/../
        @cp "VSIX/NewExampleWizard.png" $(LUFA_ROOT)/../
        @cp "VSIX/GettingStarted.htm" $(LUFA_ROOT)/../

+       @cp "Blob/Atmel.Studio.Services.Interfaces.dll" $(LUFA_ROOT)/../

        @cp "Blob/LUFA.dll" $(LUFA_ROOT)/../
        @cp "Blob/LUFA.pkgdef" $(LUFA_ROOT)/../
        @xsltproc --stringparam extension-version "$(EXT_VERSION_NUM)" VSIX/lufa_vsmanifest_transform.xslt VSIX/extension.vsixmanifest > $(LUFA_ROOT)/../extension.vsixmanifest
        @xsltproc --stringparam lufa-version "$(LUFA_VERSION_NUM)" VSIX/lufa_asfmanifest_transform.xslt VSIX/asf-manifest.xml > $(LUFA_ROOT)/../asf-manifest.xml
 
        @echo "Generating Atmel Studio VSIX Extension file..."
        @cp "Blob/LUFA.dll" $(LUFA_ROOT)/../
        @cp "Blob/LUFA.pkgdef" $(LUFA_ROOT)/../
        @xsltproc --stringparam extension-version "$(EXT_VERSION_NUM)" VSIX/lufa_vsmanifest_transform.xslt VSIX/extension.vsixmanifest > $(LUFA_ROOT)/../extension.vsixmanifest
        @xsltproc --stringparam lufa-version "$(LUFA_VERSION_NUM)" VSIX/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" ASFExplorer.png ASFWizard.png NewExampleWizard.png GettingStarted.htm extension.vsixmanifest asf-manifest.xml extension.xml LUFA.dll LUFA.pkgdef
+       @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" ASFExplorer.png ASFWizard.png NewExampleWizard.png GettingStarted.htm extension.vsixmanifest asf-manifest.xml extension.xml LUFA.dll LUFA.pkgdef Atmel.Studio.Services.Interfaces.dll

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