Mercurial Repositories > eric / file diff

diff -r 9458a3d45f27 -r 02afc7d22c41 E5XML/ProjectWriter.py
--- a/E5XML/ProjectWriter.py	Sat Apr 14 18:48:38 2018 +0200
+++ b/E5XML/ProjectWriter.py	Sun Apr 15 11:36:43 2018 +0200
@@ -14,7 +14,8 @@
 from E5Gui.E5Application import e5App
 
 from .XMLStreamWriterBase import XMLStreamWriterBase
-from .Config import projectFileFormatVersion, projectFileFormatVersionAlt
+from .Config import projectFileFormatVersion, projectFileFormatVersionProto, \
+    projectFileFormatVersionAlt
 
 import Preferences
 import Utilities
@@ -24,7 +25,6 @@
     """
     Class implementing the writer class for writing an XML project file.
     """
-    # TODO: add 'make' support
     def __init__(self, device, projectName):
         """
         Constructor
@@ -43,8 +43,10 @@
         """
         XMLStreamWriterBase.writeXML(self)
         
-        if self.pdata["PROTOCOLS"]:
+        if not e5App().getObject("Project").hasDefaultMakeParameters():
             fileFormatVersion = projectFileFormatVersion
+        elif self.pdata["PROTOCOLS"]:
+            fileFormatVersion = projectFileFormatVersionProto
         else:
             fileFormatVersion = projectFileFormatVersionAlt
         
@@ -215,6 +217,12 @@
                 self.writeAttribute("lexer", lexer)
             self.writeEndElement()
         
+        # do the 'make' parameters
+        if not e5App().getObject("Project").hasDefaultMakeParameters():
+            self.writeStartElement("Make")
+            self.writeBasics("MakeParameters", self.pdata["MAKEPARAMS"])
+            self.writeEndElement()
+        
         # do the extra project data stuff
         if len(self.pdata["PROJECTTYPESPECIFICDATA"]):
             self.writeStartElement("ProjectTypeSpecific")