From 70121473b4eee4473c810cf48db6e5769eb670a2 Mon Sep 17 00:00:00 2001
From: "Vladimir.Orlov" <Vladimir.Orlov@jetbrains.com>
Date: Mon, 13 Jul 2015 19:12:54 +0300
Subject: [PATCH] fixed PyCharm EDU build

---
 python/edu/build/pycharm_edu_build.gant       |   2 +
 .../resources/META-INF/IdeTipsAndTricks.xml   | 129 ------------------
 python/edu/src/META-INF/PyCharmEduPlugin.xml  |   4 +-
 3 files changed, 4 insertions(+), 131 deletions(-)
 delete mode 100644 python/edu/resources/META-INF/IdeTipsAndTricks.xml

diff --git a/python/edu/build/pycharm_edu_build.gant b/python/edu/build/pycharm_edu_build.gant
index f21bd2065136..2907234141da 100644
--- a/python/edu/build/pycharm_edu_build.gant
+++ b/python/edu/build/pycharm_edu_build.gant
@@ -106,6 +106,8 @@ target('default': "Build artifacts") {
   if (!dryRun) {
     forceDelete(paths.sandbox)
     ant.mkdir(dir: paths.sandbox)
+    //Use IdeTipsAndTricks.xml of EDU version.
+    ant.delete(file: "${pythonCommunityHome}/src/META-INF/IdeTipsAndTricks.xml")
   }
 
   ant.tstamp() {
diff --git a/python/edu/resources/META-INF/IdeTipsAndTricks.xml b/python/edu/resources/META-INF/IdeTipsAndTricks.xml
deleted file mode 100644
index fdef342ecb9d..000000000000
--- a/python/edu/resources/META-INF/IdeTipsAndTricks.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<idea-plugin version="2">
-    <extensions defaultExtensionNs="com.intellij">
-        <tipAndTrick file="Welcome.html"/>
-        <tipAndTrick file="MultipleProjects.html"/>
-        <tipAndTrick file="AnnotationsAndDiffs.html"/>
-        <tipAndTrick file="CodeCompletionInSearch.html"/>
-        <tipAndTrick file="GoToClass.html"/>
-        <tipAndTrick file="CodeCompletion.html"/>
-        <tipAndTrick file="ClassNameCompletion.html"/>
-        <tipAndTrick file="FindUsages.html"/>
-        <tipAndTrick file="QuickJavaDoc.html"/>
-        <tipAndTrick file="GoToDeclaration.html"/>
-        <tipAndTrick file="FileStructurePopup.html"/>
-        <tipAndTrick file="Rename.html"/>
-        <tipAndTrick file="TabInLookups.html"/>
-        <tipAndTrick file="TabInEditorClose.html"/>
-        <tipAndTrick file="SelectIn.html"/>
-        <tipAndTrick file="SpeedSearch.html"/>
-        <tipAndTrick file="Escape.html"/>
-        <tipAndTrick file="CtrlW.html"/>
-        <tipAndTrick file="ExtractVariable.html"/>
-        <tipAndTrick file="CtrlD.html"/>
-        <tipAndTrick file="CtrlShiftI.html"/>
-        <tipAndTrick file="MoveUpDown.html"/>
-        <tipAndTrick file="JoinLines.html"/>
-        <tipAndTrick file="ParameterInfo.html"/>
-        <tipAndTrick file="JumpToLastEdit.html"/>
-        <tipAndTrick file="HighlightUsagesInFile.html"/>
-        <tipAndTrick file="LocalVCS.html"/>
-        <tipAndTrick file="RecentFiles.html"/>
-        <tipAndTrick file="MethodSeparators.html"/>
-        <tipAndTrick file="CodeCompletionMiddle.html"/>
-        <tipAndTrick file="MethodUpDown.html"/>
-        <tipAndTrick file="ClipboardStack.html"/>
-        <tipAndTrick file="QuickJavaDocInLookups.html"/>
-        <tipAndTrick file="OverrideImplementMethods.html"/>
-        <tipAndTrick file="MenuItemsDescriptions.html"/>
-        <tipAndTrick file="GoToSymbol.html"/>
-        <tipAndTrick file="RecentChanges.html"/>
-        <tipAndTrick file="RecentSearch.html"/>
-        <tipAndTrick file="ImageFileCompletion.html"/>
-        <tipAndTrick file="QuickSwitchScheme.html"/>
-        <tipAndTrick file="CamelPrefixesInNavigationPopups.html"/>
-        <tipAndTrick file="ColumnSelection.html"/>
-        <tipAndTrick file="PyColorFiles.html"/>
-        <tipAndTrick file="CopyWithNoSelection.html"/>
-        <tipAndTrick file="MoveToChangelist.html"/>
-        <tipAndTrick file="moveFileToChangelist.html"/>
-        <tipAndTrick file="ShowUsages.html"/>
-        <tipAndTrick file="GoToAction.html"/>
-        <tipAndTrick file="GoToInspection.html"/>
-        <tipAndTrick file="SearchInSettings.html"/>
-        <tipAndTrick file="SelectRunDebugConfiguration.html"/>
-        <tipAndTrick file="ShowAppliedStyles.html"/>
-        <tipAndTrick file="ImagesLookup.html"/>
-        <tipAndTrick file="RenameCssSelector.html"/>
-        <tipAndTrick file="ColorEditingInCss.html"/>
-        <tipAndTrick file="Spellchecker.html"/>
-        <tipAndTrick file="SpellcheckerDictionaries.html"/>
-        <tipAndTrick file="TagNameCompletion.html"/>
-        <tipAndTrick file="WildcardsInNavigationPopups.html"/>
-        <tipAndTrick file="VcsQuickList.html"/>
-        <tipAndTrick file="Comment.html"/>
-        <tipAndTrick file="NavBar.html"/>
-        <tipAndTrick file="ChangesView.html"/>
-        <tipAndTrick file="Surround.html"/>
-        <tipAndTrick file="Consoles.html"/>
-        <tipAndTrick file="ConsolesCodeCompletion.html"/>
-        <tipAndTrick file="ConsolesHistory.html"/>
-        <tipAndTrick file="QuickFixRightArrow.html"/>
-        <tipAndTrick file="NavigateToFilePath.html"/>
-        <tipAndTrick file="IssueNavigation.html"/>
-        <tipAndTrick file="Templates.html"/>
-        <tipAndTrick file="Switcher.html"/>
-        <tipAndTrick file="DragToOpen.html"/>
-        <tipAndTrick file="CloseOthers.html"/>
-        <tipAndTrick file="EnterDirectoryInGotoFile.html"/>
-        <tipAndTrick file="GotoLineInFile.html"/>
-        <tipAndTrick file="LineEndings.html"/>
-        <tipAndTrick file="LineEndingsFolder.html"/>
-        <tipAndTrick file="HierarchyBrowser.html"/>
-        <tipAndTrick file="ShowHideSideBars.html"/>
-        <tipAndTrick file="ExcludeFromProject.html"/>
-        <tipAndTrick file="CodeCompletionNoShift.html"/>
-        <tipAndTrick file="CommitCtrlK.html"/>
-        <tipAndTrick file="CompletionInHTML.html"/>
-        <tipAndTrick file="FindReplaceToggle.html"/>
-        <tipAndTrick file="ScopesInTODO.html"/>
-        <tipAndTrick file="SelectTasks.html"/>
-        <tipAndTrick file="RunConfigFolders.html"/>
-        <tipAndTrick file="LiveTemplatesDjango.html"/>
-        <tipAndTrick file="LiveTemplates.html"/>
-        <tipAndTrick file="SpeedSearchinLiveTemplates.html"/>
-        <tipAndTrick file="LaunchConsole.html"/>
-        <tipAndTrick file="Interpreter.html"/>
-        <tipAndTrick file="BreakpointSpeedmenu.html"/>
-        <tipAndTrick file="BuiltInServer.html"/>
-        <tipAndTrick file="ConfiguringTerminal.html"/>
-        <tipAndTrick file="Terminal.html"/>
-        <tipAndTrick file="SearchEverywhere.html"/>
-        <tipAndTrick file="WideScreen.html"/>
-        <tipAndTrick file="WordCompletion.html"/>
-        <tipAndTrick file="Reopen.html"/>
-        <tipAndTrick file="RefactorThis.html"/>
-        <tipAndTrick file="ToolWindowsQuickAccess.html"/>
-        <tipAndTrick file="CamelHumpsInCodeCompletion.html"/>
-        <tipAndTrick file="CancelByControlArrows.html"/>
-        <tipAndTrick file="ChangeSorting.html"/>
-        <tipAndTrick file="CheckRegExp.html"/>
-        <tipAndTrick file="CtrlDotInLookups.html"/>
-        <tipAndTrick file="HorizontalScrolling.html"/>
-        <tipAndTrick file="LiveTemplatesRestore.html"/>
-        <tipAndTrick file="Multicursor.html"/>
-        <tipAndTrick file="QuickDocInSuggestionList.html"/>
-        <tipAndTrick file="QuickDocOnMouseMove.html"/>
-        <tipAndTrick file="TerminalOpen.html"/>
-        <tipAndTrick file="ClosingTag.html"/>
-        <tipAndTrick file="DiffChevron.html"/>
-        <tipAndTrick file="DirDiff.html"/>
-        <tipAndTrick file="LensMode.html"/>
-        <tipAndTrick file="Multiselection1.html"/>
-        <tipAndTrick file="Multiselection2.html"/>
-        <tipAndTrick file="MultiselectionWords.html"/>
-        <tipAndTrick file="EditRegExp.html"/>
-        <tipAndTrick file="PrintKeywords.html"/>
-        <tipAndTrick file="RichTextCopy.html"/>
-        <tipAndTrick file="ScratchesView.html"/>
-    </extensions>
-</idea-plugin>
\ No newline at end of file
diff --git a/python/edu/src/META-INF/PyCharmEduPlugin.xml b/python/edu/src/META-INF/PyCharmEduPlugin.xml
index 2b7ffebf26dd..ca2eabde356d 100644
--- a/python/edu/src/META-INF/PyCharmEduPlugin.xml
+++ b/python/edu/src/META-INF/PyCharmEduPlugin.xml
@@ -12,10 +12,10 @@
     </component>
   </application-components>
 
+  <xi:include href="/META-INF/IdeTipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/pycharm-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
-
   <xi:include href="/META-INF/python-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
-
+  
   <application-components>
     <component>
       <implementation-class>com.jetbrains.python.edu.PyCharmEduInitialConfigurator</implementation-class>