include new Windows launcher in community dist

This commit is contained in:
Dmitry Jemerov
2013-03-28 20:49:40 +01:00
parent 37678a64e6
commit e39b153ccf
7 changed files with 43 additions and 1 deletions
Binary file not shown.
Binary file not shown.
+1
View File
@@ -0,0 +1 @@
IDS_JDK_ONLY=true
Binary file not shown.
+7 -1
View File
@@ -130,7 +130,10 @@ def layoutAll(Map args, String home, String out, Paths _paths = null, buildJps =
buildWinZip("$paths.artifacts/idea${args.buildNumber}.win.zip", [paths.distAll, paths.distWin])
def macAppRoot = isEap() ? "${p("component.version.codename")}-${args.buildNumber}.app" : "IntelliJ IDEA ${p("component.version.major")} CE.app"
buildMacZip(macAppRoot, "$paths.artifacts/idea${args.buildNumber}.mac.zip", [paths.distAll], paths.distMac)
String macZip = "$paths.artifacts/idea${args.buildNumber}.mac.zip"
buildMacZip(macAppRoot, macZip, [paths.distAll], paths.distMac)
notifyArtifactBuilt(macZIp)
buildTarGz("idea-${args.buildNumber}", "$paths.artifacts/idea${args.buildNumber}.tar", [paths.distAll, paths.distUnix])
}
@@ -148,6 +151,9 @@ private layoutWin(Map args, String home, Paths paths) {
winScripts(target, home, "idea.bat", args)
winVMOptions(target, null, "idea.exe", "idea64.exe")
String launcherProperties = "$home/build/conf/ideaCE-launcher.properties"
buildWinLauncher(home, "$home/bin/WinLauncher/WinLauncher.exe", "$target/bin/idea.exe", appInfoFile(), launcherProperties)
buildWinLauncher(home, "$home/bin/WinLauncher/WinLauncher64.exe", "$target/bin/idea64.exe", appInfoFile(), launcherProperties)
}
private layoutMac(Map _args, String home, Paths paths) {
+19
View File
@@ -726,3 +726,22 @@ private void fixIdeaPropertiesEol(List paths, String eol) {
}
}
}
binding.setVariable("buildWinLauncher", { String ch, String inputPath, String outputPath, String appInfo, String launcherProperties ->
projectBuilder.stage("winLauncher")
ant.java(jar: "$ch/build/lib/launcher-generator.jar", fork: "true") {
arg(value: inputPath)
arg(value: appInfo)
arg(value: "$ch/native/WinLauncher/WinLauncher/resource.h")
arg(value: launcherProperties)
arg(value: outputPath)
classpath {
fileset(dir: "$ch/lib") {
include(name: "guava*.jar")
include(name: "jdom.jar")
include(name: "sanselan*.jar")
}
}
}
})
@@ -0,0 +1,16 @@
<component name="ArtifactManager">
<artifact name="launcher-generator:jar">
<output-path>$PROJECT_DIR$/out/artifacts/launcher_generator_jar</output-path>
<root id="root">
<element id="archive" name="launcher-generator.jar">
<element id="directory" name="META-INF">
<element id="file-copy" path="$PROJECT_DIR$/src/META-INF/MANIFEST.MF" />
</element>
<element id="module-output" name="launcher-generator" />
</element>
<element id="library" level="project" name="sanselan-0.98-snapshot" />
<element id="library" level="project" name="guava-12.0" />
<element id="library" level="project" name="jdom" />
</root>
</artifact>
</component>