diff --git a/antlr-bootstrap.changes b/antlr-bootstrap.changes index 2f68097..cf54f13 100644 --- a/antlr-bootstrap.changes +++ b/antlr-bootstrap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 1 11:19:37 UTC 2019 - Fridrich Strba + +- Speed-up build by compiling all *.java files in one javac + invocation + ------------------------------------------------------------------- Tue May 15 05:55:58 UTC 2018 - fstrba@suse.com diff --git a/antlr-bootstrap.spec b/antlr-bootstrap.spec index 4194151..4191f0d 100644 --- a/antlr-bootstrap.spec +++ b/antlr-bootstrap.spec @@ -1,7 +1,7 @@ # # spec file for package antlr-bootstrap # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -48,10 +48,7 @@ CLASSPATH_ORIG="$CLASSPATH" function delBinaryFiles() { set +x echo deleting binary files ... - for file in `find . -name "*.class" -o -name "*.jar" -o -name "*DELETED-BY-PACKAGER*"` - do - rm -rf $file - done + find . -name "*.class" -o -name "*.jar" -o -name "*DELETED-BY-PACKAGER*" -delete set -x } #>>> make %{?_smp_mflags} a string with all jar files found in target folder that can be used for a classpath string @@ -71,19 +68,15 @@ function compileFiles() { mkTargetClasspath set +x COMPILE_CLASSPATH_PATH=.:${JAR_CLASSPATH} - echo using: $COMPILER_COMMAND $COMPILE_CLASSPATH_PATH \$file - for file in `find . -name "*.java"` - do - echo -e "$COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $file ... \c" - $COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $file - # check for errors - if [ $? != 0 ] - then - echo ERROR - exit 1; - fi - echo done - done + echo -e "$COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $(find . -name "*.java" | xargs)" + $COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $(find . -name "*.java" | xargs) + # check for errors + if [ $? != 0 ] + then + echo ERROR + exit 1; + fi + echo done set -x } #>>> make %{?_smp_mflags} jar archive diff --git a/antlr.spec b/antlr.spec index b0d21d5..6a88038 100644 --- a/antlr.spec +++ b/antlr.spec @@ -1,7 +1,7 @@ # # spec file for package antlr # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed