Modified: maven/website/components/plugins-archives/maven-compiler-plugin-LATEST/xref/org/apache/maven/plugin/compiler/AbstractCompilerMojo.html ============================================================================== --- maven/website/components/plugins-archives/maven-compiler-plugin-LATEST/xref/org/apache/maven/plugin/compiler/AbstractCompilerMojo.html (original) +++ maven/website/components/plugins-archives/maven-compiler-plugin-LATEST/xref/org/apache/maven/plugin/compiler/AbstractCompilerMojo.html Sun Apr 28 13:00:07 2019 @@ -663,1099 +663,1104 @@ <a class="jxr_linenumber" name="L655" href="#L655">655</a> <a class="jxr_linenumber" name="L656" href="#L656">656</a> <strong class="jxr_keyword">if</strong> ( generatedSourcesDirectory != <strong class="jxr_keyword">null</strong> ) <a class="jxr_linenumber" name="L657" href="#L657">657</a> { -<a class="jxr_linenumber" name="L658" href="#L658">658</a> String generatedSourcesPath = generatedSourcesDirectory.getAbsolutePath(); -<a class="jxr_linenumber" name="L659" href="#L659">659</a> -<a class="jxr_linenumber" name="L660" href="#L660">660</a> compileSourceRoots.add( generatedSourcesPath ); -<a class="jxr_linenumber" name="L661" href="#L661">661</a> -<a class="jxr_linenumber" name="L662" href="#L662">662</a> <strong class="jxr_keyword">if</strong> ( isTestCompile() ) -<a class="jxr_linenumber" name="L663" href="#L663">663</a> { -<a class="jxr_linenumber" name="L664" href="#L664">664</a> getLog().debug( <span class="jxr_string">"Adding "</span> + generatedSourcesPath + <span class="jxr_string">" to test-compile source roots:\n "</span> -<a class="jxr_linenumber" name="L665" href="#L665">665</a> + StringUtils.join( project.getTestCompileSourceRoots() -<a class="jxr_linenumber" name="L666" href="#L666">666</a> .iterator(), <span class="jxr_string">"\n "</span> ) ); -<a class="jxr_linenumber" name="L667" href="#L667">667</a> -<a class="jxr_linenumber" name="L668" href="#L668">668</a> project.addTestCompileSourceRoot( generatedSourcesPath ); -<a class="jxr_linenumber" name="L669" href="#L669">669</a> -<a class="jxr_linenumber" name="L670" href="#L670">670</a> getLog().debug( <span class="jxr_string">"New test-compile source roots:\n "</span> -<a class="jxr_linenumber" name="L671" href="#L671">671</a> + StringUtils.join( project.getTestCompileSourceRoots() -<a class="jxr_linenumber" name="L672" href="#L672">672</a> .iterator(), <span class="jxr_string">"\n "</span> ) ); -<a class="jxr_linenumber" name="L673" href="#L673">673</a> } -<a class="jxr_linenumber" name="L674" href="#L674">674</a> <strong class="jxr_keyword">else</strong> -<a class="jxr_linenumber" name="L675" href="#L675">675</a> { -<a class="jxr_linenumber" name="L676" href="#L676">676</a> getLog().debug( <span class="jxr_string">"Adding "</span> + generatedSourcesPath + <span class="jxr_string">" to compile source roots:\n "</span> -<a class="jxr_linenumber" name="L677" href="#L677">677</a> + StringUtils.join( project.getCompileSourceRoots() -<a class="jxr_linenumber" name="L678" href="#L678">678</a> .iterator(), <span class="jxr_string">"\n "</span> ) ); -<a class="jxr_linenumber" name="L679" href="#L679">679</a> -<a class="jxr_linenumber" name="L680" href="#L680">680</a> project.addCompileSourceRoot( generatedSourcesPath ); -<a class="jxr_linenumber" name="L681" href="#L681">681</a> -<a class="jxr_linenumber" name="L682" href="#L682">682</a> getLog().debug( <span class="jxr_string">"New compile source roots:\n "</span> + StringUtils.join( project.getCompileSourceRoots() -<a class="jxr_linenumber" name="L683" href="#L683">683</a> .iterator(), <span class="jxr_string">"\n "</span> ) ); -<a class="jxr_linenumber" name="L684" href="#L684">684</a> } -<a class="jxr_linenumber" name="L685" href="#L685">685</a> } +<a class="jxr_linenumber" name="L658" href="#L658">658</a> <strong class="jxr_keyword">if</strong> ( !generatedSourcesDirectory.exists() ) +<a class="jxr_linenumber" name="L659" href="#L659">659</a> { +<a class="jxr_linenumber" name="L660" href="#L660">660</a> generatedSourcesDirectory.mkdirs(); +<a class="jxr_linenumber" name="L661" href="#L661">661</a> } +<a class="jxr_linenumber" name="L662" href="#L662">662</a> +<a class="jxr_linenumber" name="L663" href="#L663">663</a> String generatedSourcesPath = generatedSourcesDirectory.getAbsolutePath(); +<a class="jxr_linenumber" name="L664" href="#L664">664</a> +<a class="jxr_linenumber" name="L665" href="#L665">665</a> compileSourceRoots.add( generatedSourcesPath ); +<a class="jxr_linenumber" name="L666" href="#L666">666</a> +<a class="jxr_linenumber" name="L667" href="#L667">667</a> <strong class="jxr_keyword">if</strong> ( isTestCompile() ) +<a class="jxr_linenumber" name="L668" href="#L668">668</a> { +<a class="jxr_linenumber" name="L669" href="#L669">669</a> getLog().debug( <span class="jxr_string">"Adding "</span> + generatedSourcesPath + <span class="jxr_string">" to test-compile source roots:\n "</span> +<a class="jxr_linenumber" name="L670" href="#L670">670</a> + StringUtils.join( project.getTestCompileSourceRoots() +<a class="jxr_linenumber" name="L671" href="#L671">671</a> .iterator(), <span class="jxr_string">"\n "</span> ) ); +<a class="jxr_linenumber" name="L672" href="#L672">672</a> +<a class="jxr_linenumber" name="L673" href="#L673">673</a> project.addTestCompileSourceRoot( generatedSourcesPath ); +<a class="jxr_linenumber" name="L674" href="#L674">674</a> +<a class="jxr_linenumber" name="L675" href="#L675">675</a> getLog().debug( <span class="jxr_string">"New test-compile source roots:\n "</span> +<a class="jxr_linenumber" name="L676" href="#L676">676</a> + StringUtils.join( project.getTestCompileSourceRoots() +<a class="jxr_linenumber" name="L677" href="#L677">677</a> .iterator(), <span class="jxr_string">"\n "</span> ) ); +<a class="jxr_linenumber" name="L678" href="#L678">678</a> } +<a class="jxr_linenumber" name="L679" href="#L679">679</a> <strong class="jxr_keyword">else</strong> +<a class="jxr_linenumber" name="L680" href="#L680">680</a> { +<a class="jxr_linenumber" name="L681" href="#L681">681</a> getLog().debug( <span class="jxr_string">"Adding "</span> + generatedSourcesPath + <span class="jxr_string">" to compile source roots:\n "</span> +<a class="jxr_linenumber" name="L682" href="#L682">682</a> + StringUtils.join( project.getCompileSourceRoots() +<a class="jxr_linenumber" name="L683" href="#L683">683</a> .iterator(), <span class="jxr_string">"\n "</span> ) ); +<a class="jxr_linenumber" name="L684" href="#L684">684</a> +<a class="jxr_linenumber" name="L685" href="#L685">685</a> project.addCompileSourceRoot( generatedSourcesPath ); <a class="jxr_linenumber" name="L686" href="#L686">686</a> -<a class="jxr_linenumber" name="L687" href="#L687">687</a> compilerConfiguration.setSourceLocations( compileSourceRoots ); -<a class="jxr_linenumber" name="L688" href="#L688">688</a> -<a class="jxr_linenumber" name="L689" href="#L689">689</a> compilerConfiguration.setAnnotationProcessors( annotationProcessors ); -<a class="jxr_linenumber" name="L690" href="#L690">690</a> -<a class="jxr_linenumber" name="L691" href="#L691">691</a> compilerConfiguration.setProcessorPathEntries( resolveProcessorPathEntries() ); -<a class="jxr_linenumber" name="L692" href="#L692">692</a> -<a class="jxr_linenumber" name="L693" href="#L693">693</a> compilerConfiguration.setSourceEncoding( encoding ); -<a class="jxr_linenumber" name="L694" href="#L694">694</a> -<a class="jxr_linenumber" name="L695" href="#L695">695</a> compilerConfiguration.setFork( fork ); -<a class="jxr_linenumber" name="L696" href="#L696">696</a> -<a class="jxr_linenumber" name="L697" href="#L697">697</a> <strong class="jxr_keyword">if</strong> ( fork ) -<a class="jxr_linenumber" name="L698" href="#L698">698</a> { -<a class="jxr_linenumber" name="L699" href="#L699">699</a> <strong class="jxr_keyword">if</strong> ( !StringUtils.isEmpty( meminitial ) ) -<a class="jxr_linenumber" name="L700" href="#L700">700</a> { -<a class="jxr_linenumber" name="L701" href="#L701">701</a> String value = getMemoryValue( meminitial ); -<a class="jxr_linenumber" name="L702" href="#L702">702</a> -<a class="jxr_linenumber" name="L703" href="#L703">703</a> <strong class="jxr_keyword">if</strong> ( value != <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L704" href="#L704">704</a> { -<a class="jxr_linenumber" name="L705" href="#L705">705</a> compilerConfiguration.setMeminitial( value ); -<a class="jxr_linenumber" name="L706" href="#L706">706</a> } -<a class="jxr_linenumber" name="L707" href="#L707">707</a> <strong class="jxr_keyword">else</strong> -<a class="jxr_linenumber" name="L708" href="#L708">708</a> { -<a class="jxr_linenumber" name="L709" href="#L709">709</a> getLog().info( <span class="jxr_string">"Invalid value for meminitial '"</span> + meminitial + <span class="jxr_string">"'. Ignoring this option."</span> ); -<a class="jxr_linenumber" name="L710" href="#L710">710</a> } -<a class="jxr_linenumber" name="L711" href="#L711">711</a> } -<a class="jxr_linenumber" name="L712" href="#L712">712</a> -<a class="jxr_linenumber" name="L713" href="#L713">713</a> <strong class="jxr_keyword">if</strong> ( !StringUtils.isEmpty( maxmem ) ) -<a class="jxr_linenumber" name="L714" href="#L714">714</a> { -<a class="jxr_linenumber" name="L715" href="#L715">715</a> String value = getMemoryValue( maxmem ); -<a class="jxr_linenumber" name="L716" href="#L716">716</a> -<a class="jxr_linenumber" name="L717" href="#L717">717</a> <strong class="jxr_keyword">if</strong> ( value != <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L718" href="#L718">718</a> { -<a class="jxr_linenumber" name="L719" href="#L719">719</a> compilerConfiguration.setMaxmem( value ); -<a class="jxr_linenumber" name="L720" href="#L720">720</a> } -<a class="jxr_linenumber" name="L721" href="#L721">721</a> <strong class="jxr_keyword">else</strong> -<a class="jxr_linenumber" name="L722" href="#L722">722</a> { -<a class="jxr_linenumber" name="L723" href="#L723">723</a> getLog().info( <span class="jxr_string">"Invalid value for maxmem '"</span> + maxmem + <span class="jxr_string">"'. Ignoring this option."</span> ); -<a class="jxr_linenumber" name="L724" href="#L724">724</a> } -<a class="jxr_linenumber" name="L725" href="#L725">725</a> } -<a class="jxr_linenumber" name="L726" href="#L726">726</a> } -<a class="jxr_linenumber" name="L727" href="#L727">727</a> -<a class="jxr_linenumber" name="L728" href="#L728">728</a> compilerConfiguration.setExecutable( executable ); -<a class="jxr_linenumber" name="L729" href="#L729">729</a> -<a class="jxr_linenumber" name="L730" href="#L730">730</a> compilerConfiguration.setWorkingDirectory( basedir ); -<a class="jxr_linenumber" name="L731" href="#L731">731</a> -<a class="jxr_linenumber" name="L732" href="#L732">732</a> compilerConfiguration.setCompilerVersion( compilerVersion ); -<a class="jxr_linenumber" name="L733" href="#L733">733</a> -<a class="jxr_linenumber" name="L734" href="#L734">734</a> compilerConfiguration.setBuildDirectory( buildDirectory ); -<a class="jxr_linenumber" name="L735" href="#L735">735</a> -<a class="jxr_linenumber" name="L736" href="#L736">736</a> compilerConfiguration.setOutputFileName( outputFileName ); -<a class="jxr_linenumber" name="L737" href="#L737">737</a> -<a class="jxr_linenumber" name="L738" href="#L738">738</a> <strong class="jxr_keyword">if</strong> ( CompilerConfiguration.CompilerReuseStrategy.AlwaysNew.getStrategy().equals( <strong class="jxr_keyword">this</strong>.compilerReuseStrategy ) ) -<a class="jxr_linenumber" name="L739" href="#L739">739</a> { -<a class="jxr_linenumber" name="L740" href="#L740">740</a> compilerConfiguration.setCompilerReuseStrategy( CompilerConfiguration.CompilerReuseStrategy.AlwaysNew ); -<a class="jxr_linenumber" name="L741" href="#L741">741</a> } -<a class="jxr_linenumber" name="L742" href="#L742">742</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( CompilerConfiguration.CompilerReuseStrategy.ReuseSame.getStrategy().equals( -<a class="jxr_linenumber" name="L743" href="#L743">743</a> <strong class="jxr_keyword">this</strong>.compilerReuseStrategy ) ) +<a class="jxr_linenumber" name="L687" href="#L687">687</a> getLog().debug( <span class="jxr_string">"New compile source roots:\n "</span> + StringUtils.join( project.getCompileSourceRoots() +<a class="jxr_linenumber" name="L688" href="#L688">688</a> .iterator(), <span class="jxr_string">"\n "</span> ) ); +<a class="jxr_linenumber" name="L689" href="#L689">689</a> } +<a class="jxr_linenumber" name="L690" href="#L690">690</a> } +<a class="jxr_linenumber" name="L691" href="#L691">691</a> +<a class="jxr_linenumber" name="L692" href="#L692">692</a> compilerConfiguration.setSourceLocations( compileSourceRoots ); +<a class="jxr_linenumber" name="L693" href="#L693">693</a> +<a class="jxr_linenumber" name="L694" href="#L694">694</a> compilerConfiguration.setAnnotationProcessors( annotationProcessors ); +<a class="jxr_linenumber" name="L695" href="#L695">695</a> +<a class="jxr_linenumber" name="L696" href="#L696">696</a> compilerConfiguration.setProcessorPathEntries( resolveProcessorPathEntries() ); +<a class="jxr_linenumber" name="L697" href="#L697">697</a> +<a class="jxr_linenumber" name="L698" href="#L698">698</a> compilerConfiguration.setSourceEncoding( encoding ); +<a class="jxr_linenumber" name="L699" href="#L699">699</a> +<a class="jxr_linenumber" name="L700" href="#L700">700</a> compilerConfiguration.setFork( fork ); +<a class="jxr_linenumber" name="L701" href="#L701">701</a> +<a class="jxr_linenumber" name="L702" href="#L702">702</a> <strong class="jxr_keyword">if</strong> ( fork ) +<a class="jxr_linenumber" name="L703" href="#L703">703</a> { +<a class="jxr_linenumber" name="L704" href="#L704">704</a> <strong class="jxr_keyword">if</strong> ( !StringUtils.isEmpty( meminitial ) ) +<a class="jxr_linenumber" name="L705" href="#L705">705</a> { +<a class="jxr_linenumber" name="L706" href="#L706">706</a> String value = getMemoryValue( meminitial ); +<a class="jxr_linenumber" name="L707" href="#L707">707</a> +<a class="jxr_linenumber" name="L708" href="#L708">708</a> <strong class="jxr_keyword">if</strong> ( value != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L709" href="#L709">709</a> { +<a class="jxr_linenumber" name="L710" href="#L710">710</a> compilerConfiguration.setMeminitial( value ); +<a class="jxr_linenumber" name="L711" href="#L711">711</a> } +<a class="jxr_linenumber" name="L712" href="#L712">712</a> <strong class="jxr_keyword">else</strong> +<a class="jxr_linenumber" name="L713" href="#L713">713</a> { +<a class="jxr_linenumber" name="L714" href="#L714">714</a> getLog().info( <span class="jxr_string">"Invalid value for meminitial '"</span> + meminitial + <span class="jxr_string">"'. Ignoring this option."</span> ); +<a class="jxr_linenumber" name="L715" href="#L715">715</a> } +<a class="jxr_linenumber" name="L716" href="#L716">716</a> } +<a class="jxr_linenumber" name="L717" href="#L717">717</a> +<a class="jxr_linenumber" name="L718" href="#L718">718</a> <strong class="jxr_keyword">if</strong> ( !StringUtils.isEmpty( maxmem ) ) +<a class="jxr_linenumber" name="L719" href="#L719">719</a> { +<a class="jxr_linenumber" name="L720" href="#L720">720</a> String value = getMemoryValue( maxmem ); +<a class="jxr_linenumber" name="L721" href="#L721">721</a> +<a class="jxr_linenumber" name="L722" href="#L722">722</a> <strong class="jxr_keyword">if</strong> ( value != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L723" href="#L723">723</a> { +<a class="jxr_linenumber" name="L724" href="#L724">724</a> compilerConfiguration.setMaxmem( value ); +<a class="jxr_linenumber" name="L725" href="#L725">725</a> } +<a class="jxr_linenumber" name="L726" href="#L726">726</a> <strong class="jxr_keyword">else</strong> +<a class="jxr_linenumber" name="L727" href="#L727">727</a> { +<a class="jxr_linenumber" name="L728" href="#L728">728</a> getLog().info( <span class="jxr_string">"Invalid value for maxmem '"</span> + maxmem + <span class="jxr_string">"'. Ignoring this option."</span> ); +<a class="jxr_linenumber" name="L729" href="#L729">729</a> } +<a class="jxr_linenumber" name="L730" href="#L730">730</a> } +<a class="jxr_linenumber" name="L731" href="#L731">731</a> } +<a class="jxr_linenumber" name="L732" href="#L732">732</a> +<a class="jxr_linenumber" name="L733" href="#L733">733</a> compilerConfiguration.setExecutable( executable ); +<a class="jxr_linenumber" name="L734" href="#L734">734</a> +<a class="jxr_linenumber" name="L735" href="#L735">735</a> compilerConfiguration.setWorkingDirectory( basedir ); +<a class="jxr_linenumber" name="L736" href="#L736">736</a> +<a class="jxr_linenumber" name="L737" href="#L737">737</a> compilerConfiguration.setCompilerVersion( compilerVersion ); +<a class="jxr_linenumber" name="L738" href="#L738">738</a> +<a class="jxr_linenumber" name="L739" href="#L739">739</a> compilerConfiguration.setBuildDirectory( buildDirectory ); +<a class="jxr_linenumber" name="L740" href="#L740">740</a> +<a class="jxr_linenumber" name="L741" href="#L741">741</a> compilerConfiguration.setOutputFileName( outputFileName ); +<a class="jxr_linenumber" name="L742" href="#L742">742</a> +<a class="jxr_linenumber" name="L743" href="#L743">743</a> <strong class="jxr_keyword">if</strong> ( CompilerConfiguration.CompilerReuseStrategy.AlwaysNew.getStrategy().equals( <strong class="jxr_keyword">this</strong>.compilerReuseStrategy ) ) <a class="jxr_linenumber" name="L744" href="#L744">744</a> { -<a class="jxr_linenumber" name="L745" href="#L745">745</a> <strong class="jxr_keyword">if</strong> ( getRequestThreadCount() > 1 ) -<a class="jxr_linenumber" name="L746" href="#L746">746</a> { -<a class="jxr_linenumber" name="L747" href="#L747">747</a> <strong class="jxr_keyword">if</strong> ( !skipMultiThreadWarning ) -<a class="jxr_linenumber" name="L748" href="#L748">748</a> { -<a class="jxr_linenumber" name="L749" href="#L749">749</a> getLog().warn( <span class="jxr_string">"You are in a multi-thread build and compilerReuseStrategy is set to reuseSame."</span> -<a class="jxr_linenumber" name="L750" href="#L750">750</a> + <span class="jxr_string">" This can cause issues in some environments (os/jdk)!"</span> -<a class="jxr_linenumber" name="L751" href="#L751">751</a> + <span class="jxr_string">" Consider using reuseCreated strategy."</span> -<a class="jxr_linenumber" name="L752" href="#L752">752</a> + System.getProperty( <span class="jxr_string">"line.separator"</span> ) -<a class="jxr_linenumber" name="L753" href="#L753">753</a> + <span class="jxr_string">"If your env is fine with reuseSame, you can skip this warning with the "</span> -<a class="jxr_linenumber" name="L754" href="#L754">754</a> + <span class="jxr_string">"configuration field skipMultiThreadWarning "</span> -<a class="jxr_linenumber" name="L755" href="#L755">755</a> + <span class="jxr_string">"or -Dmaven.compiler.skipMultiThreadWarning=true"</span> ); -<a class="jxr_linenumber" name="L756" href="#L756">756</a> } -<a class="jxr_linenumber" name="L757" href="#L757">757</a> } -<a class="jxr_linenumber" name="L758" href="#L758">758</a> compilerConfiguration.setCompilerReuseStrategy( CompilerConfiguration.CompilerReuseStrategy.ReuseSame ); -<a class="jxr_linenumber" name="L759" href="#L759">759</a> } -<a class="jxr_linenumber" name="L760" href="#L760">760</a> <strong class="jxr_keyword">else</strong> -<a class="jxr_linenumber" name="L761" href="#L761">761</a> { -<a class="jxr_linenumber" name="L762" href="#L762">762</a> -<a class="jxr_linenumber" name="L763" href="#L763">763</a> compilerConfiguration.setCompilerReuseStrategy( CompilerConfiguration.CompilerReuseStrategy.ReuseCreated ); +<a class="jxr_linenumber" name="L745" href="#L745">745</a> compilerConfiguration.setCompilerReuseStrategy( CompilerConfiguration.CompilerReuseStrategy.AlwaysNew ); +<a class="jxr_linenumber" name="L746" href="#L746">746</a> } +<a class="jxr_linenumber" name="L747" href="#L747">747</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( CompilerConfiguration.CompilerReuseStrategy.ReuseSame.getStrategy().equals( +<a class="jxr_linenumber" name="L748" href="#L748">748</a> <strong class="jxr_keyword">this</strong>.compilerReuseStrategy ) ) +<a class="jxr_linenumber" name="L749" href="#L749">749</a> { +<a class="jxr_linenumber" name="L750" href="#L750">750</a> <strong class="jxr_keyword">if</strong> ( getRequestThreadCount() > 1 ) +<a class="jxr_linenumber" name="L751" href="#L751">751</a> { +<a class="jxr_linenumber" name="L752" href="#L752">752</a> <strong class="jxr_keyword">if</strong> ( !skipMultiThreadWarning ) +<a class="jxr_linenumber" name="L753" href="#L753">753</a> { +<a class="jxr_linenumber" name="L754" href="#L754">754</a> getLog().warn( <span class="jxr_string">"You are in a multi-thread build and compilerReuseStrategy is set to reuseSame."</span> +<a class="jxr_linenumber" name="L755" href="#L755">755</a> + <span class="jxr_string">" This can cause issues in some environments (os/jdk)!"</span> +<a class="jxr_linenumber" name="L756" href="#L756">756</a> + <span class="jxr_string">" Consider using reuseCreated strategy."</span> +<a class="jxr_linenumber" name="L757" href="#L757">757</a> + System.getProperty( <span class="jxr_string">"line.separator"</span> ) +<a class="jxr_linenumber" name="L758" href="#L758">758</a> + <span class="jxr_string">"If your env is fine with reuseSame, you can skip this warning with the "</span> +<a class="jxr_linenumber" name="L759" href="#L759">759</a> + <span class="jxr_string">"configuration field skipMultiThreadWarning "</span> +<a class="jxr_linenumber" name="L760" href="#L760">760</a> + <span class="jxr_string">"or -Dmaven.compiler.skipMultiThreadWarning=true"</span> ); +<a class="jxr_linenumber" name="L761" href="#L761">761</a> } +<a class="jxr_linenumber" name="L762" href="#L762">762</a> } +<a class="jxr_linenumber" name="L763" href="#L763">763</a> compilerConfiguration.setCompilerReuseStrategy( CompilerConfiguration.CompilerReuseStrategy.ReuseSame ); <a class="jxr_linenumber" name="L764" href="#L764">764</a> } -<a class="jxr_linenumber" name="L765" href="#L765">765</a> -<a class="jxr_linenumber" name="L766" href="#L766">766</a> getLog().debug( <span class="jxr_string">"CompilerReuseStrategy: "</span> + compilerConfiguration.getCompilerReuseStrategy().getStrategy() ); +<a class="jxr_linenumber" name="L765" href="#L765">765</a> <strong class="jxr_keyword">else</strong> +<a class="jxr_linenumber" name="L766" href="#L766">766</a> { <a class="jxr_linenumber" name="L767" href="#L767">767</a> -<a class="jxr_linenumber" name="L768" href="#L768">768</a> compilerConfiguration.setForceJavacCompilerUse( forceJavacCompilerUse ); -<a class="jxr_linenumber" name="L769" href="#L769">769</a> -<a class="jxr_linenumber" name="L770" href="#L770">770</a> <strong class="jxr_keyword">boolean</strong> canUpdateTarget; -<a class="jxr_linenumber" name="L771" href="#L771">771</a> -<a class="jxr_linenumber" name="L772" href="#L772">772</a> IncrementalBuildHelper incrementalBuildHelper = <strong class="jxr_keyword">new</strong> IncrementalBuildHelper( mojoExecution, session ); -<a class="jxr_linenumber" name="L773" href="#L773">773</a> -<a class="jxr_linenumber" name="L774" href="#L774">774</a> <strong class="jxr_keyword">final</strong> Set<File> sources; -<a class="jxr_linenumber" name="L775" href="#L775">775</a> -<a class="jxr_linenumber" name="L776" href="#L776">776</a> IncrementalBuildHelperRequest incrementalBuildHelperRequest = <strong class="jxr_keyword">null</strong>; -<a class="jxr_linenumber" name="L777" href="#L777">777</a> -<a class="jxr_linenumber" name="L778" href="#L778">778</a> <strong class="jxr_keyword">if</strong> ( useIncrementalCompilation ) -<a class="jxr_linenumber" name="L779" href="#L779">779</a> { -<a class="jxr_linenumber" name="L780" href="#L780">780</a> getLog().debug( <span class="jxr_string">"useIncrementalCompilation enabled"</span> ); -<a class="jxr_linenumber" name="L781" href="#L781">781</a> <strong class="jxr_keyword">try</strong> -<a class="jxr_linenumber" name="L782" href="#L782">782</a> { -<a class="jxr_linenumber" name="L783" href="#L783">783</a> canUpdateTarget = compiler.canUpdateTarget( compilerConfiguration ); -<a class="jxr_linenumber" name="L784" href="#L784">784</a> -<a class="jxr_linenumber" name="L785" href="#L785">785</a> sources = getCompileSources( compiler, compilerConfiguration ); -<a class="jxr_linenumber" name="L786" href="#L786">786</a> -<a class="jxr_linenumber" name="L787" href="#L787">787</a> preparePaths( sources ); -<a class="jxr_linenumber" name="L788" href="#L788">788</a> -<a class="jxr_linenumber" name="L789" href="#L789">789</a> incrementalBuildHelperRequest = <strong class="jxr_keyword">new</strong> IncrementalBuildHelperRequest().inputFiles( sources ); -<a class="jxr_linenumber" name="L790" href="#L790">790</a> -<a class="jxr_linenumber" name="L791" href="#L791">791</a> <em class="jxr_comment">// CHECKSTYLE_OFF: LineLength</em> -<a class="jxr_linenumber" name="L792" href="#L792">792</a> <strong class="jxr_keyword">if</strong> ( ( compiler.getCompilerOutputStyle().equals( CompilerOutputStyle.ONE_OUTPUT_FILE_FOR_ALL_INPUT_FILES ) && !canUpdateTarget ) -<a class="jxr_linenumber" name="L793" href="#L793">793</a> || isDependencyChanged() -<a class="jxr_linenumber" name="L794" href="#L794">794</a> || isSourceChanged( compilerConfiguration, compiler ) -<a class="jxr_linenumber" name="L795" href="#L795">795</a> || incrementalBuildHelper.inputFileTreeChanged( incrementalBuildHelperRequest ) ) -<a class="jxr_linenumber" name="L796" href="#L796">796</a> <em class="jxr_comment">// CHECKSTYLE_ON: LineLength</em> -<a class="jxr_linenumber" name="L797" href="#L797">797</a> { -<a class="jxr_linenumber" name="L798" href="#L798">798</a> getLog().info( <span class="jxr_string">"Changes detected - recompiling the module!"</span> ); -<a class="jxr_linenumber" name="L799" href="#L799">799</a> -<a class="jxr_linenumber" name="L800" href="#L800">800</a> compilerConfiguration.setSourceFiles( sources ); -<a class="jxr_linenumber" name="L801" href="#L801">801</a> } -<a class="jxr_linenumber" name="L802" href="#L802">802</a> <strong class="jxr_keyword">else</strong> -<a class="jxr_linenumber" name="L803" href="#L803">803</a> { -<a class="jxr_linenumber" name="L804" href="#L804">804</a> getLog().info( <span class="jxr_string">"Nothing to compile - all classes are up to date"</span> ); -<a class="jxr_linenumber" name="L805" href="#L805">805</a> -<a class="jxr_linenumber" name="L806" href="#L806">806</a> <strong class="jxr_keyword">return</strong>; -<a class="jxr_linenumber" name="L807" href="#L807">807</a> } -<a class="jxr_linenumber" name="L808" href="#L808">808</a> } -<a class="jxr_linenumber" name="L809" href="#L809">809</a> <strong class="jxr_keyword">catch</strong> ( CompilerException e ) -<a class="jxr_linenumber" name="L810" href="#L810">810</a> { -<a class="jxr_linenumber" name="L811" href="#L811">811</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error while computing stale sources."</span>, e ); -<a class="jxr_linenumber" name="L812" href="#L812">812</a> } -<a class="jxr_linenumber" name="L813" href="#L813">813</a> } -<a class="jxr_linenumber" name="L814" href="#L814">814</a> <strong class="jxr_keyword">else</strong> -<a class="jxr_linenumber" name="L815" href="#L815">815</a> { -<a class="jxr_linenumber" name="L816" href="#L816">816</a> getLog().debug( <span class="jxr_string">"useIncrementalCompilation disabled"</span> ); -<a class="jxr_linenumber" name="L817" href="#L817">817</a> -<a class="jxr_linenumber" name="L818" href="#L818">818</a> Set<File> staleSources; -<a class="jxr_linenumber" name="L819" href="#L819">819</a> <strong class="jxr_keyword">try</strong> -<a class="jxr_linenumber" name="L820" href="#L820">820</a> { -<a class="jxr_linenumber" name="L821" href="#L821">821</a> staleSources = -<a class="jxr_linenumber" name="L822" href="#L822">822</a> computeStaleSources( compilerConfiguration, compiler, getSourceInclusionScanner( staleMillis ) ); -<a class="jxr_linenumber" name="L823" href="#L823">823</a> -<a class="jxr_linenumber" name="L824" href="#L824">824</a> canUpdateTarget = compiler.canUpdateTarget( compilerConfiguration ); -<a class="jxr_linenumber" name="L825" href="#L825">825</a> -<a class="jxr_linenumber" name="L826" href="#L826">826</a> <strong class="jxr_keyword">if</strong> ( compiler.getCompilerOutputStyle().equals( CompilerOutputStyle.ONE_OUTPUT_FILE_FOR_ALL_INPUT_FILES ) -<a class="jxr_linenumber" name="L827" href="#L827">827</a> && !canUpdateTarget ) -<a class="jxr_linenumber" name="L828" href="#L828">828</a> { -<a class="jxr_linenumber" name="L829" href="#L829">829</a> getLog().info( <span class="jxr_string">"RESCANNING!"</span> ); -<a class="jxr_linenumber" name="L830" href="#L830">830</a> <em class="jxr_comment">// TODO: This second scan for source files is sub-optimal</em> -<a class="jxr_linenumber" name="L831" href="#L831">831</a> String inputFileEnding = compiler.getInputFileEnding( compilerConfiguration ); -<a class="jxr_linenumber" name="L832" href="#L832">832</a> -<a class="jxr_linenumber" name="L833" href="#L833">833</a> staleSources = computeStaleSources( compilerConfiguration, compiler, -<a class="jxr_linenumber" name="L834" href="#L834">834</a> getSourceInclusionScanner( inputFileEnding ) ); -<a class="jxr_linenumber" name="L835" href="#L835">835</a> } -<a class="jxr_linenumber" name="L836" href="#L836">836</a> -<a class="jxr_linenumber" name="L837" href="#L837">837</a> } -<a class="jxr_linenumber" name="L838" href="#L838">838</a> <strong class="jxr_keyword">catch</strong> ( CompilerException e ) -<a class="jxr_linenumber" name="L839" href="#L839">839</a> { -<a class="jxr_linenumber" name="L840" href="#L840">840</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error while computing stale sources."</span>, e ); -<a class="jxr_linenumber" name="L841" href="#L841">841</a> } -<a class="jxr_linenumber" name="L842" href="#L842">842</a> -<a class="jxr_linenumber" name="L843" href="#L843">843</a> <strong class="jxr_keyword">if</strong> ( staleSources.isEmpty() ) +<a class="jxr_linenumber" name="L768" href="#L768">768</a> compilerConfiguration.setCompilerReuseStrategy( CompilerConfiguration.CompilerReuseStrategy.ReuseCreated ); +<a class="jxr_linenumber" name="L769" href="#L769">769</a> } +<a class="jxr_linenumber" name="L770" href="#L770">770</a> +<a class="jxr_linenumber" name="L771" href="#L771">771</a> getLog().debug( <span class="jxr_string">"CompilerReuseStrategy: "</span> + compilerConfiguration.getCompilerReuseStrategy().getStrategy() ); +<a class="jxr_linenumber" name="L772" href="#L772">772</a> +<a class="jxr_linenumber" name="L773" href="#L773">773</a> compilerConfiguration.setForceJavacCompilerUse( forceJavacCompilerUse ); +<a class="jxr_linenumber" name="L774" href="#L774">774</a> +<a class="jxr_linenumber" name="L775" href="#L775">775</a> <strong class="jxr_keyword">boolean</strong> canUpdateTarget; +<a class="jxr_linenumber" name="L776" href="#L776">776</a> +<a class="jxr_linenumber" name="L777" href="#L777">777</a> IncrementalBuildHelper incrementalBuildHelper = <strong class="jxr_keyword">new</strong> IncrementalBuildHelper( mojoExecution, session ); +<a class="jxr_linenumber" name="L778" href="#L778">778</a> +<a class="jxr_linenumber" name="L779" href="#L779">779</a> <strong class="jxr_keyword">final</strong> Set<File> sources; +<a class="jxr_linenumber" name="L780" href="#L780">780</a> +<a class="jxr_linenumber" name="L781" href="#L781">781</a> IncrementalBuildHelperRequest incrementalBuildHelperRequest = <strong class="jxr_keyword">null</strong>; +<a class="jxr_linenumber" name="L782" href="#L782">782</a> +<a class="jxr_linenumber" name="L783" href="#L783">783</a> <strong class="jxr_keyword">if</strong> ( useIncrementalCompilation ) +<a class="jxr_linenumber" name="L784" href="#L784">784</a> { +<a class="jxr_linenumber" name="L785" href="#L785">785</a> getLog().debug( <span class="jxr_string">"useIncrementalCompilation enabled"</span> ); +<a class="jxr_linenumber" name="L786" href="#L786">786</a> <strong class="jxr_keyword">try</strong> +<a class="jxr_linenumber" name="L787" href="#L787">787</a> { +<a class="jxr_linenumber" name="L788" href="#L788">788</a> canUpdateTarget = compiler.canUpdateTarget( compilerConfiguration ); +<a class="jxr_linenumber" name="L789" href="#L789">789</a> +<a class="jxr_linenumber" name="L790" href="#L790">790</a> sources = getCompileSources( compiler, compilerConfiguration ); +<a class="jxr_linenumber" name="L791" href="#L791">791</a> +<a class="jxr_linenumber" name="L792" href="#L792">792</a> preparePaths( sources ); +<a class="jxr_linenumber" name="L793" href="#L793">793</a> +<a class="jxr_linenumber" name="L794" href="#L794">794</a> incrementalBuildHelperRequest = <strong class="jxr_keyword">new</strong> IncrementalBuildHelperRequest().inputFiles( sources ); +<a class="jxr_linenumber" name="L795" href="#L795">795</a> +<a class="jxr_linenumber" name="L796" href="#L796">796</a> <em class="jxr_comment">// CHECKSTYLE_OFF: LineLength</em> +<a class="jxr_linenumber" name="L797" href="#L797">797</a> <strong class="jxr_keyword">if</strong> ( ( compiler.getCompilerOutputStyle().equals( CompilerOutputStyle.ONE_OUTPUT_FILE_FOR_ALL_INPUT_FILES ) && !canUpdateTarget ) +<a class="jxr_linenumber" name="L798" href="#L798">798</a> || isDependencyChanged() +<a class="jxr_linenumber" name="L799" href="#L799">799</a> || isSourceChanged( compilerConfiguration, compiler ) +<a class="jxr_linenumber" name="L800" href="#L800">800</a> || incrementalBuildHelper.inputFileTreeChanged( incrementalBuildHelperRequest ) ) +<a class="jxr_linenumber" name="L801" href="#L801">801</a> <em class="jxr_comment">// CHECKSTYLE_ON: LineLength</em> +<a class="jxr_linenumber" name="L802" href="#L802">802</a> { +<a class="jxr_linenumber" name="L803" href="#L803">803</a> getLog().info( <span class="jxr_string">"Changes detected - recompiling the module!"</span> ); +<a class="jxr_linenumber" name="L804" href="#L804">804</a> +<a class="jxr_linenumber" name="L805" href="#L805">805</a> compilerConfiguration.setSourceFiles( sources ); +<a class="jxr_linenumber" name="L806" href="#L806">806</a> } +<a class="jxr_linenumber" name="L807" href="#L807">807</a> <strong class="jxr_keyword">else</strong> +<a class="jxr_linenumber" name="L808" href="#L808">808</a> { +<a class="jxr_linenumber" name="L809" href="#L809">809</a> getLog().info( <span class="jxr_string">"Nothing to compile - all classes are up to date"</span> ); +<a class="jxr_linenumber" name="L810" href="#L810">810</a> +<a class="jxr_linenumber" name="L811" href="#L811">811</a> <strong class="jxr_keyword">return</strong>; +<a class="jxr_linenumber" name="L812" href="#L812">812</a> } +<a class="jxr_linenumber" name="L813" href="#L813">813</a> } +<a class="jxr_linenumber" name="L814" href="#L814">814</a> <strong class="jxr_keyword">catch</strong> ( CompilerException e ) +<a class="jxr_linenumber" name="L815" href="#L815">815</a> { +<a class="jxr_linenumber" name="L816" href="#L816">816</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error while computing stale sources."</span>, e ); +<a class="jxr_linenumber" name="L817" href="#L817">817</a> } +<a class="jxr_linenumber" name="L818" href="#L818">818</a> } +<a class="jxr_linenumber" name="L819" href="#L819">819</a> <strong class="jxr_keyword">else</strong> +<a class="jxr_linenumber" name="L820" href="#L820">820</a> { +<a class="jxr_linenumber" name="L821" href="#L821">821</a> getLog().debug( <span class="jxr_string">"useIncrementalCompilation disabled"</span> ); +<a class="jxr_linenumber" name="L822" href="#L822">822</a> +<a class="jxr_linenumber" name="L823" href="#L823">823</a> Set<File> staleSources; +<a class="jxr_linenumber" name="L824" href="#L824">824</a> <strong class="jxr_keyword">try</strong> +<a class="jxr_linenumber" name="L825" href="#L825">825</a> { +<a class="jxr_linenumber" name="L826" href="#L826">826</a> staleSources = +<a class="jxr_linenumber" name="L827" href="#L827">827</a> computeStaleSources( compilerConfiguration, compiler, getSourceInclusionScanner( staleMillis ) ); +<a class="jxr_linenumber" name="L828" href="#L828">828</a> +<a class="jxr_linenumber" name="L829" href="#L829">829</a> canUpdateTarget = compiler.canUpdateTarget( compilerConfiguration ); +<a class="jxr_linenumber" name="L830" href="#L830">830</a> +<a class="jxr_linenumber" name="L831" href="#L831">831</a> <strong class="jxr_keyword">if</strong> ( compiler.getCompilerOutputStyle().equals( CompilerOutputStyle.ONE_OUTPUT_FILE_FOR_ALL_INPUT_FILES ) +<a class="jxr_linenumber" name="L832" href="#L832">832</a> && !canUpdateTarget ) +<a class="jxr_linenumber" name="L833" href="#L833">833</a> { +<a class="jxr_linenumber" name="L834" href="#L834">834</a> getLog().info( <span class="jxr_string">"RESCANNING!"</span> ); +<a class="jxr_linenumber" name="L835" href="#L835">835</a> <em class="jxr_comment">// TODO: This second scan for source files is sub-optimal</em> +<a class="jxr_linenumber" name="L836" href="#L836">836</a> String inputFileEnding = compiler.getInputFileEnding( compilerConfiguration ); +<a class="jxr_linenumber" name="L837" href="#L837">837</a> +<a class="jxr_linenumber" name="L838" href="#L838">838</a> staleSources = computeStaleSources( compilerConfiguration, compiler, +<a class="jxr_linenumber" name="L839" href="#L839">839</a> getSourceInclusionScanner( inputFileEnding ) ); +<a class="jxr_linenumber" name="L840" href="#L840">840</a> } +<a class="jxr_linenumber" name="L841" href="#L841">841</a> +<a class="jxr_linenumber" name="L842" href="#L842">842</a> } +<a class="jxr_linenumber" name="L843" href="#L843">843</a> <strong class="jxr_keyword">catch</strong> ( CompilerException e ) <a class="jxr_linenumber" name="L844" href="#L844">844</a> { -<a class="jxr_linenumber" name="L845" href="#L845">845</a> getLog().info( <span class="jxr_string">"Nothing to compile - all classes are up to date"</span> ); -<a class="jxr_linenumber" name="L846" href="#L846">846</a> -<a class="jxr_linenumber" name="L847" href="#L847">847</a> <strong class="jxr_keyword">return</strong>; -<a class="jxr_linenumber" name="L848" href="#L848">848</a> } -<a class="jxr_linenumber" name="L849" href="#L849">849</a> -<a class="jxr_linenumber" name="L850" href="#L850">850</a> compilerConfiguration.setSourceFiles( staleSources ); -<a class="jxr_linenumber" name="L851" href="#L851">851</a> -<a class="jxr_linenumber" name="L852" href="#L852">852</a> <strong class="jxr_keyword">try</strong> -<a class="jxr_linenumber" name="L853" href="#L853">853</a> { -<a class="jxr_linenumber" name="L854" href="#L854">854</a> <em class="jxr_comment">// MCOMPILER-366: if sources contain the module-descriptor it must be used to define the modulepath</em> -<a class="jxr_linenumber" name="L855" href="#L855">855</a> sources = getCompileSources( compiler, compilerConfiguration ); -<a class="jxr_linenumber" name="L856" href="#L856">856</a> -<a class="jxr_linenumber" name="L857" href="#L857">857</a> getLog().debug( <span class="jxr_string">"#sources: "</span> + sources.size() ); -<a class="jxr_linenumber" name="L858" href="#L858">858</a> <strong class="jxr_keyword">for</strong> ( File file : sources ) -<a class="jxr_linenumber" name="L859" href="#L859">859</a> { -<a class="jxr_linenumber" name="L860" href="#L860">860</a> getLog().debug( file.getPath() ); -<a class="jxr_linenumber" name="L861" href="#L861">861</a> } -<a class="jxr_linenumber" name="L862" href="#L862">862</a> -<a class="jxr_linenumber" name="L863" href="#L863">863</a> preparePaths( sources ); -<a class="jxr_linenumber" name="L864" href="#L864">864</a> } -<a class="jxr_linenumber" name="L865" href="#L865">865</a> <strong class="jxr_keyword">catch</strong> ( CompilerException e ) -<a class="jxr_linenumber" name="L866" href="#L866">866</a> { -<a class="jxr_linenumber" name="L867" href="#L867">867</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error while computing stale sources."</span>, e ); -<a class="jxr_linenumber" name="L868" href="#L868">868</a> } -<a class="jxr_linenumber" name="L869" href="#L869">869</a> } -<a class="jxr_linenumber" name="L870" href="#L870">870</a> -<a class="jxr_linenumber" name="L871" href="#L871">871</a> <em class="jxr_comment">// Dividing pathElements of classPath and modulePath is based on sourceFiles</em> -<a class="jxr_linenumber" name="L872" href="#L872">872</a> compilerConfiguration.setClasspathEntries( getClasspathElements() ); -<a class="jxr_linenumber" name="L873" href="#L873">873</a> -<a class="jxr_linenumber" name="L874" href="#L874">874</a> compilerConfiguration.setModulepathEntries( getModulepathElements() ); -<a class="jxr_linenumber" name="L875" href="#L875">875</a> -<a class="jxr_linenumber" name="L876" href="#L876">876</a> Map<String, String> effectiveCompilerArguments = getCompilerArguments(); -<a class="jxr_linenumber" name="L877" href="#L877">877</a> -<a class="jxr_linenumber" name="L878" href="#L878">878</a> String effectiveCompilerArgument = getCompilerArgument(); -<a class="jxr_linenumber" name="L879" href="#L879">879</a> -<a class="jxr_linenumber" name="L880" href="#L880">880</a> <strong class="jxr_keyword">if</strong> ( ( effectiveCompilerArguments != <strong class="jxr_keyword">null</strong> ) || ( effectiveCompilerArgument != <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L881" href="#L881">881</a> || ( compilerArgs != <strong class="jxr_keyword">null</strong> ) ) -<a class="jxr_linenumber" name="L882" href="#L882">882</a> { -<a class="jxr_linenumber" name="L883" href="#L883">883</a> <strong class="jxr_keyword">if</strong> ( effectiveCompilerArguments != <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L884" href="#L884">884</a> { -<a class="jxr_linenumber" name="L885" href="#L885">885</a> <strong class="jxr_keyword">for</strong> ( Map.Entry<String, String> me : effectiveCompilerArguments.entrySet() ) -<a class="jxr_linenumber" name="L886" href="#L886">886</a> { -<a class="jxr_linenumber" name="L887" href="#L887">887</a> String key = me.getKey(); -<a class="jxr_linenumber" name="L888" href="#L888">888</a> String value = me.getValue(); -<a class="jxr_linenumber" name="L889" href="#L889">889</a> <strong class="jxr_keyword">if</strong> ( !key.startsWith( <span class="jxr_string">"-"</span> ) ) -<a class="jxr_linenumber" name="L890" href="#L890">890</a> { -<a class="jxr_linenumber" name="L891" href="#L891">891</a> key = <span class="jxr_string">"-"</span> + key; -<a class="jxr_linenumber" name="L892" href="#L892">892</a> } -<a class="jxr_linenumber" name="L893" href="#L893">893</a> -<a class="jxr_linenumber" name="L894" href="#L894">894</a> <strong class="jxr_keyword">if</strong> ( key.startsWith( <span class="jxr_string">"-A"</span> ) && StringUtils.isNotEmpty( value ) ) +<a class="jxr_linenumber" name="L845" href="#L845">845</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error while computing stale sources."</span>, e ); +<a class="jxr_linenumber" name="L846" href="#L846">846</a> } +<a class="jxr_linenumber" name="L847" href="#L847">847</a> +<a class="jxr_linenumber" name="L848" href="#L848">848</a> <strong class="jxr_keyword">if</strong> ( staleSources.isEmpty() ) +<a class="jxr_linenumber" name="L849" href="#L849">849</a> { +<a class="jxr_linenumber" name="L850" href="#L850">850</a> getLog().info( <span class="jxr_string">"Nothing to compile - all classes are up to date"</span> ); +<a class="jxr_linenumber" name="L851" href="#L851">851</a> +<a class="jxr_linenumber" name="L852" href="#L852">852</a> <strong class="jxr_keyword">return</strong>; +<a class="jxr_linenumber" name="L853" href="#L853">853</a> } +<a class="jxr_linenumber" name="L854" href="#L854">854</a> +<a class="jxr_linenumber" name="L855" href="#L855">855</a> compilerConfiguration.setSourceFiles( staleSources ); +<a class="jxr_linenumber" name="L856" href="#L856">856</a> +<a class="jxr_linenumber" name="L857" href="#L857">857</a> <strong class="jxr_keyword">try</strong> +<a class="jxr_linenumber" name="L858" href="#L858">858</a> { +<a class="jxr_linenumber" name="L859" href="#L859">859</a> <em class="jxr_comment">// MCOMPILER-366: if sources contain the module-descriptor it must be used to define the modulepath</em> +<a class="jxr_linenumber" name="L860" href="#L860">860</a> sources = getCompileSources( compiler, compilerConfiguration ); +<a class="jxr_linenumber" name="L861" href="#L861">861</a> +<a class="jxr_linenumber" name="L862" href="#L862">862</a> getLog().debug( <span class="jxr_string">"#sources: "</span> + sources.size() ); +<a class="jxr_linenumber" name="L863" href="#L863">863</a> <strong class="jxr_keyword">for</strong> ( File file : sources ) +<a class="jxr_linenumber" name="L864" href="#L864">864</a> { +<a class="jxr_linenumber" name="L865" href="#L865">865</a> getLog().debug( file.getPath() ); +<a class="jxr_linenumber" name="L866" href="#L866">866</a> } +<a class="jxr_linenumber" name="L867" href="#L867">867</a> +<a class="jxr_linenumber" name="L868" href="#L868">868</a> preparePaths( sources ); +<a class="jxr_linenumber" name="L869" href="#L869">869</a> } +<a class="jxr_linenumber" name="L870" href="#L870">870</a> <strong class="jxr_keyword">catch</strong> ( CompilerException e ) +<a class="jxr_linenumber" name="L871" href="#L871">871</a> { +<a class="jxr_linenumber" name="L872" href="#L872">872</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error while computing stale sources."</span>, e ); +<a class="jxr_linenumber" name="L873" href="#L873">873</a> } +<a class="jxr_linenumber" name="L874" href="#L874">874</a> } +<a class="jxr_linenumber" name="L875" href="#L875">875</a> +<a class="jxr_linenumber" name="L876" href="#L876">876</a> <em class="jxr_comment">// Dividing pathElements of classPath and modulePath is based on sourceFiles</em> +<a class="jxr_linenumber" name="L877" href="#L877">877</a> compilerConfiguration.setClasspathEntries( getClasspathElements() ); +<a class="jxr_linenumber" name="L878" href="#L878">878</a> +<a class="jxr_linenumber" name="L879" href="#L879">879</a> compilerConfiguration.setModulepathEntries( getModulepathElements() ); +<a class="jxr_linenumber" name="L880" href="#L880">880</a> +<a class="jxr_linenumber" name="L881" href="#L881">881</a> Map<String, String> effectiveCompilerArguments = getCompilerArguments(); +<a class="jxr_linenumber" name="L882" href="#L882">882</a> +<a class="jxr_linenumber" name="L883" href="#L883">883</a> String effectiveCompilerArgument = getCompilerArgument(); +<a class="jxr_linenumber" name="L884" href="#L884">884</a> +<a class="jxr_linenumber" name="L885" href="#L885">885</a> <strong class="jxr_keyword">if</strong> ( ( effectiveCompilerArguments != <strong class="jxr_keyword">null</strong> ) || ( effectiveCompilerArgument != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L886" href="#L886">886</a> || ( compilerArgs != <strong class="jxr_keyword">null</strong> ) ) +<a class="jxr_linenumber" name="L887" href="#L887">887</a> { +<a class="jxr_linenumber" name="L888" href="#L888">888</a> <strong class="jxr_keyword">if</strong> ( effectiveCompilerArguments != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L889" href="#L889">889</a> { +<a class="jxr_linenumber" name="L890" href="#L890">890</a> <strong class="jxr_keyword">for</strong> ( Map.Entry<String, String> me : effectiveCompilerArguments.entrySet() ) +<a class="jxr_linenumber" name="L891" href="#L891">891</a> { +<a class="jxr_linenumber" name="L892" href="#L892">892</a> String key = me.getKey(); +<a class="jxr_linenumber" name="L893" href="#L893">893</a> String value = me.getValue(); +<a class="jxr_linenumber" name="L894" href="#L894">894</a> <strong class="jxr_keyword">if</strong> ( !key.startsWith( <span class="jxr_string">"-"</span> ) ) <a class="jxr_linenumber" name="L895" href="#L895">895</a> { -<a class="jxr_linenumber" name="L896" href="#L896">896</a> compilerConfiguration.addCompilerCustomArgument( key + <span class="jxr_string">"="</span> + value, <strong class="jxr_keyword">null</strong> ); +<a class="jxr_linenumber" name="L896" href="#L896">896</a> key = <span class="jxr_string">"-"</span> + key; <a class="jxr_linenumber" name="L897" href="#L897">897</a> } -<a class="jxr_linenumber" name="L898" href="#L898">898</a> <strong class="jxr_keyword">else</strong> -<a class="jxr_linenumber" name="L899" href="#L899">899</a> { -<a class="jxr_linenumber" name="L900" href="#L900">900</a> compilerConfiguration.addCompilerCustomArgument( key, value ); -<a class="jxr_linenumber" name="L901" href="#L901">901</a> } -<a class="jxr_linenumber" name="L902" href="#L902">902</a> } -<a class="jxr_linenumber" name="L903" href="#L903">903</a> } -<a class="jxr_linenumber" name="L904" href="#L904">904</a> <strong class="jxr_keyword">if</strong> ( !StringUtils.isEmpty( effectiveCompilerArgument ) ) -<a class="jxr_linenumber" name="L905" href="#L905">905</a> { -<a class="jxr_linenumber" name="L906" href="#L906">906</a> compilerConfiguration.addCompilerCustomArgument( effectiveCompilerArgument, <strong class="jxr_keyword">null</strong> ); -<a class="jxr_linenumber" name="L907" href="#L907">907</a> } -<a class="jxr_linenumber" name="L908" href="#L908">908</a> <strong class="jxr_keyword">if</strong> ( compilerArgs != <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L909" href="#L909">909</a> { -<a class="jxr_linenumber" name="L910" href="#L910">910</a> <strong class="jxr_keyword">for</strong> ( String arg : compilerArgs ) -<a class="jxr_linenumber" name="L911" href="#L911">911</a> { -<a class="jxr_linenumber" name="L912" href="#L912">912</a> compilerConfiguration.addCompilerCustomArgument( arg, <strong class="jxr_keyword">null</strong> ); -<a class="jxr_linenumber" name="L913" href="#L913">913</a> } -<a class="jxr_linenumber" name="L914" href="#L914">914</a> } -<a class="jxr_linenumber" name="L915" href="#L915">915</a> } -<a class="jxr_linenumber" name="L916" href="#L916">916</a> -<a class="jxr_linenumber" name="L917" href="#L917">917</a> <em class="jxr_comment">// ----------------------------------------------------------------------</em> -<a class="jxr_linenumber" name="L918" href="#L918">918</a> <em class="jxr_comment">// Dump configuration</em> -<a class="jxr_linenumber" name="L919" href="#L919">919</a> <em class="jxr_comment">// ----------------------------------------------------------------------</em> -<a class="jxr_linenumber" name="L920" href="#L920">920</a> <strong class="jxr_keyword">if</strong> ( getLog().isDebugEnabled() ) -<a class="jxr_linenumber" name="L921" href="#L921">921</a> { -<a class="jxr_linenumber" name="L922" href="#L922">922</a> getLog().debug( <span class="jxr_string">"Classpath:"</span> ); -<a class="jxr_linenumber" name="L923" href="#L923">923</a> -<a class="jxr_linenumber" name="L924" href="#L924">924</a> <strong class="jxr_keyword">for</strong> ( String s : getClasspathElements() ) -<a class="jxr_linenumber" name="L925" href="#L925">925</a> { -<a class="jxr_linenumber" name="L926" href="#L926">926</a> getLog().debug( <span class="jxr_string">" "</span> + s ); -<a class="jxr_linenumber" name="L927" href="#L927">927</a> } +<a class="jxr_linenumber" name="L898" href="#L898">898</a> +<a class="jxr_linenumber" name="L899" href="#L899">899</a> <strong class="jxr_keyword">if</strong> ( key.startsWith( <span class="jxr_string">"-A"</span> ) && StringUtils.isNotEmpty( value ) ) +<a class="jxr_linenumber" name="L900" href="#L900">900</a> { +<a class="jxr_linenumber" name="L901" href="#L901">901</a> compilerConfiguration.addCompilerCustomArgument( key + <span class="jxr_string">"="</span> + value, <strong class="jxr_keyword">null</strong> ); +<a class="jxr_linenumber" name="L902" href="#L902">902</a> } +<a class="jxr_linenumber" name="L903" href="#L903">903</a> <strong class="jxr_keyword">else</strong> +<a class="jxr_linenumber" name="L904" href="#L904">904</a> { +<a class="jxr_linenumber" name="L905" href="#L905">905</a> compilerConfiguration.addCompilerCustomArgument( key, value ); +<a class="jxr_linenumber" name="L906" href="#L906">906</a> } +<a class="jxr_linenumber" name="L907" href="#L907">907</a> } +<a class="jxr_linenumber" name="L908" href="#L908">908</a> } +<a class="jxr_linenumber" name="L909" href="#L909">909</a> <strong class="jxr_keyword">if</strong> ( !StringUtils.isEmpty( effectiveCompilerArgument ) ) +<a class="jxr_linenumber" name="L910" href="#L910">910</a> { +<a class="jxr_linenumber" name="L911" href="#L911">911</a> compilerConfiguration.addCompilerCustomArgument( effectiveCompilerArgument, <strong class="jxr_keyword">null</strong> ); +<a class="jxr_linenumber" name="L912" href="#L912">912</a> } +<a class="jxr_linenumber" name="L913" href="#L913">913</a> <strong class="jxr_keyword">if</strong> ( compilerArgs != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L914" href="#L914">914</a> { +<a class="jxr_linenumber" name="L915" href="#L915">915</a> <strong class="jxr_keyword">for</strong> ( String arg : compilerArgs ) +<a class="jxr_linenumber" name="L916" href="#L916">916</a> { +<a class="jxr_linenumber" name="L917" href="#L917">917</a> compilerConfiguration.addCompilerCustomArgument( arg, <strong class="jxr_keyword">null</strong> ); +<a class="jxr_linenumber" name="L918" href="#L918">918</a> } +<a class="jxr_linenumber" name="L919" href="#L919">919</a> } +<a class="jxr_linenumber" name="L920" href="#L920">920</a> } +<a class="jxr_linenumber" name="L921" href="#L921">921</a> +<a class="jxr_linenumber" name="L922" href="#L922">922</a> <em class="jxr_comment">// ----------------------------------------------------------------------</em> +<a class="jxr_linenumber" name="L923" href="#L923">923</a> <em class="jxr_comment">// Dump configuration</em> +<a class="jxr_linenumber" name="L924" href="#L924">924</a> <em class="jxr_comment">// ----------------------------------------------------------------------</em> +<a class="jxr_linenumber" name="L925" href="#L925">925</a> <strong class="jxr_keyword">if</strong> ( getLog().isDebugEnabled() ) +<a class="jxr_linenumber" name="L926" href="#L926">926</a> { +<a class="jxr_linenumber" name="L927" href="#L927">927</a> getLog().debug( <span class="jxr_string">"Classpath:"</span> ); <a class="jxr_linenumber" name="L928" href="#L928">928</a> -<a class="jxr_linenumber" name="L929" href="#L929">929</a> <strong class="jxr_keyword">if</strong> ( !getModulepathElements().isEmpty() ) +<a class="jxr_linenumber" name="L929" href="#L929">929</a> <strong class="jxr_keyword">for</strong> ( String s : getClasspathElements() ) <a class="jxr_linenumber" name="L930" href="#L930">930</a> { -<a class="jxr_linenumber" name="L931" href="#L931">931</a> getLog().debug( <span class="jxr_string">"Modulepath:"</span> ); -<a class="jxr_linenumber" name="L932" href="#L932">932</a> <strong class="jxr_keyword">for</strong> ( String s : getModulepathElements() ) -<a class="jxr_linenumber" name="L933" href="#L933">933</a> { -<a class="jxr_linenumber" name="L934" href="#L934">934</a> getLog().debug( <span class="jxr_string">" "</span> + s ); -<a class="jxr_linenumber" name="L935" href="#L935">935</a> } -<a class="jxr_linenumber" name="L936" href="#L936">936</a> } -<a class="jxr_linenumber" name="L937" href="#L937">937</a> -<a class="jxr_linenumber" name="L938" href="#L938">938</a> getLog().debug( <span class="jxr_string">"Source roots:"</span> ); -<a class="jxr_linenumber" name="L939" href="#L939">939</a> -<a class="jxr_linenumber" name="L940" href="#L940">940</a> <strong class="jxr_keyword">for</strong> ( String root : getCompileSourceRoots() ) -<a class="jxr_linenumber" name="L941" href="#L941">941</a> { -<a class="jxr_linenumber" name="L942" href="#L942">942</a> getLog().debug( <span class="jxr_string">" "</span> + root ); -<a class="jxr_linenumber" name="L943" href="#L943">943</a> } +<a class="jxr_linenumber" name="L931" href="#L931">931</a> getLog().debug( <span class="jxr_string">" "</span> + s ); +<a class="jxr_linenumber" name="L932" href="#L932">932</a> } +<a class="jxr_linenumber" name="L933" href="#L933">933</a> +<a class="jxr_linenumber" name="L934" href="#L934">934</a> <strong class="jxr_keyword">if</strong> ( !getModulepathElements().isEmpty() ) +<a class="jxr_linenumber" name="L935" href="#L935">935</a> { +<a class="jxr_linenumber" name="L936" href="#L936">936</a> getLog().debug( <span class="jxr_string">"Modulepath:"</span> ); +<a class="jxr_linenumber" name="L937" href="#L937">937</a> <strong class="jxr_keyword">for</strong> ( String s : getModulepathElements() ) +<a class="jxr_linenumber" name="L938" href="#L938">938</a> { +<a class="jxr_linenumber" name="L939" href="#L939">939</a> getLog().debug( <span class="jxr_string">" "</span> + s ); +<a class="jxr_linenumber" name="L940" href="#L940">940</a> } +<a class="jxr_linenumber" name="L941" href="#L941">941</a> } +<a class="jxr_linenumber" name="L942" href="#L942">942</a> +<a class="jxr_linenumber" name="L943" href="#L943">943</a> getLog().debug( <span class="jxr_string">"Source roots:"</span> ); <a class="jxr_linenumber" name="L944" href="#L944">944</a> -<a class="jxr_linenumber" name="L945" href="#L945">945</a> <strong class="jxr_keyword">try</strong> +<a class="jxr_linenumber" name="L945" href="#L945">945</a> <strong class="jxr_keyword">for</strong> ( String root : getCompileSourceRoots() ) <a class="jxr_linenumber" name="L946" href="#L946">946</a> { -<a class="jxr_linenumber" name="L947" href="#L947">947</a> <strong class="jxr_keyword">if</strong> ( fork ) -<a class="jxr_linenumber" name="L948" href="#L948">948</a> { -<a class="jxr_linenumber" name="L949" href="#L949">949</a> <strong class="jxr_keyword">if</strong> ( compilerConfiguration.getExecutable() != <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L950" href="#L950">950</a> { -<a class="jxr_linenumber" name="L951" href="#L951">951</a> getLog().debug( <span class="jxr_string">"Excutable: "</span> ); -<a class="jxr_linenumber" name="L952" href="#L952">952</a> getLog().debug( <span class="jxr_string">" "</span> + compilerConfiguration.getExecutable() ); -<a class="jxr_linenumber" name="L953" href="#L953">953</a> } -<a class="jxr_linenumber" name="L954" href="#L954">954</a> } -<a class="jxr_linenumber" name="L955" href="#L955">955</a> -<a class="jxr_linenumber" name="L956" href="#L956">956</a> String[] cl = compiler.createCommandLine( compilerConfiguration ); -<a class="jxr_linenumber" name="L957" href="#L957">957</a> <strong class="jxr_keyword">if</strong> ( getLog().isDebugEnabled() && cl != <strong class="jxr_keyword">null</strong> && cl.length > 0 ) -<a class="jxr_linenumber" name="L958" href="#L958">958</a> { -<a class="jxr_linenumber" name="L959" href="#L959">959</a> StringBuilder sb = <strong class="jxr_keyword">new</strong> StringBuilder(); -<a class="jxr_linenumber" name="L960" href="#L960">960</a> sb.append( cl[0] ); -<a class="jxr_linenumber" name="L961" href="#L961">961</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">int</strong> i = 1; i < cl.length; i++ ) -<a class="jxr_linenumber" name="L962" href="#L962">962</a> { -<a class="jxr_linenumber" name="L963" href="#L963">963</a> sb.append( <span class="jxr_string">" "</span> ); -<a class="jxr_linenumber" name="L964" href="#L964">964</a> sb.append( cl[i] ); -<a class="jxr_linenumber" name="L965" href="#L965">965</a> } -<a class="jxr_linenumber" name="L966" href="#L966">966</a> getLog().debug( <span class="jxr_string">"Command line options:"</span> ); -<a class="jxr_linenumber" name="L967" href="#L967">967</a> getLog().debug( sb ); -<a class="jxr_linenumber" name="L968" href="#L968">968</a> } -<a class="jxr_linenumber" name="L969" href="#L969">969</a> } -<a class="jxr_linenumber" name="L970" href="#L970">970</a> <strong class="jxr_keyword">catch</strong> ( CompilerException ce ) -<a class="jxr_linenumber" name="L971" href="#L971">971</a> { -<a class="jxr_linenumber" name="L972" href="#L972">972</a> getLog().debug( ce ); -<a class="jxr_linenumber" name="L973" href="#L973">973</a> } -<a class="jxr_linenumber" name="L974" href="#L974">974</a> } -<a class="jxr_linenumber" name="L975" href="#L975">975</a> -<a class="jxr_linenumber" name="L976" href="#L976">976</a> -<a class="jxr_linenumber" name="L977" href="#L977">977</a> List<String> jpmsLines = <strong class="jxr_keyword">new</strong> ArrayList<>(); -<a class="jxr_linenumber" name="L978" href="#L978">978</a> -<a class="jxr_linenumber" name="L979" href="#L979">979</a> <em class="jxr_comment">// See http://openjdk.java.net/jeps/261</em> -<a class="jxr_linenumber" name="L980" href="#L980">980</a> <strong class="jxr_keyword">final</strong> List<String> runtimeArgs = Arrays.asList( <span class="jxr_string">"--upgrade-module-path"</span>, -<a class="jxr_linenumber" name="L981" href="#L981">981</a> <span class="jxr_string">"--add-exports"</span>, -<a class="jxr_linenumber" name="L982" href="#L982">982</a> <span class="jxr_string">"--add-reads"</span>, -<a class="jxr_linenumber" name="L983" href="#L983">983</a> <span class="jxr_string">"--add-modules"</span>, -<a class="jxr_linenumber" name="L984" href="#L984">984</a> <span class="jxr_string">"--limit-modules"</span> ); -<a class="jxr_linenumber" name="L985" href="#L985">985</a> -<a class="jxr_linenumber" name="L986" href="#L986">986</a> <em class="jxr_comment">// Custom arguments are all added as keys to an ordered Map</em> -<a class="jxr_linenumber" name="L987" href="#L987">987</a> Iterator<Map.Entry<String, String>> entryIter = -<a class="jxr_linenumber" name="L988" href="#L988">988</a> compilerConfiguration.getCustomCompilerArgumentsEntries().iterator(); -<a class="jxr_linenumber" name="L989" href="#L989">989</a> <strong class="jxr_keyword">while</strong> ( entryIter.hasNext() ) -<a class="jxr_linenumber" name="L990" href="#L990">990</a> { -<a class="jxr_linenumber" name="L991" href="#L991">991</a> Map.Entry<String, String> entry = entryIter.next(); -<a class="jxr_linenumber" name="L992" href="#L992">992</a> -<a class="jxr_linenumber" name="L993" href="#L993">993</a> <strong class="jxr_keyword">if</strong> ( runtimeArgs.contains( entry.getKey() ) ) -<a class="jxr_linenumber" name="L994" href="#L994">994</a> { -<a class="jxr_linenumber" name="L995" href="#L995">995</a> jpmsLines.add( entry.getKey() ); -<a class="jxr_linenumber" name="L996" href="#L996">996</a> -<a class="jxr_linenumber" name="L997" href="#L997">997</a> String value = entry.getValue(); -<a class="jxr_linenumber" name="L998" href="#L998">998</a> <strong class="jxr_keyword">if</strong> ( value == <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L999" href="#L999">999</a> { -<a class="jxr_linenumber" name="L1000" href="#L1000">1000</a> entry = entryIter.next(); -<a class="jxr_linenumber" name="L1001" href="#L1001">1001</a> value = entry.getKey(); -<a class="jxr_linenumber" name="L1002" href="#L1002">1002</a> } -<a class="jxr_linenumber" name="L1003" href="#L1003">1003</a> jpmsLines.add( value ); -<a class="jxr_linenumber" name="L1004" href="#L1004">1004</a> } -<a class="jxr_linenumber" name="L1005" href="#L1005">1005</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"--patch-module"</span>.equals( entry.getKey() ) ) -<a class="jxr_linenumber" name="L1006" href="#L1006">1006</a> { -<a class="jxr_linenumber" name="L1007" href="#L1007">1007</a> String value = entry.getValue(); -<a class="jxr_linenumber" name="L1008" href="#L1008">1008</a> <strong class="jxr_keyword">if</strong> ( value == <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L1009" href="#L1009">1009</a> { -<a class="jxr_linenumber" name="L1010" href="#L1010">1010</a> entry = entryIter.next(); -<a class="jxr_linenumber" name="L1011" href="#L1011">1011</a> value = entry.getKey(); -<a class="jxr_linenumber" name="L1012" href="#L1012">1012</a> } -<a class="jxr_linenumber" name="L1013" href="#L1013">1013</a> -<a class="jxr_linenumber" name="L1014" href="#L1014">1014</a> String[] values = value.split( <span class="jxr_string">"="</span> ); -<a class="jxr_linenumber" name="L1015" href="#L1015">1015</a> -<a class="jxr_linenumber" name="L1016" href="#L1016">1016</a> StringBuilder patchModule = <strong class="jxr_keyword">new</strong> StringBuilder( values[0] ); -<a class="jxr_linenumber" name="L1017" href="#L1017">1017</a> patchModule.append( '=' ); -<a class="jxr_linenumber" name="L1018" href="#L1018">1018</a> -<a class="jxr_linenumber" name="L1019" href="#L1019">1019</a> Set<String> patchModules = <strong class="jxr_keyword">new</strong> LinkedHashSet<>(); -<a class="jxr_linenumber" name="L1020" href="#L1020">1020</a> Set<Path> sourceRoots = <strong class="jxr_keyword">new</strong> HashSet<>( getCompileSourceRoots().size() ); -<a class="jxr_linenumber" name="L1021" href="#L1021">1021</a> <strong class="jxr_keyword">for</strong> ( String sourceRoot : getCompileSourceRoots() ) -<a class="jxr_linenumber" name="L1022" href="#L1022">1022</a> { -<a class="jxr_linenumber" name="L1023" href="#L1023">1023</a> sourceRoots.add( Paths.get( sourceRoot ) ); -<a class="jxr_linenumber" name="L1024" href="#L1024">1024</a> } -<a class="jxr_linenumber" name="L1025" href="#L1025">1025</a> -<a class="jxr_linenumber" name="L1026" href="#L1026">1026</a> String[] files = values[1].split( PS ); -<a class="jxr_linenumber" name="L1027" href="#L1027">1027</a> -<a class="jxr_linenumber" name="L1028" href="#L1028">1028</a> <strong class="jxr_keyword">for</strong> ( String file : files ) -<a class="jxr_linenumber" name="L1029" href="#L1029">1029</a> { -<a class="jxr_linenumber" name="L1030" href="#L1030">1030</a> Path filePath = Paths.get( file ); -<a class="jxr_linenumber" name="L1031" href="#L1031">1031</a> <strong class="jxr_keyword">if</strong> ( getOutputDirectory().toPath().equals( filePath ) ) -<a class="jxr_linenumber" name="L1032" href="#L1032">1032</a> { -<a class="jxr_linenumber" name="L1033" href="#L1033">1033</a> patchModules.add( <span class="jxr_string">"_"</span> ); <em class="jxr_comment">// this jar</em> -<a class="jxr_linenumber" name="L1034" href="#L1034">1034</a> } -<a class="jxr_linenumber" name="L1035" href="#L1035">1035</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( getOutputDirectory().toPath().startsWith( filePath ) ) -<a class="jxr_linenumber" name="L1036" href="#L1036">1036</a> { -<a class="jxr_linenumber" name="L1037" href="#L1037">1037</a> <em class="jxr_comment">// multirelease, can be ignored</em> -<a class="jxr_linenumber" name="L1038" href="#L1038">1038</a> <strong class="jxr_keyword">continue</strong>; +<a class="jxr_linenumber" name="L947" href="#L947">947</a> getLog().debug( <span class="jxr_string">" "</span> + root ); +<a class="jxr_linenumber" name="L948" href="#L948">948</a> } +<a class="jxr_linenumber" name="L949" href="#L949">949</a> +<a class="jxr_linenumber" name="L950" href="#L950">950</a> <strong class="jxr_keyword">try</strong> +<a class="jxr_linenumber" name="L951" href="#L951">951</a> { +<a class="jxr_linenumber" name="L952" href="#L952">952</a> <strong class="jxr_keyword">if</strong> ( fork ) +<a class="jxr_linenumber" name="L953" href="#L953">953</a> { +<a class="jxr_linenumber" name="L954" href="#L954">954</a> <strong class="jxr_keyword">if</strong> ( compilerConfiguration.getExecutable() != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L955" href="#L955">955</a> { +<a class="jxr_linenumber" name="L956" href="#L956">956</a> getLog().debug( <span class="jxr_string">"Excutable: "</span> ); +<a class="jxr_linenumber" name="L957" href="#L957">957</a> getLog().debug( <span class="jxr_string">" "</span> + compilerConfiguration.getExecutable() ); +<a class="jxr_linenumber" name="L958" href="#L958">958</a> } +<a class="jxr_linenumber" name="L959" href="#L959">959</a> } +<a class="jxr_linenumber" name="L960" href="#L960">960</a> +<a class="jxr_linenumber" name="L961" href="#L961">961</a> String[] cl = compiler.createCommandLine( compilerConfiguration ); +<a class="jxr_linenumber" name="L962" href="#L962">962</a> <strong class="jxr_keyword">if</strong> ( getLog().isDebugEnabled() && cl != <strong class="jxr_keyword">null</strong> && cl.length > 0 ) +<a class="jxr_linenumber" name="L963" href="#L963">963</a> { +<a class="jxr_linenumber" name="L964" href="#L964">964</a> StringBuilder sb = <strong class="jxr_keyword">new</strong> StringBuilder(); +<a class="jxr_linenumber" name="L965" href="#L965">965</a> sb.append( cl[0] ); +<a class="jxr_linenumber" name="L966" href="#L966">966</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">int</strong> i = 1; i < cl.length; i++ ) +<a class="jxr_linenumber" name="L967" href="#L967">967</a> { +<a class="jxr_linenumber" name="L968" href="#L968">968</a> sb.append( <span class="jxr_string">" "</span> ); +<a class="jxr_linenumber" name="L969" href="#L969">969</a> sb.append( cl[i] ); +<a class="jxr_linenumber" name="L970" href="#L970">970</a> } +<a class="jxr_linenumber" name="L971" href="#L971">971</a> getLog().debug( <span class="jxr_string">"Command line options:"</span> ); +<a class="jxr_linenumber" name="L972" href="#L972">972</a> getLog().debug( sb ); +<a class="jxr_linenumber" name="L973" href="#L973">973</a> } +<a class="jxr_linenumber" name="L974" href="#L974">974</a> } +<a class="jxr_linenumber" name="L975" href="#L975">975</a> <strong class="jxr_keyword">catch</strong> ( CompilerException ce ) +<a class="jxr_linenumber" name="L976" href="#L976">976</a> { +<a class="jxr_linenumber" name="L977" href="#L977">977</a> getLog().debug( ce ); +<a class="jxr_linenumber" name="L978" href="#L978">978</a> } +<a class="jxr_linenumber" name="L979" href="#L979">979</a> } +<a class="jxr_linenumber" name="L980" href="#L980">980</a> +<a class="jxr_linenumber" name="L981" href="#L981">981</a> +<a class="jxr_linenumber" name="L982" href="#L982">982</a> List<String> jpmsLines = <strong class="jxr_keyword">new</strong> ArrayList<>(); +<a class="jxr_linenumber" name="L983" href="#L983">983</a> +<a class="jxr_linenumber" name="L984" href="#L984">984</a> <em class="jxr_comment">// See http://openjdk.java.net/jeps/261</em> +<a class="jxr_linenumber" name="L985" href="#L985">985</a> <strong class="jxr_keyword">final</strong> List<String> runtimeArgs = Arrays.asList( <span class="jxr_string">"--upgrade-module-path"</span>, +<a class="jxr_linenumber" name="L986" href="#L986">986</a> <span class="jxr_string">"--add-exports"</span>, +<a class="jxr_linenumber" name="L987" href="#L987">987</a> <span class="jxr_string">"--add-reads"</span>, +<a class="jxr_linenumber" name="L988" href="#L988">988</a> <span class="jxr_string">"--add-modules"</span>, +<a class="jxr_linenumber" name="L989" href="#L989">989</a> <span class="jxr_string">"--limit-modules"</span> ); +<a class="jxr_linenumber" name="L990" href="#L990">990</a> +<a class="jxr_linenumber" name="L991" href="#L991">991</a> <em class="jxr_comment">// Custom arguments are all added as keys to an ordered Map</em> +<a class="jxr_linenumber" name="L992" href="#L992">992</a> Iterator<Map.Entry<String, String>> entryIter = +<a class="jxr_linenumber" name="L993" href="#L993">993</a> compilerConfiguration.getCustomCompilerArgumentsEntries().iterator(); +<a class="jxr_linenumber" name="L994" href="#L994">994</a> <strong class="jxr_keyword">while</strong> ( entryIter.hasNext() ) +<a class="jxr_linenumber" name="L995" href="#L995">995</a> { +<a class="jxr_linenumber" name="L996" href="#L996">996</a> Map.Entry<String, String> entry = entryIter.next(); +<a class="jxr_linenumber" name="L997" href="#L997">997</a> +<a class="jxr_linenumber" name="L998" href="#L998">998</a> <strong class="jxr_keyword">if</strong> ( runtimeArgs.contains( entry.getKey() ) ) +<a class="jxr_linenumber" name="L999" href="#L999">999</a> { +<a class="jxr_linenumber" name="L1000" href="#L1000">1000</a> jpmsLines.add( entry.getKey() ); +<a class="jxr_linenumber" name="L1001" href="#L1001">1001</a> +<a class="jxr_linenumber" name="L1002" href="#L1002">1002</a> String value = entry.getValue(); +<a class="jxr_linenumber" name="L1003" href="#L1003">1003</a> <strong class="jxr_keyword">if</strong> ( value == <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L1004" href="#L1004">1004</a> { +<a class="jxr_linenumber" name="L1005" href="#L1005">1005</a> entry = entryIter.next(); +<a class="jxr_linenumber" name="L1006" href="#L1006">1006</a> value = entry.getKey(); +<a class="jxr_linenumber" name="L1007" href="#L1007">1007</a> } +<a class="jxr_linenumber" name="L1008" href="#L1008">1008</a> jpmsLines.add( value ); +<a class="jxr_linenumber" name="L1009" href="#L1009">1009</a> } +<a class="jxr_linenumber" name="L1010" href="#L1010">1010</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"--patch-module"</span>.equals( entry.getKey() ) ) +<a class="jxr_linenumber" name="L1011" href="#L1011">1011</a> { +<a class="jxr_linenumber" name="L1012" href="#L1012">1012</a> String value = entry.getValue(); +<a class="jxr_linenumber" name="L1013" href="#L1013">1013</a> <strong class="jxr_keyword">if</strong> ( value == <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L1014" href="#L1014">1014</a> { +<a class="jxr_linenumber" name="L1015" href="#L1015">1015</a> entry = entryIter.next(); +<a class="jxr_linenumber" name="L1016" href="#L1016">1016</a> value = entry.getKey(); +<a class="jxr_linenumber" name="L1017" href="#L1017">1017</a> } +<a class="jxr_linenumber" name="L1018" href="#L1018">1018</a> +<a class="jxr_linenumber" name="L1019" href="#L1019">1019</a> String[] values = value.split( <span class="jxr_string">"="</span> ); +<a class="jxr_linenumber" name="L1020" href="#L1020">1020</a> +<a class="jxr_linenumber" name="L1021" href="#L1021">1021</a> StringBuilder patchModule = <strong class="jxr_keyword">new</strong> StringBuilder( values[0] ); +<a class="jxr_linenumber" name="L1022" href="#L1022">1022</a> patchModule.append( '=' ); +<a class="jxr_linenumber" name="L1023" href="#L1023">1023</a> +<a class="jxr_linenumber" name="L1024" href="#L1024">1024</a> Set<String> patchModules = <strong class="jxr_keyword">new</strong> LinkedHashSet<>(); +<a class="jxr_linenumber" name="L1025" href="#L1025">1025</a> Set<Path> sourceRoots = <strong class="jxr_keyword">new</strong> HashSet<>( getCompileSourceRoots().size() ); +<a class="jxr_linenumber" name="L1026" href="#L1026">1026</a> <strong class="jxr_keyword">for</strong> ( String sourceRoot : getCompileSourceRoots() ) +<a class="jxr_linenumber" name="L1027" href="#L1027">1027</a> { +<a class="jxr_linenumber" name="L1028" href="#L1028">1028</a> sourceRoots.add( Paths.get( sourceRoot ) ); +<a class="jxr_linenumber" name="L1029" href="#L1029">1029</a> } +<a class="jxr_linenumber" name="L1030" href="#L1030">1030</a> +<a class="jxr_linenumber" name="L1031" href="#L1031">1031</a> String[] files = values[1].split( PS ); +<a class="jxr_linenumber" name="L1032" href="#L1032">1032</a> +<a class="jxr_linenumber" name="L1033" href="#L1033">1033</a> <strong class="jxr_keyword">for</strong> ( String file : files ) +<a class="jxr_linenumber" name="L1034" href="#L1034">1034</a> { +<a class="jxr_linenumber" name="L1035" href="#L1035">1035</a> Path filePath = Paths.get( file ); +<a class="jxr_linenumber" name="L1036" href="#L1036">1036</a> <strong class="jxr_keyword">if</strong> ( getOutputDirectory().toPath().equals( filePath ) ) +<a class="jxr_linenumber" name="L1037" href="#L1037">1037</a> { +<a class="jxr_linenumber" name="L1038" href="#L1038">1038</a> patchModules.add( <span class="jxr_string">"_"</span> ); <em class="jxr_comment">// this jar</em> <a class="jxr_linenumber" name="L1039" href="#L1039">1039</a> } -<a class="jxr_linenumber" name="L1040" href="#L1040">1040</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( sourceRoots.contains( filePath ) ) +<a class="jxr_linenumber" name="L1040" href="#L1040">1040</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( getOutputDirectory().toPath().startsWith( filePath ) ) <a class="jxr_linenumber" name="L1041" href="#L1041">1041</a> { -<a class="jxr_linenumber" name="L1042" href="#L1042">1042</a> patchModules.add( <span class="jxr_string">"_"</span> ); <em class="jxr_comment">// this jar</em> -<a class="jxr_linenumber" name="L1043" href="#L1043">1043</a> } -<a class="jxr_linenumber" name="L1044" href="#L1044">1044</a> <strong class="jxr_keyword">else</strong> -<a class="jxr_linenumber" name="L1045" href="#L1045">1045</a> { -<a class="jxr_linenumber" name="L1046" href="#L1046">1046</a> JavaModuleDescriptor descriptor = getPathElements().get( file ); -<a class="jxr_linenumber" name="L1047" href="#L1047">1047</a> -<a class="jxr_linenumber" name="L1048" href="#L1048">1048</a> <strong class="jxr_keyword">if</strong> ( descriptor == <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L1049" href="#L1049">1049</a> { -<a class="jxr_linenumber" name="L1050" href="#L1050">1050</a> <strong class="jxr_keyword">if</strong> ( Files.isDirectory( filePath ) ) -<a class="jxr_linenumber" name="L1051" href="#L1051">1051</a> { -<a class="jxr_linenumber" name="L1052" href="#L1052">1052</a> patchModules.add( file ); -<a class="jxr_linenumber" name="L1053" href="#L1053">1053</a> } -<a class="jxr_linenumber" name="L1054" href="#L1054">1054</a> <strong class="jxr_keyword">else</strong> -<a class="jxr_linenumber" name="L1055" href="#L1055">1055</a> { -<a class="jxr_linenumber" name="L1056" href="#L1056">1056</a> getLog().warn( <span class="jxr_string">"Can't locate "</span> + file );
[... 1375 lines stripped ...]