make/ide/idea/langtools/build.xml

*** 1,8 ****
  <?xml version="1.0" encoding="UTF-8"?>
  <!--
!   ~ Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
    ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    ~
    ~ This code is free software; you can redistribute it and/or modify it
    ~ under the terms of the GNU General Public License version 2 only, as
    ~ published by the Free Software Foundation.  Oracle designates this
--- 1,8 ----
  <?xml version="1.0" encoding="UTF-8"?>
  <!--
!   ~ Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
    ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    ~
    ~ This code is free software; you can redistribute it and/or modify it
    ~ under the terms of the GNU General Public License version 2 only, as
    ~ published by the Free Software Foundation.  Oracle designates this
*** 59,82 ****
      -->
  
      <!-- The following locations can be used to override default property values. -->
  
      <!-- Use this location for customizations specific to this instance of this workspace -->
!     <property file="make/langtools/build.properties"/>
  
      <!-- Use this location for customizations common to all OpenJDK langtools workspaces -->
      <property file="${user.home}/.openjdk/${ant.project.name}-build.properties"/>
  
      <!-- Use this location for customizations common to all OpenJDK workspaces -->
      <property file="${user.home}/.openjdk/build.properties"/>
  
      <!-- Convenient shorthands for standard locations within the workspace. -->
      <property name="src.dir" location="src"/>
      <property name="test.dir" location="test"/>
!     <property name="make.dir" location="make/langtools"/>
      <property name="make.conf.dir" location="${make.dir}/conf"/>
!     <property name="make.tools.dir" location="${make.dir}/tools"/>
      <property name="build.dir" location="build/langtools"/>
      <property name="build.modules" location="${build.dir}/modules"/>
      <property name="build.gensrc" location="${build.dir}/gensrc"/>
      <property name="build.tools" location="${build.dir}/toolclasses"/>
      <property name="build.bin" location="${build.dir}/bin"/>
--- 59,83 ----
      -->
  
      <!-- The following locations can be used to override default property values. -->
  
      <!-- Use this location for customizations specific to this instance of this workspace -->
!     <property file="make/ide/idea/langtools/build.properties"/>
  
      <!-- Use this location for customizations common to all OpenJDK langtools workspaces -->
      <property file="${user.home}/.openjdk/${ant.project.name}-build.properties"/>
  
      <!-- Use this location for customizations common to all OpenJDK workspaces -->
      <property file="${user.home}/.openjdk/build.properties"/>
  
      <!-- Convenient shorthands for standard locations within the workspace. -->
      <property name="src.dir" location="src"/>
      <property name="test.dir" location="test"/>
!     <property name="make.dir" location="make/ide/idea/langtools"/>
      <property name="make.conf.dir" location="${make.dir}/conf"/>
!     <property name="make.tools.dir" location="make/langtools/tools"/>
!     <property name="make.ideatools.dir" location="${make.dir}/tools"/>
      <property name="build.dir" location="build/langtools"/>
      <property name="build.modules" location="${build.dir}/modules"/>
      <property name="build.gensrc" location="${build.dir}/gensrc"/>
      <property name="build.tools" location="${build.dir}/toolclasses"/>
      <property name="build.bin" location="${build.dir}/bin"/>
*** 284,294 ****
          <copy todir="${build.tools}/propertiesparser" >
              <fileset dir="${make.tools.dir}/propertiesparser" includes="**/resources/**"/>
          </copy>
          <javac source="${javac.build.source}"
                 target="${javac.build.target}"
!                srcdir="${make.tools.dir}"
                 includes="propertiesparser/* anttasks/PropertiesParser* anttasks/PathFileSet*"
                 destdir="${build.tools}"
                 classpath="${ant.core.lib}"
                 bootclasspath="${langtools.jdk.home}/jre/lib/rt.jar"
                 includeantruntime="false">
--- 285,295 ----
          <copy todir="${build.tools}/propertiesparser" >
              <fileset dir="${make.tools.dir}/propertiesparser" includes="**/resources/**"/>
          </copy>
          <javac source="${javac.build.source}"
                 target="${javac.build.target}"
!                srcdir="${make.tools.dir}:${make.ideatools.dir}"
                 includes="propertiesparser/* anttasks/PropertiesParser* anttasks/PathFileSet*"
                 destdir="${build.tools}"
                 classpath="${ant.core.lib}"
                 bootclasspath="${langtools.jdk.home}/jre/lib/rt.jar"
                 includeantruntime="false">
*** 301,311 ****
  
       <target name="-def-pcompile">
          <javac
                 source="${javac.build.source}"
                 target="${javac.build.target}"
!                srcdir="${make.tools.dir}"
                 includes="compileproperties/* anttasks/CompileProperties* anttasks/PathFileSet*"
                 destdir="${build.dir}/toolclasses/"
                 classpath="${ant.core.lib}"
                 includeantruntime="false">
              <compilerarg line="${javac.build.opts} -XDstringConcat=inline"/>
--- 302,312 ----
  
       <target name="-def-pcompile">
          <javac
                 source="${javac.build.source}"
                 target="${javac.build.target}"
!                srcdir="${make.tools.dir}:${make.ideatools.dir}"
                 includes="compileproperties/* anttasks/CompileProperties* anttasks/PathFileSet*"
                 destdir="${build.dir}/toolclasses/"
                 classpath="${ant.core.lib}"
                 includeantruntime="false">
              <compilerarg line="${javac.build.opts} -XDstringConcat=inline"/>