MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 06:05:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

Update educational plugins paths in build info

Browse Source
This commit is contained in:
Valentina Kiryushkina
2016-01-27 12:16:43 +03:00
parent 177c0b274f
commit cc93aa0828
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-python/build/paths.nsi
+1 -1
View File
@@ -1,5 +1,5 @@
; Installer images
!define IMAGES_LOCATION "${COMMUNITY_DIR}\python\edu\build\resources"
!define IMAGES_LOCATION "${COMMUNITY_DIR}\python\educational-python\build\resources"
;!define LICENSE_FILE "${BASE_DIR}\python\license\PyCharm_Preview_License"
!define PRODUCT_PROPERTIES_FILE "${BASE_DIR}\out\pycharmEDU\layout\bin\idea.properties"
!define PRODUCT_VM_OPTIONS_NAME pycharm.exe.vmoptions
python/educational-python/build/pycharm_edu_build.gant
+8 -8
View File
@@ -25,7 +25,7 @@ requireProperty("buildNumber", requireProperty("build.number", snapshot))
setProperty("buildName", "EDU-$buildNumber")
setProperty("ch", "$home/community")
setProperty("pythonCommunityHome", "$ch/python")
setProperty("pythonEduHome", "$ch/python/edu")
setProperty("pythonEduHome", "$ch/python/educational-python")
// load ApplicationInfo.xml properties
ant.xmlproperty(file: "$pythonEduHome/resources/idea/PyCharmEduApplicationInfo.xml", collapseAttributes: "true")
@@ -49,7 +49,7 @@ private List<String> pycharmPlatformApiModules() {
private List pycharmImplementationModules() { //modules to put into pycharm.jar
return [platformImplementationModules, "dom-impl", "python-community", "python-community-ide-resources",
"python-ide-community", "python-community-configure", "python-educational", "python-openapi", "python-psi-api", "platform-main"].flatten()
"python-ide-community", "python-community-configure", "educational-python", "python-openapi", "python-psi-api", "platform-main"].flatten()
}
private List modules() {
@@ -205,8 +205,8 @@ public layoutEducational(String classesPath, Set usedJars) {
buildWinZip("${paths.artifacts}/pycharm${buildName}.zip", [paths.distAll, paths.distWin, "${paths.sandbox}/jdk.win"])
//EDU installation with a custom page dialog
ant.copy(file: "$ch/python/edu/build/desktop.ini", tofile: "${paths.sandbox}/nsiconf/desktop.ini", overwrite: "true")
ant.copy(file: "$ch/python/edu/build/customInstallActions.nsi", tofile: "${paths.sandbox}/nsiconf/customInstallActions.nsi", overwrite: "true")
ant.copy(file: "$ch/python/educational-python/build/desktop.ini", tofile: "${paths.sandbox}/nsiconf/desktop.ini", overwrite: "true")
ant.copy(file: "$ch/python/educational-python/build/customInstallActions.nsi", tofile: "${paths.sandbox}/nsiconf/customInstallActions.nsi", overwrite: "true")
buildNSIS([paths.distAll, paths.distWin],
"$pythonEduHome/build/strings.nsi", "$pythonEduHome/build/paths.nsi",
"pycharmEDU-", false, true, system_selector)
@@ -241,7 +241,7 @@ private layoutPlugins(layouts) {
}
private String appInfoFile() {
return "$home/out/pycharmEDU/classes/production/python-educational/idea/PyCharmEduApplicationInfo.xml"
return "$home/out/pycharmEDU/classes/production/educational-python/idea/PyCharmEduApplicationInfo.xml"
}
private layoutFull(Map args, String target, Set usedJars) {
@@ -275,8 +275,8 @@ private layoutFull(Map args, String target, Set usedJars) {
}
}
jar("educational.jar") {
module("educational")
jar("educational-core.jar") {
module("educational-core")
}
jar("pycharm-pydev.jar") {
@@ -434,7 +434,7 @@ private layoutMac(Map _args, String target) {
}
Map args = new HashMap(_args)
args.icns = "$pythonCommunityHome/edu/resources/PyCharmEdu.icns"
args.icns = "$pythonCommunityHome/educational-python/resources/PyCharmEdu.icns"
args.bundleIdentifier = "com.jetbrains.pycharm"
args.platform_prefix = "PyCharmEdu"
args.help_id = "PE"
python/educational-python/build/upload_pythonInfo.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<property name="password" value="4pawoMauoJjjlxpIl3XG"/>
<ftp server="${host}" action="send" binary="false" remotedir="updates" userid="${user}" password="${password}">
<fileset file="${home}/community/python/edu/build/python.txt"/>
<fileset file="${home}/community/python/educational-python/build/python.txt"/>
</ftp>
</target>