Clean up Studio Integration cache generation script. Re-indent integration VSIX XML...

diff --git a/LUFA/StudioIntegration/VSIX/[Content_Types].xml b/LUFA/StudioIntegration/VSIX/[Content_Types].xml
index 87b2f8e..e54b61a 100644 (file)
--- a/LUFA/StudioIntegration/VSIX/[Content_Types].xml
+++ b/LUFA/StudioIntegration/VSIX/[Content_Types].xml
@@ -1,8 +1,8 @@
 <Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">\r
 <Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">\r

-  <Default Extension="vsixmanifest" ContentType="text/xml"/>\r
-  <Default Extension="cache" ContentType="text/xml"/>\r
-  <Default Extension="png" 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="vsixmanifest" ContentType="text/xml"/>\r
+       <Default Extension="cache" ContentType="text/xml"/>\r
+       <Default Extension="png" 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

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

diff --git a/LUFA/StudioIntegration/VSIX/asf-manifest.xml b/LUFA/StudioIntegration/VSIX/asf-manifest.xml
index e90e875..794fd68 100644 (file)
--- a/LUFA/StudioIntegration/VSIX/asf-manifest.xml
+++ b/LUFA/StudioIntegration/VSIX/asf-manifest.xml
@@ -1,18 +1,18 @@
 <AsfContentProvider Version="1.0.0">\r
 <AsfContentProvider Version="1.0.0">\r

-  <Identifier Id="0e160d5c-e331-48d9-850b-e0387912171b">\r
-    <Org>FourWalledCubicle</Org>\r
-    <ShortName>LUFA</ShortName>\r
-    <Author>Dean Camera</Author>\r
-    <Description/>\r
-    <FollowFolderStructure>True</FollowFolderStructure>\r
-  </Identifier>\r
-  <AsfContent Type="zip" Path="contents.zip">\r
-    <Content>\r
-      <Version>0</Version>\r
-      <HelpURL/>\r
-      <Locator/>\r
-      <DbXMLPath>content.xml.cache</DbXMLPath>\r
-      <Description/>\r
-    </Content>\r
-  </AsfContent>\r
+       <Identifier Id="0e160d5c-e331-48d9-850b-e0387912171b">\r
+               <Org>FourWalledCubicle</Org>\r
+               <ShortName>LUFA</ShortName>\r
+               <Author>Dean Camera</Author>\r
+               <Description/>\r
+               <FollowFolderStructure>True</FollowFolderStructure>\r
+       </Identifier>\r
+       <AsfContent Type="zip" Path="contents.zip">\r
+               <Content>\r
+                       <Version>0</Version>\r
+                       <HelpURL/>\r
+                       <Locator/>\r
+                       <DbXMLPath>content.xml.cache</DbXMLPath>\r
+                       <Description/>\r
+               </Content>\r
+       </AsfContent>\r

 </AsfContentProvider>\r
 </AsfContentProvider>\r

diff --git a/LUFA/StudioIntegration/generate_caches.py b/LUFA/StudioIntegration/generate_caches.py
index 9c70ebd..f5b6692 100644 (file)
--- a/LUFA/StudioIntegration/generate_caches.py
+++ b/LUFA/StudioIntegration/generate_caches.py
@@ -7,30 +7,32 @@
 """\r
 \r
 import sys\r
 """\r
 \r
 import sys\r

-import os\r

 sys.path.append("ProjectGenerator")\r
 \r
 \r
 sys.path.append("ProjectGenerator")\r
 \r
 \r

-def main():\r
+def show_message(message):\r
+       print "[Project Generator] %s" % message\r
+       sys.stdout.flush()\r
+\r
+\r
+def main(lufa_root_path):\r

        try:\r
                from asf_avrstudio5_interface import PythonFacade\r
        except ImportError:\r
                print "Fatal Error: The ASF project generator is missing."\r
                return 1\r
 \r
        try:\r
                from asf_avrstudio5_interface import PythonFacade\r
        except ImportError:\r
                print "Fatal Error: The ASF project generator is missing."\r
                return 1\r
 \r

-       p = PythonFacade(os.path.abspath(__file__))\r
+       p = PythonFacade(lufa_root_path)\r

 \r
 \r

-       print "[Project Generator] Checking database sanity..."\r
-       sys.stdout.flush()\r
-       p.check_extension_database_sanity(sys.argv[1])\r
+       show_message("Checking database sanity...")\r
+       p.check_extension_database_sanity(lufa_root_path)\r

 \r
 \r

-       print "[Project Generator] Building cache files..."\r
-       sys.stdout.flush()\r
-       p.generate_extension_cache_files(sys.argv[1])\r
+       show_message("Building cache files...")\r
+       p.generate_extension_cache_files(lufa_root_path)\r

 \r
 \r

-       print "[Project Generator] Cache files created."\r
+       show_message("Cache files created.")\r

        return 0\r
 \r
 \r
 if __name__ == "__main__":\r
        return 0\r
 \r
 \r
 if __name__ == "__main__":\r

-    sys.exit(main())\r
+    sys.exit(main(sys.argv[1]))\r