Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric6.api	Thu Apr 19 19:28:02 2018 +0200
+++ b/APIs/Python3/eric6.api	Thu Apr 19 19:30:53 2018 +0200
@@ -501,6 +501,7 @@
 eric6.Debugger.DebugUI.DebugUI.compileResources?7
 eric6.Debugger.DebugUI.DebugUI.debuggingStarted?7
 eric6.Debugger.DebugUI.DebugUI.exceptionInterrupt?7
+eric6.Debugger.DebugUI.DebugUI.executeMake?7
 eric6.Debugger.DebugUI.DebugUI.getActions?4()
 eric6.Debugger.DebugUI.DebugUI.initActions?4()
 eric6.Debugger.DebugUI.DebugUI.initMenus?4()
@@ -1563,6 +1564,7 @@
 eric6.E5XML.Config.pluginRepositoryFileFormatVersion?7
 eric6.E5XML.Config.projectFileFormatVersion?7
 eric6.E5XML.Config.projectFileFormatVersionAlt?7
+eric6.E5XML.Config.projectFileFormatVersionProto?7
 eric6.E5XML.Config.sessionFileFormatVersion?7
 eric6.E5XML.Config.shortcutsFileFormatVersion?7
 eric6.E5XML.Config.tasksFileFormatVersion?7
@@ -4868,7 +4870,8 @@
 eric6.Plugins.UiExtensionPlugins.PipInterface.ConfigurationPage.PipPage.PipPage.on_defaultListButton_clicked?4()
 eric6.Plugins.UiExtensionPlugins.PipInterface.ConfigurationPage.PipPage.PipPage.save?4()
 eric6.Plugins.UiExtensionPlugins.PipInterface.ConfigurationPage.PipPage.PipPage?1(plugin)
-eric6.Plugins.UiExtensionPlugins.PipInterface.DefaultIndexUrl?7
+eric6.Plugins.UiExtensionPlugins.PipInterface.DefaultIndexUrlPip?7
+eric6.Plugins.UiExtensionPlugins.PipInterface.DefaultIndexUrlXml?7
 eric6.Plugins.UiExtensionPlugins.PipInterface.DefaultPyPiUrl?7
 eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.getMenu?4(name)
 eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.getMenuNames?4()
@@ -7768,6 +7771,9 @@
 eric6.Project.LexerAssociationDialog.LexerAssociationDialog.on_editorLexerList_itemClicked?4(itm, column)
 eric6.Project.LexerAssociationDialog.LexerAssociationDialog.transferData?4()
 eric6.Project.LexerAssociationDialog.LexerAssociationDialog?1(project, parent=None)
+eric6.Project.MakePropertiesDialog.MakePropertiesDialog.initDialog?4()
+eric6.Project.MakePropertiesDialog.MakePropertiesDialog.storeData?4()
+eric6.Project.MakePropertiesDialog.MakePropertiesDialog?1(project, new, parent=None)
 eric6.Project.NewDialogClassDialog.NewDialogClassDialog.getData?4()
 eric6.Project.NewDialogClassDialog.NewDialogClassDialog.on_classnameEdit_textChanged?4(text)
 eric6.Project.NewDialogClassDialog.NewDialogClassDialog.on_filenameEdit_textChanged?4(text)
@@ -7776,6 +7782,8 @@
 eric6.Project.NewPythonPackageDialog.NewPythonPackageDialog.getData?4()
 eric6.Project.NewPythonPackageDialog.NewPythonPackageDialog.on_packageEdit_textChanged?4(txt)
 eric6.Project.NewPythonPackageDialog.NewPythonPackageDialog?1(relPath, parent=None)
+eric6.Project.Project.Project.DefaultMake?7
+eric6.Project.Project.Project.DefaultMakefile?7
 eric6.Project.Project.Project.addDirectory?4(fileTypeFilter=None, startdir=None)
 eric6.Project.Project.Project.addE5Actions?4(actions)
 eric6.Project.Project.Project.addFiles?4(fileTypeFilter=None, startdir=None)
@@ -7794,6 +7802,8 @@
 eric6.Project.Project.Project.addUiDir?4()
 eric6.Project.Project.Project.addUiFiles?4()
 eric6.Project.Project.Project.appendFile?4(fn, isSourceFile=False, updateModel=True)
+eric6.Project.Project.Project.appendStderr?7
+eric6.Project.Project.Project.appendStdout?7
 eric6.Project.Project.Project.checkAllScriptsDirty?4(reportSyntaxErrors=False)
 eric6.Project.Project.Project.checkDirty?4()
 eric6.Project.Project.Project.checkLanguageFiles?4()
@@ -7813,6 +7823,7 @@
 eric6.Project.Project.Project.directoryRemoved?7
 eric6.Project.Project.Project.dirty?7
 eric6.Project.Project.Project.eols?7
+eric6.Project.Project.Project.executeMake?4()
 eric6.Project.Project.Project.getAbsolutePath?4(fn)
 eric6.Project.Project.Project.getAbsoluteUniversalPath?4(fn)
 eric6.Project.Project.Project.getActions?4()
@@ -7852,6 +7863,7 @@
 eric6.Project.Project.Project.getVcs?4()
 eric6.Project.Project.Project.handleApplicationDiagram?4()
 eric6.Project.Project.Project.handlePreferencesChanged?4()
+eric6.Project.Project.Project.hasDefaultMakeParameters?4()
 eric6.Project.Project.Project.hasEntry?4(fn)
 eric6.Project.Project.Project.hasProjectType?4(type_, progLanguage="")
 eric6.Project.Project.Project.initActions?4()
@@ -7862,6 +7874,7 @@
 eric6.Project.Project.Project.isDebugPropertiesLoaded?4()
 eric6.Project.Project.Project.isDirty?4()
 eric6.Project.Project.Project.isJavaScriptProject?4()
+eric6.Project.Project.Project.isMakeEnabled?4()
 eric6.Project.Project.Project.isMixedLanguageProject?4()
 eric6.Project.Project.Project.isOpen?4()
 eric6.Project.Project.Project.isProjectFile?4(fn)
@@ -8112,6 +8125,7 @@
 eric6.Project.PropertiesDialog.PropertiesDialog.on_languageComboBox_currentIndexChanged?4(language)
 eric6.Project.PropertiesDialog.PropertiesDialog.on_mainscriptPicker_aboutToShowPathPickerDialog?4()
 eric6.Project.PropertiesDialog.PropertiesDialog.on_mainscriptPicker_pathSelected?4(script)
+eric6.Project.PropertiesDialog.PropertiesDialog.on_makeButton_clicked?4()
 eric6.Project.PropertiesDialog.PropertiesDialog.on_spellPropertiesButton_clicked?4()
 eric6.Project.PropertiesDialog.PropertiesDialog.on_transPropertiesButton_clicked?4()
 eric6.Project.PropertiesDialog.PropertiesDialog.on_vcsInfoButton_clicked?4()

--- a/APIs/Python3/eric6.bas	Thu Apr 19 19:28:02 2018 +0200
+++ b/APIs/Python3/eric6.bas	Thu Apr 19 19:30:53 2018 +0200
@@ -580,6 +580,7 @@
 LogViewerEdit QTextEdit
 LogViewerPage ConfigurationPageBase Ui_LogViewerPage
 LoggingVisitor ast.NodeVisitor
+MakePropertiesDialog QDialog Ui_MakePropertiesDialog
 ManageDictionariesDialog QDialog Ui_ManageDictionariesDialog
 MarkdownProvider MarkupBase
 MasterPasswordEntryDialog QDialog Ui_MasterPasswordEntryDialog

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Thu Apr 19 19:28:02 2018 +0200
+++ b/Documentation/Help/source.qhp	Thu Apr 19 19:30:53 2018 +0200
@@ -974,6 +974,7 @@
             <section title="eric6.Project.DebuggerPropertiesDialog" ref="eric6.Project.DebuggerPropertiesDialog.html" />
             <section title="eric6.Project.FiletypeAssociationDialog" ref="eric6.Project.FiletypeAssociationDialog.html" />
             <section title="eric6.Project.LexerAssociationDialog" ref="eric6.Project.LexerAssociationDialog.html" />
+            <section title="eric6.Project.MakePropertiesDialog" ref="eric6.Project.MakePropertiesDialog.html" />
             <section title="eric6.Project.NewDialogClassDialog" ref="eric6.Project.NewDialogClassDialog.html" />
             <section title="eric6.Project.NewPythonPackageDialog" ref="eric6.Project.NewPythonPackageDialog.html" />
             <section title="eric6.Project.Project" ref="eric6.Project.Project.html" />
@@ -10787,6 +10788,12 @@
       <keyword name="LoginForm (Module)" id="LoginForm (Module)" ref="eric6.WebBrowser.Passwords.LoginForm.html" />
       <keyword name="LoginForm.isValid" id="LoginForm.isValid" ref="eric6.Helpviewer.Passwords.LoginForm.html#LoginForm.isValid" />
       <keyword name="LoginForm.isValid" id="LoginForm.isValid" ref="eric6.WebBrowser.Passwords.LoginForm.html#LoginForm.isValid" />
+      <keyword name="MakePropertiesDialog" id="MakePropertiesDialog" ref="eric6.Project.MakePropertiesDialog.html#MakePropertiesDialog" />
+      <keyword name="MakePropertiesDialog (Constructor)" id="MakePropertiesDialog (Constructor)" ref="eric6.Project.MakePropertiesDialog.html#MakePropertiesDialog.__init__" />
+      <keyword name="MakePropertiesDialog (Module)" id="MakePropertiesDialog (Module)" ref="eric6.Project.MakePropertiesDialog.html" />
+      <keyword name="MakePropertiesDialog.__updateOkButton" id="MakePropertiesDialog.__updateOkButton" ref="eric6.Project.MakePropertiesDialog.html#MakePropertiesDialog.__updateOkButton" />
+      <keyword name="MakePropertiesDialog.initDialog" id="MakePropertiesDialog.initDialog" ref="eric6.Project.MakePropertiesDialog.html#MakePropertiesDialog.initDialog" />
+      <keyword name="MakePropertiesDialog.storeData" id="MakePropertiesDialog.storeData" ref="eric6.Project.MakePropertiesDialog.html#MakePropertiesDialog.storeData" />
       <keyword name="ManageDictionariesDialog" id="ManageDictionariesDialog" ref="eric6.WebBrowser.SpellCheck.ManageDictionariesDialog.html#ManageDictionariesDialog" />
       <keyword name="ManageDictionariesDialog (Constructor)" id="ManageDictionariesDialog (Constructor)" ref="eric6.WebBrowser.SpellCheck.ManageDictionariesDialog.html#ManageDictionariesDialog.__init__" />
       <keyword name="ManageDictionariesDialog (Module)" id="ManageDictionariesDialog (Module)" ref="eric6.WebBrowser.SpellCheck.ManageDictionariesDialog.html" />
@@ -12446,17 +12453,22 @@
       <keyword name="Project.__binaryTranslationFile" id="Project.__binaryTranslationFile" ref="eric6.Project.Project.html#Project.__binaryTranslationFile" />
       <keyword name="Project.__checkFilesExist" id="Project.__checkFilesExist" ref="eric6.Project.Project.html#Project.__checkFilesExist" />
       <keyword name="Project.__checkProjectFileGroup" id="Project.__checkProjectFileGroup" ref="eric6.Project.Project.html#Project.__checkProjectFileGroup" />
+      <keyword name="Project.__cleanupMake" id="Project.__cleanupMake" ref="eric6.Project.Project.html#Project.__cleanupMake" />
       <keyword name="Project.__closeAllWindows" id="Project.__closeAllWindows" ref="eric6.Project.Project.html#Project.__closeAllWindows" />
       <keyword name="Project.__createSnapshotSource" id="Project.__createSnapshotSource" ref="eric6.Project.Project.html#Project.__createSnapshotSource" />
       <keyword name="Project.__createZipDirEntries" id="Project.__createZipDirEntries" ref="eric6.Project.Project.html#Project.__createZipDirEntries" />
       <keyword name="Project.__deleteDebugProperties" id="Project.__deleteDebugProperties" ref="eric6.Project.Project.html#Project.__deleteDebugProperties" />
       <keyword name="Project.__deleteSession" id="Project.__deleteSession" ref="eric6.Project.Project.html#Project.__deleteSession" />
       <keyword name="Project.__doSearchNewFiles" id="Project.__doSearchNewFiles" ref="eric6.Project.Project.html#Project.__doSearchNewFiles" />
+      <keyword name="Project.__executeMake" id="Project.__executeMake" ref="eric6.Project.Project.html#Project.__executeMake" />
       <keyword name="Project.__initData" id="Project.__initData" ref="eric6.Project.Project.html#Project.__initData" />
       <keyword name="Project.__initDebugProperties" id="Project.__initDebugProperties" ref="eric6.Project.Project.html#Project.__initDebugProperties" />
       <keyword name="Project.__initProjectTypes" id="Project.__initProjectTypes" ref="eric6.Project.Project.html#Project.__initProjectTypes" />
       <keyword name="Project.__loadDiagram" id="Project.__loadDiagram" ref="eric6.Project.Project.html#Project.__loadDiagram" />
       <keyword name="Project.__loadRecent" id="Project.__loadRecent" ref="eric6.Project.Project.html#Project.__loadRecent" />
+      <keyword name="Project.__makeFinished" id="Project.__makeFinished" ref="eric6.Project.Project.html#Project.__makeFinished" />
+      <keyword name="Project.__makeReadStdErr" id="Project.__makeReadStdErr" ref="eric6.Project.Project.html#Project.__makeReadStdErr" />
+      <keyword name="Project.__makeReadStdOut" id="Project.__makeReadStdOut" ref="eric6.Project.Project.html#Project.__makeReadStdOut" />
       <keyword name="Project.__openRecent" id="Project.__openRecent" ref="eric6.Project.Project.html#Project.__openRecent" />
       <keyword name="Project.__pluginCreateArchives" id="Project.__pluginCreateArchives" ref="eric6.Project.Project.html#Project.__pluginCreateArchives" />
       <keyword name="Project.__pluginCreatePkgList" id="Project.__pluginCreatePkgList" ref="eric6.Project.Project.html#Project.__pluginCreatePkgList" />
@@ -12478,6 +12490,7 @@
       <keyword name="Project.__showContextMenuChecks" id="Project.__showContextMenuChecks" ref="eric6.Project.Project.html#Project.__showContextMenuChecks" />
       <keyword name="Project.__showContextMenuDebugger" id="Project.__showContextMenuDebugger" ref="eric6.Project.Project.html#Project.__showContextMenuDebugger" />
       <keyword name="Project.__showContextMenuGraphics" id="Project.__showContextMenuGraphics" ref="eric6.Project.Project.html#Project.__showContextMenuGraphics" />
+      <keyword name="Project.__showContextMenuMake" id="Project.__showContextMenuMake" ref="eric6.Project.Project.html#Project.__showContextMenuMake" />
       <keyword name="Project.__showContextMenuPackagers" id="Project.__showContextMenuPackagers" ref="eric6.Project.Project.html#Project.__showContextMenuPackagers" />
       <keyword name="Project.__showContextMenuRecent" id="Project.__showContextMenuRecent" ref="eric6.Project.Project.html#Project.__showContextMenuRecent" />
       <keyword name="Project.__showContextMenuSession" id="Project.__showContextMenuSession" ref="eric6.Project.Project.html#Project.__showContextMenuSession" />
@@ -12530,6 +12543,7 @@
       <keyword name="Project.deleteDirectory" id="Project.deleteDirectory" ref="eric6.Project.Project.html#Project.deleteDirectory" />
       <keyword name="Project.deleteFile" id="Project.deleteFile" ref="eric6.Project.Project.html#Project.deleteFile" />
       <keyword name="Project.deleteLanguageFile" id="Project.deleteLanguageFile" ref="eric6.Project.Project.html#Project.deleteLanguageFile" />
+      <keyword name="Project.executeMake" id="Project.executeMake" ref="eric6.Project.Project.html#Project.executeMake" />
       <keyword name="Project.getAbsolutePath" id="Project.getAbsolutePath" ref="eric6.Project.Project.html#Project.getAbsolutePath" />
       <keyword name="Project.getAbsoluteUniversalPath" id="Project.getAbsoluteUniversalPath" ref="eric6.Project.Project.html#Project.getAbsoluteUniversalPath" />
       <keyword name="Project.getActions" id="Project.getActions" ref="eric6.Project.Project.html#Project.getActions" />
@@ -12569,6 +12583,7 @@
       <keyword name="Project.getVcs" id="Project.getVcs" ref="eric6.Project.Project.html#Project.getVcs" />
       <keyword name="Project.handleApplicationDiagram" id="Project.handleApplicationDiagram" ref="eric6.Project.Project.html#Project.handleApplicationDiagram" />
       <keyword name="Project.handlePreferencesChanged" id="Project.handlePreferencesChanged" ref="eric6.Project.Project.html#Project.handlePreferencesChanged" />
+      <keyword name="Project.hasDefaultMakeParameters" id="Project.hasDefaultMakeParameters" ref="eric6.Project.Project.html#Project.hasDefaultMakeParameters" />
       <keyword name="Project.hasEntry" id="Project.hasEntry" ref="eric6.Project.Project.html#Project.hasEntry" />
       <keyword name="Project.hasProjectType" id="Project.hasProjectType" ref="eric6.Project.Project.html#Project.hasProjectType" />
       <keyword name="Project.initActions" id="Project.initActions" ref="eric6.Project.Project.html#Project.initActions" />
@@ -12579,6 +12594,7 @@
       <keyword name="Project.isDebugPropertiesLoaded" id="Project.isDebugPropertiesLoaded" ref="eric6.Project.Project.html#Project.isDebugPropertiesLoaded" />
       <keyword name="Project.isDirty" id="Project.isDirty" ref="eric6.Project.Project.html#Project.isDirty" />
       <keyword name="Project.isJavaScriptProject" id="Project.isJavaScriptProject" ref="eric6.Project.Project.html#Project.isJavaScriptProject" />
+      <keyword name="Project.isMakeEnabled" id="Project.isMakeEnabled" ref="eric6.Project.Project.html#Project.isMakeEnabled" />
       <keyword name="Project.isMixedLanguageProject" id="Project.isMixedLanguageProject" ref="eric6.Project.Project.html#Project.isMixedLanguageProject" />
       <keyword name="Project.isOpen" id="Project.isOpen" ref="eric6.Project.Project.html#Project.isOpen" />
       <keyword name="Project.isProjectFile" id="Project.isProjectFile" ref="eric6.Project.Project.html#Project.isProjectFile" />
@@ -12991,6 +13007,7 @@
       <keyword name="PropertiesDialog.on_languageComboBox_currentIndexChanged" id="PropertiesDialog.on_languageComboBox_currentIndexChanged" ref="eric6.Project.PropertiesDialog.html#PropertiesDialog.on_languageComboBox_currentIndexChanged" />
       <keyword name="PropertiesDialog.on_mainscriptPicker_aboutToShowPathPickerDialog" id="PropertiesDialog.on_mainscriptPicker_aboutToShowPathPickerDialog" ref="eric6.Project.PropertiesDialog.html#PropertiesDialog.on_mainscriptPicker_aboutToShowPathPickerDialog" />
       <keyword name="PropertiesDialog.on_mainscriptPicker_pathSelected" id="PropertiesDialog.on_mainscriptPicker_pathSelected" ref="eric6.Project.PropertiesDialog.html#PropertiesDialog.on_mainscriptPicker_pathSelected" />
+      <keyword name="PropertiesDialog.on_makeButton_clicked" id="PropertiesDialog.on_makeButton_clicked" ref="eric6.Project.PropertiesDialog.html#PropertiesDialog.on_makeButton_clicked" />
       <keyword name="PropertiesDialog.on_spellPropertiesButton_clicked" id="PropertiesDialog.on_spellPropertiesButton_clicked" ref="eric6.Project.PropertiesDialog.html#PropertiesDialog.on_spellPropertiesButton_clicked" />
       <keyword name="PropertiesDialog.on_transPropertiesButton_clicked" id="PropertiesDialog.on_transPropertiesButton_clicked" ref="eric6.Project.PropertiesDialog.html#PropertiesDialog.on_transPropertiesButton_clicked" />
       <keyword name="PropertiesDialog.on_vcsInfoButton_clicked" id="PropertiesDialog.on_vcsInfoButton_clicked" ref="eric6.Project.PropertiesDialog.html#PropertiesDialog.on_vcsInfoButton_clicked" />
@@ -19934,6 +19951,7 @@
       <file>eric6.Project.DebuggerPropertiesDialog.html</file>
       <file>eric6.Project.FiletypeAssociationDialog.html</file>
       <file>eric6.Project.LexerAssociationDialog.html</file>
+      <file>eric6.Project.MakePropertiesDialog.html</file>
       <file>eric6.Project.NewDialogClassDialog.html</file>
       <file>eric6.Project.NewPythonPackageDialog.html</file>
       <file>eric6.Project.Project.html</file>

--- a/Documentation/Source/eric6.Debugger.DebugUI.html	Thu Apr 19 19:28:02 2018 +0200
+++ b/Documentation/Source/eric6.Debugger.DebugUI.html	Thu Apr 19 19:30:53 2018 +0200
@@ -67,6 +67,10 @@
 <dd>
 emitted after the execution was interrupted
         by an exception and acknowledged by the user
+</dd><dt>executeMake()</dt>
+<dd>
+emitted if a project specific make run should be
+        performed
 </dd><dt>resetUI()</dt>
 <dd>
 emitted to reset the UI

--- a/Documentation/Source/eric6.E5XML.Config.html	Thu Apr 19 19:28:02 2018 +0200
+++ b/Documentation/Source/eric6.E5XML.Config.html	Thu Apr 19 19:30:53 2018 +0200
@@ -25,7 +25,7 @@
 </p>
 <h3>Global Attributes</h3>
 <table>
-<tr><td>debuggerPropertiesFileFormatVersion</td></tr><tr><td>dictionariesListFileFormatVersion</td></tr><tr><td>highlightingStylesFileFormatVersion</td></tr><tr><td>multiProjectFileFormatVersion</td></tr><tr><td>pluginRepositoryFileFormatVersion</td></tr><tr><td>projectFileFormatVersion</td></tr><tr><td>projectFileFormatVersionAlt</td></tr><tr><td>sessionFileFormatVersion</td></tr><tr><td>shortcutsFileFormatVersion</td></tr><tr><td>tasksFileFormatVersion</td></tr><tr><td>templatesFileFormatVersion</td></tr><tr><td>userProjectFileFormatVersion</td></tr>
+<tr><td>debuggerPropertiesFileFormatVersion</td></tr><tr><td>dictionariesListFileFormatVersion</td></tr><tr><td>highlightingStylesFileFormatVersion</td></tr><tr><td>multiProjectFileFormatVersion</td></tr><tr><td>pluginRepositoryFileFormatVersion</td></tr><tr><td>projectFileFormatVersion</td></tr><tr><td>projectFileFormatVersionAlt</td></tr><tr><td>projectFileFormatVersionProto</td></tr><tr><td>sessionFileFormatVersion</td></tr><tr><td>shortcutsFileFormatVersion</td></tr><tr><td>tasksFileFormatVersion</td></tr><tr><td>templatesFileFormatVersion</td></tr><tr><td>userProjectFileFormatVersion</td></tr>
 </table>
 <h3>Classes</h3>
 <table>

--- a/Documentation/Source/eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.html	Thu Apr 19 19:28:02 2018 +0200
+++ b/Documentation/Source/eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.html	Thu Apr 19 19:30:53 2018 +0200
@@ -414,18 +414,23 @@
         The selected pip executable is called with the given arguments and
         waited for its end.
 </p><dl>
-<dt><i>args</i></dt>
+<dt><i>args</i> (list of str)</dt>
 <dd>
-list of command line arguments (list of string)
-</dd><dt><i>cmd</i></dt>
+list of command line arguments
+</dd><dt><i>cmd</i> (str)</dt>
 <dd>
-pip command to be used (string)
+pip executable to be used
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
 tuple containing a flag indicating success and the output
-            of the process (string)
+            of the process
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+tuple of (bool, str)
 </dd>
 </dl><a NAME="Pip.uninstallPackages" ID="Pip.uninstallPackages"></a>
 <h4>Pip.uninstallPackages</h4>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.Project.MakePropertiesDialog.html	Thu Apr 19 19:30:53 2018 +0200
@@ -0,0 +1,111 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.Project.MakePropertiesDialog</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric6.Project.MakePropertiesDialog</h1>
+<p>
+Module implementing a dialog to enter the properties for 'make'.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#MakePropertiesDialog">MakePropertiesDialog</a></td>
+<td>Class implementing a dialog to enter the properties for 'make'.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr /><hr />
+<a NAME="MakePropertiesDialog" ID="MakePropertiesDialog"></a>
+<h2>MakePropertiesDialog</h2>
+<p>
+    Class implementing a dialog to enter the properties for 'make'.
+</p>
+<h3>Derived from</h3>
+QDialog, Ui_MakePropertiesDialog
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#MakePropertiesDialog.__init__">MakePropertiesDialog</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#MakePropertiesDialog.__updateOkButton">__updateOkButton</a></td>
+<td>Private slot to update the enabled state of the OK button.</td>
+</tr><tr>
+<td><a href="#MakePropertiesDialog.initDialog">initDialog</a></td>
+<td>Public method to initialize the dialog's data.</td>
+</tr><tr>
+<td><a href="#MakePropertiesDialog.storeData">storeData</a></td>
+<td>Public method to store the entered/modified data.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="MakePropertiesDialog.__init__" ID="MakePropertiesDialog.__init__"></a>
+<h4>MakePropertiesDialog (Constructor)</h4>
+<b>MakePropertiesDialog</b>(<i>project, new, parent=None</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>project</i> (Project)</dt>
+<dd>
+reference to the project object
+</dd><dt><i>new</i> (bool)</dt>
+<dd>
+flag indicating the generation of a new project
+</dd><dt><i>parent</i> (QWidget)</dt>
+<dd>
+reference to the parent widget of this dialog
+</dd>
+</dl><a NAME="MakePropertiesDialog.__updateOkButton" ID="MakePropertiesDialog.__updateOkButton"></a>
+<h4>MakePropertiesDialog.__updateOkButton</h4>
+<b>__updateOkButton</b>(<i></i>)
+<p>
+        Private slot to update the enabled state of the OK button.
+</p><a NAME="MakePropertiesDialog.initDialog" ID="MakePropertiesDialog.initDialog"></a>
+<h4>MakePropertiesDialog.initDialog</h4>
+<b>initDialog</b>(<i></i>)
+<p>
+        Public method to initialize the dialog's data.
+</p><a NAME="MakePropertiesDialog.storeData" ID="MakePropertiesDialog.storeData"></a>
+<h4>MakePropertiesDialog.storeData</h4>
+<b>storeData</b>(<i></i>)
+<p>
+        Public method to store the entered/modified data.
+</p>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file

--- a/Documentation/Source/eric6.Project.Project.html	Thu Apr 19 19:28:02 2018 +0200
+++ b/Documentation/Source/eric6.Project.Project.html	Thu Apr 19 19:30:53 2018 +0200
@@ -45,7 +45,15 @@
     Class implementing the project management functionality.
 </p><h3>Signals</h3>
 <dl>
-<dt>completeRepopulateItem(str)</dt>
+<dt>appendStderr(str)</dt>
+<dd>
+emitted after something was received from
+        a QProcess on stderr
+</dd><dt>appendStdout(str)</dt>
+<dd>
+emitted after something was received from
+        a QProcess on stdout
+</dd><dt>completeRepopulateItem(str)</dt>
 <dd>
 emitted after an item of the model was
         repopulated
@@ -179,7 +187,7 @@
 QObject
 <h3>Class Attributes</h3>
 <table>
-<tr><td>eols</td></tr>
+<tr><td>DefaultMake</td></tr><tr><td>DefaultMakefile</td></tr><tr><td>eols</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>
@@ -206,6 +214,9 @@
 <td><a href="#Project.__checkProjectFileGroup">__checkProjectFileGroup</a></td>
 <td>Private method to check, if a file is in a specific file group of the project.</td>
 </tr><tr>
+<td><a href="#Project.__cleanupMake">__cleanupMake</a></td>
+<td>Private method to clean up make related stuff.</td>
+</tr><tr>
 <td><a href="#Project.__closeAllWindows">__closeAllWindows</a></td>
 <td>Private method to close all project related windows.</td>
 </tr><tr>
@@ -224,6 +235,9 @@
 <td><a href="#Project.__doSearchNewFiles">__doSearchNewFiles</a></td>
 <td>Private method to search for new files in the project directory.</td>
 </tr><tr>
+<td><a href="#Project.__executeMake">__executeMake</a></td>
+<td>Private method to execute a project specific make run.</td>
+</tr><tr>
 <td><a href="#Project.__initData">__initData</a></td>
 <td>Private method to initialize the project data part.</td>
 </tr><tr>
@@ -239,6 +253,15 @@
 <td><a href="#Project.__loadRecent">__loadRecent</a></td>
 <td>Private method to load the recently opened project filenames.</td>
 </tr><tr>
+<td><a href="#Project.__makeFinished">__makeFinished</a></td>
+<td>Private slot handling the make process finished signal.</td>
+</tr><tr>
+<td><a href="#Project.__makeReadStdErr">__makeReadStdErr</a></td>
+<td>Private slot to process process output received via stderr.</td>
+</tr><tr>
+<td><a href="#Project.__makeReadStdOut">__makeReadStdOut</a></td>
+<td>Private slot to process process output received via stdout.</td>
+</tr><tr>
 <td><a href="#Project.__openRecent">__openRecent</a></td>
 <td>Private method to open a project from the list of rencently opened projects.</td>
 </tr><tr>
@@ -302,6 +325,9 @@
 <td><a href="#Project.__showContextMenuGraphics">__showContextMenuGraphics</a></td>
 <td>Private slot called before the graphics menu is shown.</td>
 </tr><tr>
+<td><a href="#Project.__showContextMenuMake">__showContextMenuMake</a></td>
+<td>Private slot called before the make menu is shown.</td>
+</tr><tr>
 <td><a href="#Project.__showContextMenuPackagers">__showContextMenuPackagers</a></td>
 <td>Private slot called before the packagers menu is shown.</td>
 </tr><tr>
@@ -458,6 +484,9 @@
 <td><a href="#Project.deleteLanguageFile">deleteLanguageFile</a></td>
 <td>Public slot to delete a translation from the project directory.</td>
 </tr><tr>
+<td><a href="#Project.executeMake">executeMake</a></td>
+<td>Public slot to execute a project specific make run (auto-run) (execute or question).</td>
+</tr><tr>
 <td><a href="#Project.getAbsolutePath">getAbsolutePath</a></td>
 <td>Public method to convert a project relative file path to an absolute file path.</td>
 </tr><tr>
@@ -575,6 +604,9 @@
 <td><a href="#Project.handlePreferencesChanged">handlePreferencesChanged</a></td>
 <td>Public slot used to handle the preferencesChanged signal.</td>
 </tr><tr>
+<td><a href="#Project.hasDefaultMakeParameters">hasDefaultMakeParameters</a></td>
+<td>Private method to test, if the project contains the default make parameters.</td>
+</tr><tr>
 <td><a href="#Project.hasEntry">hasEntry</a></td>
 <td>Public method to check the project for a file.</td>
 </tr><tr>
@@ -605,6 +637,9 @@
 <td><a href="#Project.isJavaScriptProject">isJavaScriptProject</a></td>
 <td>Public method to check, if this project is a JavaScript project.</td>
 </tr><tr>
+<td><a href="#Project.isMakeEnabled">isMakeEnabled</a></td>
+<td>Public method to test, if make is enabled for the project.</td>
+</tr><tr>
 <td><a href="#Project.isMixedLanguageProject">isMixedLanguageProject</a></td>
 <td>Public method to check, if this is a mixed language project.</td>
 </tr><tr>
@@ -840,7 +875,12 @@
 <dd>
 flag indicating membership (boolean)
 </dd>
-</dl><a NAME="Project.__closeAllWindows" ID="Project.__closeAllWindows"></a>
+</dl><a NAME="Project.__cleanupMake" ID="Project.__cleanupMake"></a>
+<h4>Project.__cleanupMake</h4>
+<b>__cleanupMake</b>(<i></i>)
+<p>
+        Private method to clean up make related stuff.
+</p><a NAME="Project.__closeAllWindows" ID="Project.__closeAllWindows"></a>
 <h4>Project.__closeAllWindows</h4>
 <b>__closeAllWindows</b>(<i></i>)
 <p>
@@ -907,6 +947,20 @@
 flag indicating whether this method was
                 requested by the user via a menu action (boolean)
 </dd>
+</dl><a NAME="Project.__executeMake" ID="Project.__executeMake"></a>
+<h4>Project.__executeMake</h4>
+<b>__executeMake</b>(<i>questionOnly=False, interactive=True</i>)
+<p>
+        Private method to execute a project specific make run.
+</p><dl>
+<dt><i>questionOnly</i> (bool)</dt>
+<dd>
+flag indicating to ask make for changes only
+</dd><dt><i>interactive</i> (bool)</dt>
+<dd>
+flag indicating an interactive invocation (i.e.
+            through a menu action)
+</dd>
 </dl><a NAME="Project.__initData" ID="Project.__initData"></a>
 <h4>Project.__initData</h4>
 <b>__initData</b>(<i></i>)
@@ -932,6 +986,36 @@
 <b>__loadRecent</b>(<i></i>)
 <p>
         Private method to load the recently opened project filenames.
+</p><a NAME="Project.__makeFinished" ID="Project.__makeFinished"></a>
+<h4>Project.__makeFinished</h4>
+<b>__makeFinished</b>(<i>exitCode, exitStatus, questionOnly, interactive=True</i>)
+<p>
+        Private slot handling the make process finished signal.
+</p><dl>
+<dt><i>exitCode</i> (int)</dt>
+<dd>
+exit code of the make process
+</dd><dt><i>exitStatus</i> (QProcess.ExitStatus)</dt>
+<dd>
+exit status of the make process
+</dd><dt><i>questionOnly</i> (bool)</dt>
+<dd>
+flag indicating a test only run
+</dd><dt><i>interactive</i> (bool)</dt>
+<dd>
+flag indicating an interactive invocation (i.e.
+            through a menu action)
+</dd>
+</dl><a NAME="Project.__makeReadStdErr" ID="Project.__makeReadStdErr"></a>
+<h4>Project.__makeReadStdErr</h4>
+<b>__makeReadStdErr</b>(<i></i>)
+<p>
+        Private slot to process process output received via stderr.
+</p><a NAME="Project.__makeReadStdOut" ID="Project.__makeReadStdOut"></a>
+<h4>Project.__makeReadStdOut</h4>
+<b>__makeReadStdOut</b>(<i></i>)
+<p>
+        Private slot to process process output received via stdout.
 </p><a NAME="Project.__openRecent" ID="Project.__openRecent"></a>
 <h4>Project.__openRecent</h4>
 <b>__openRecent</b>(<i>act</i>)
@@ -1100,6 +1184,11 @@
 <b>__showContextMenuGraphics</b>(<i></i>)
 <p>
         Private slot called before the graphics menu is shown.
+</p><a NAME="Project.__showContextMenuMake" ID="Project.__showContextMenuMake"></a>
+<h4>Project.__showContextMenuMake</h4>
+<b>__showContextMenuMake</b>(<i></i>)
+<p>
+        Private slot called before the make menu is shown.
 </p><a NAME="Project.__showContextMenuPackagers" ID="Project.__showContextMenuPackagers"></a>
 <h4>Project.__showContextMenuPackagers</h4>
 <b>__showContextMenuPackagers</b>(<i></i>)
@@ -1526,7 +1615,13 @@
 <dd>
 the translation file to be removed (string)
 </dd>
-</dl><a NAME="Project.getAbsolutePath" ID="Project.getAbsolutePath"></a>
+</dl><a NAME="Project.executeMake" ID="Project.executeMake"></a>
+<h4>Project.executeMake</h4>
+<b>executeMake</b>(<i></i>)
+<p>
+        Public slot to execute a project specific make run (auto-run)
+        (execute or question).
+</p><a NAME="Project.getAbsolutePath" ID="Project.getAbsolutePath"></a>
 <h4>Project.getAbsolutePath</h4>
 <b>getAbsolutePath</b>(<i>fn</i>)
 <p>
@@ -2034,7 +2129,23 @@
 <b>handlePreferencesChanged</b>(<i></i>)
 <p>
         Public slot used to handle the preferencesChanged signal.
-</p><a NAME="Project.hasEntry" ID="Project.hasEntry"></a>
+</p><a NAME="Project.hasDefaultMakeParameters" ID="Project.hasDefaultMakeParameters"></a>
+<h4>Project.hasDefaultMakeParameters</h4>
+<b>hasDefaultMakeParameters</b>(<i></i>)
+<p>
+        Private method to test, if the project contains the default make
+        parameters.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating default parameter set
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl><a NAME="Project.hasEntry" ID="Project.hasEntry"></a>
 <h4>Project.hasEntry</h4>
 <b>hasEntry</b>(<i>fn</i>)
 <p>
@@ -2154,6 +2265,21 @@
 <dd>
 flag indicating a JavaScript project (boolean)
 </dd>
+</dl><a NAME="Project.isMakeEnabled" ID="Project.isMakeEnabled"></a>
+<h4>Project.isMakeEnabled</h4>
+<b>isMakeEnabled</b>(<i></i>)
+<p>
+        Public method to test, if make is enabled for the project.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating enabled make support
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
 </dl><a NAME="Project.isMixedLanguageProject" ID="Project.isMixedLanguageProject"></a>
 <h4>Project.isMixedLanguageProject</h4>
 <b>isMixedLanguageProject</b>(<i></i>)

--- a/Documentation/Source/eric6.Project.PropertiesDialog.html	Thu Apr 19 19:28:02 2018 +0200
+++ b/Documentation/Source/eric6.Project.PropertiesDialog.html	Thu Apr 19 19:30:53 2018 +0200
@@ -78,6 +78,9 @@
 <td><a href="#PropertiesDialog.on_mainscriptPicker_pathSelected">on_mainscriptPicker_pathSelected</a></td>
 <td>Private slot to check the selected main script name.</td>
 </tr><tr>
+<td><a href="#PropertiesDialog.on_makeButton_clicked">on_makeButton_clicked</a></td>
+<td>Private slot to display the make properties dialog.</td>
+</tr><tr>
 <td><a href="#PropertiesDialog.on_spellPropertiesButton_clicked">on_spellPropertiesButton_clicked</a></td>
 <td>Private slot to display the spelling properties dialog.</td>
 </tr><tr>
@@ -170,7 +173,12 @@
 <dd>
 name of the main script
 </dd>
-</dl><a NAME="PropertiesDialog.on_spellPropertiesButton_clicked" ID="PropertiesDialog.on_spellPropertiesButton_clicked"></a>
+</dl><a NAME="PropertiesDialog.on_makeButton_clicked" ID="PropertiesDialog.on_makeButton_clicked"></a>
+<h4>PropertiesDialog.on_makeButton_clicked</h4>
+<b>on_makeButton_clicked</b>(<i></i>)
+<p>
+        Private slot to display the make properties dialog.
+</p><a NAME="PropertiesDialog.on_spellPropertiesButton_clicked" ID="PropertiesDialog.on_spellPropertiesButton_clicked"></a>
 <h4>PropertiesDialog.on_spellPropertiesButton_clicked</h4>
 <b>on_spellPropertiesButton_clicked</b>(<i></i>)
 <p>

--- a/Documentation/Source/index-eric6.Project.html	Thu Apr 19 19:28:02 2018 +0200
+++ b/Documentation/Source/index-eric6.Project.html	Thu Apr 19 19:30:53 2018 +0200
@@ -59,6 +59,9 @@
 <td><a href="eric6.Project.LexerAssociationDialog.html">LexerAssociationDialog</a></td>
 <td>Module implementing a dialog to enter lexer associations for the project.</td>
 </tr><tr>
+<td><a href="eric6.Project.MakePropertiesDialog.html">MakePropertiesDialog</a></td>
+<td>Module implementing a dialog to enter the properties for 'make'.</td>
+</tr><tr>
 <td><a href="eric6.Project.NewDialogClassDialog.html">NewDialogClassDialog</a></td>
 <td>Module implementing a dialog to enter the data for a new dialog class file.</td>
 </tr><tr>