Merge remote-tracking branch 'origin/master'

This commit is contained in:
Alexey Kudravtsev
2013-09-23 17:59:25 +04:00
3 changed files with 2 additions and 21 deletions
+1 -19
View File
@@ -179,30 +179,12 @@ public layoutCommunity(String classesPath, Set usedJars) {
String tarRoot = isEap() ? "pycharm-community-$buildNumber" : "pycharm-community-${p("component.version.major")}.${p("component.version.minor")}"
buildTarGz(tarRoot, "$paths.artifacts/pycharmPC-${buildNumber}.tar", [paths.distAll, paths.distUnix])
String macAppRoot = isEap() ? "PyCharm Community Edition ${p("component.version.major")}.${p("component.version.minor")} EAP.app" : "PyCharm Community Edition.app"
String macAppRoot = isEap() ? "PyCharm CE ${p("component.version.major")}.${p("component.version.minor")} EAP.app" : "PyCharm CE.app"
buildMacZip(macAppRoot, "${paths.artifacts}/pycharmPC-${buildNumber}.sit", [paths.distAll], paths.distMac)
}
private layoutPlugins(layouts) {
dir("plugins") {
/*
layouts.layoutPlugin("django-db-config")
layouts.layoutPlugin("python-javascript-debugger")
layouts.layoutPlugin("remote-run") {
fileset(dir: "$home/plugins/remote-run/lib") {
include(name: "jediterm-0.2.jar")
}
}
layouts.layoutPlugin("python-remote-interpreter")
layouts.layoutPlugin("vagrant") {
fileset(dir: "$home/plugins/vagrant/lib") {
include(name: "jrubyparser-0.2.jar")
}
}
layouts.layoutPlugin("python-uml")
layouts.layoutPlugin("localization")
layouts.layoutPlugin("python-localization")
*/
layouts.layoutPlugin("rest")
layouts.layoutPlugin("python-rest")
/*
@@ -4,7 +4,6 @@
<version>VERSION</version>
<vendor>JetBrains</vendor>
<depends>com.intellij.modules.ultimate</depends>
<depends>com.intellij.modules.python</depends>
<depends>org.jetbrains.plugins.rest</depends>
@@ -6,7 +6,7 @@
<about url="/pycharm_core_about.png" logoX="300" logoY="265" logoW="75" logoH="30" foreground="ffffff" linkColor="fca11a"/>
<icon size32="/PyCharmCore32.png" size16="/PyCharmCore16.png" size32opaque="/PyCharmCore32.png" size12="/PyCharm_13.png" ico="PyCharmCore.ico"/>
<package code="__PACKAGE_CODE__"/>
<names product="PyCharm Core" fullname="PyCharm Core" script="charm"/>
<names product="PyCharm" fullname="PyCharm Community Edition" script="charm"/>
<install-over minbuild="0" maxbuild="0" version="1.x"/>
<welcome-screen logo-url="/pycharm_welcomeScreen.png" caption-url="/welcomeCaption.png" slogan-url="/developSlogan.png"/>