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

Let's have branch id specified in just one place -> build.txt

Browse Source
This commit is contained in:
Maxim Shafirov
2011-09-30 14:07:00 +04:00
parent c8b0d91dbf
commit c4545e33cb
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/dist.gant
+1 -1
View File
@@ -64,7 +64,7 @@ target('default': 'The default target') {
ant.xmlproperty(file: appInfoFile(), collapseAttributes: "true")
layoutAll(
buildNumber: "IC-108.SNAPSHOT",
buildNumber: "IC-$snapshot",
version: "IdeaX",
system_selector: "IdeaIC${p("component.version.major")}",
system_selector_mac: "IntelliJIdea${p("component.version.major")}CE",
build/scripts/utils.gant
+11
View File
@@ -108,6 +108,17 @@ binding.setVariable("printUnusedModules", {Set<String> usedModules ->
requireProperty("home", guessHome())
String readSnapshotBuild() {
def file = new File("$home/community/build.txt")
if (!file.exists()) {
file = new File("$home/build.txt")
}
return file.readLines().get(0)
}
binding.setVariable("snapshot", readSnapshotBuild())
project.builder.buildInfoPrinter = new org.jetbrains.jps.teamcity.TeamcityBuildInfoPrinter()
project.builder.compressJars = false
platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java
+2 -2
View File
@@ -807,11 +807,11 @@ public class PluginManager {
ourBuildNumber = BuildNumber.fromString(FileUtil.loadFile(buildTxtFile).trim());
}
else {
ourBuildNumber = BuildNumber.fromString("108.SNAPSHOT");
ourBuildNumber = BuildNumber.fromString("999.SNAPSHOT");
}
}
catch (IOException e) {
ourBuildNumber = BuildNumber.fromString("108.SNAPSHOT");
ourBuildNumber = BuildNumber.fromString("999.SNAPSHOT");
}
}
}