From 160eb5ae517ce93cb7c9f5d9c746e97c9ab66e73 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 10 Mar 2010 09:36:08 +0100 Subject: [PATCH] ZZZ: build speedups --- build/scripts/dist.gant | 8 ++++---- rungant.sh | 14 +++++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) rewrite rungant.sh (100%) diff --git a/build/scripts/dist.gant b/build/scripts/dist.gant index c86653a66d..ab884eaff0 100644 --- a/build/scripts/dist.gant +++ b/build/scripts/dist.gant @@ -39,7 +39,7 @@ target(compile: "Compile project") { loadProject() project.stage("Cleaning up sandbox folder") - ant.delete(dir: paths.sandbox) +// ant.delete(dir: paths.sandbox) [paths.sandbox, paths.distWin, paths.distAll, paths.distUnix, paths.distMac, paths.artifacts].each { ant.mkdir(dir: it) @@ -51,7 +51,7 @@ target(compile: "Compile project") { project["javac"] = "$jdk/bin/javac" project.targetFolder = "$out/classes" - project.clean() +// project.clean() project.makeProduction() } @@ -91,9 +91,9 @@ public def layoutAll(Map args, String home, String out) { ant.copy(file: "$home/LICENSE.txt", todir: "$paths.distAll", preservelastmodified: "true") - layoutMac(args, home, paths) +// layoutMac(args, home, paths) layoutLinux(args, home, paths) - layoutWin(args, home, paths) +// layoutWin(args, home, paths) } boolean isEap() { diff --git a/rungant.sh b/rungant.sh dissimilarity index 100% index 763da77583..0bbc5c0c7b 100644 --- a/rungant.sh +++ b/rungant.sh @@ -1,5 +1,9 @@ -#java '-Xms64m' '-Xmx512m' '-Dgant.script=/home/lkundrak/src/idea/build/scripts/dist.gant' '-classpath' '/usr/share/java/gant.jar:/usr/share/java/ant.jar:/usr/share/java/ant-launcher.jar:/usr/share/java/groovy.jar:/usr/share/java/objectweb-asm/asm.jar:/usr/share/java/antlr.jar:/usr/share/java/commons-cli.jar:/home/lkundrak/src/idea/build/lib/gant/lib/jps.jar' 'org.apache.tools.ant.Main' '-f' '/home/lkundrak/src/idea/build/gant.xml' - -#CLASSPATH=$PWD/build/lib/gant/lib/jps.jar gant -f /home/lkundrak/src/idea/build/scripts/dist.gant "$@" compile -#CLASSPATH=/home/lkundrak/src/JPS/build/deploy/jps.jar gant -d -v -f /home/lkundrak/src/idea/build/scripts/dist.gant "$@" compile -CLASSPATH=/usr/share/java/jgoodies-forms.jar:/usr/share/java/jdom.jar:/usr/share/java/objectweb-asm/asm-commons.jar:/usr/share/java/idea/javac2.jar:/home/lkundrak/src/JPS/build/deploy/jps.jar gant -d -v -f /home/lkundrak/src/idea/build/scripts/dist.gant "$@" compile +#CLASSPATH=$(build-classpath jgoodies-forms jdom objectweb-asm/asm-commons idea/javac2 jps) gant -d -v -f $PWD/build/scripts/dist.gant "$@" compile +#CLASSPATH=$(build-classpath jgoodies-forms jdom objectweb-asm/asm-commons idea/javac2 jps) gant -d -v -f $PWD/build/scripts/dist.gant "$@" +find -name 'NotificationComponent*.class' -delete +#CLASSPATH=$PWD/out/classes/production/forms-compiler:$(build-classpath idea/javac2 jgoodies-forms jdom objectweb-asm/asm-commons jps) gant -f $PWD/build/scripts/dist.gant "$@" +#CLASSPATH=$PWD/out/dist.all.ce/lib/javac2.jar:$(build-classpath idea/javac2 jgoodies-forms jdom objectweb-asm/asm-commons jps) gant -f $PWD/build/scripts/dist.gant "$@" +#CLASSPATH=$PWD/out/classes/production/javac2:$(build-classpath idea/javac2 jgoodies-forms jdom objectweb-asm/asm-commons jps) gant -f $PWD/build/scripts/dist.gant "$@" +JGOODIES=$([ -f /etc/redhat-release ] && echo jgoodies-) +CLASSPATH=$(build-classpath ${JGOODIES}forms jdom objectweb-asm/asm-commons brokenc2 jps) gant -d -v -f $PWD/build/scripts/dist.gant "$@" +find -name 'NotificationComponent*.class' |xargs -r ls -l -- 2.11.4.GIT