jfreereport/patches/common_build.patch

   1 --- misc/libloader-1.1.3/common_build.xml       2009-11-16 10:25:34.000000000 +0100
   2 +++ misc/build/libloader-1.1.3/common_build.xml 2009-12-04 10:22:24.277647200 +0100
   3 @@ -261,7 +261,7 @@ TYPICAL TARGET SEQUENCE
   4    <property name="project.revision" value="${Implementation-Version}" description="Sets the version number of the project based on the Implementation-Version found in the manifest file (if one is supplied and nothing is specified in the build.properties)" />
   5    <fail message="A project revision number has not been determined!">
   6      <condition>
   7 -      <matches string="${project.revision}" pattern="\$\{.*\}" />
   8 +      <contains string="${project.revision}" substring="\$\{" />
   9      </condition>
  10    </fail>
  11
  12 @@ -270,7 +270,7 @@ TYPICAL TARGET SEQUENCE
  13    <property name="impl.title" value="${Implementation-Title}" description="Sets the title of the project based on the Implementation-Title found in the manifest file (if one is supplied and nothing is specified in the build.properties)" />
  14    <fail message="A project title has not been determined!">
  15      <condition>
  16 -      <matches string="${impl.title}" pattern="\$\{.*\}" />
  17 +      <contains string="${impl.title}" substring="\$\{" />
  18      </condition>
  19    </fail>
  20
  21 @@ -497,7 +497,7 @@
  22          Sets a property build.id to the either "development" or the svn revision
  23          if in release mode
  24          ====================================================================-->
  25 -  <target name="set-build.id" unless="build.id" depends="install-antcontrib">
  26 +  <target name="set-build.id" unless="build.id" >
  27      <if>
  28        <istrue value="${release}" />
  29        <then>
  30 @@ -1061,6 +1061,11 @@
  31             Performs the actual compile
  32             ====================================================================-->
  33    <target name="compile.compile" depends="init">
  34 +    <copy todir="${classes.dir}">
  35 +      <fileset dir="source">
  36 +        <include name="**/*.properties"/>
  37 +      </fileset>
  38 +    </copy>
  39      <javac destdir="${classes.dir}"
  40             debug="${javac.debug}"
  41             deprecation="${javac.deprecation}"
  42 @@ -1082,27 +1087,32 @@
  43             duplicate copying of resources from src tree (handled by compile.src_copy
  44             if jar.include.source is set.
  45             ====================================================================-->
  46 -  <target name="compile.res_copy" depends="install-antcontrib">
  47 -    <if>
  48 -      <available file="${res.dir}" />
  49 -      <then>
  50 -        <copy todir="${classes.dir}">
  51 -          <fileset dir="${res.dir}" />
  52 -        </copy>
  53 -      </then>
  54 -    </if>
  55 +  <target name="compile.res_copy" >
  56 +    <condition property="copy.res.available">
  57 +        <available file="$(res.dir)" type="dir" />
  58 +    </condition>
  59 +    <antcall target="copy.res" />
  60
  61 -    <if>
  62 -      <not>
  63 -        <isset property="jar.include.source" />
  64 -      </not>
  65 -      <then>
  66 -        <copy todir="${classes.dir}" flatten="false">
  67 -          <fileset dir="${src.dir}" excludes="**/*.java" />
  68 -        </copy>
  69 -      </then>
  70 -    </if>
  71 -  </target>
  72 +    <condition property="copy.res.class.available">
  73 +        <not>
  74 +            <isset property="jar.include.source" />
  75 +        </not>
  76 +    </condition>
  77 +    <antcall target="copy.res.class" />
  78 + </target>
  79 +
  80 + <target name="copy.res" if="copy.res.available" >
  81 +    <copy todir="${classes.dir}">
  82 +        <fileset dir="${res.dir}"/>
  83 +    </copy>
  84 + </target>
  85 +
  86 + <target name="copy.res.class" if="copy.res.class.available" >
  87 +    <uptodate targetfile="${classes.dir}" property="s">
  88 +        <srcfiles dir= "${src.dir}" excludes="**/*.java" />
  89 +        <flattenmapper/>
  90 +    </uptodate>
  91 + </target>
  92
  93
  94    <!--=======================================================================
  95 @@ -1167,7 +1177,6 @@
  96    <target name="generate.manifest" depends="init,set-build.id">
  97      <delete file="${dist.manifest.file}" />
  98      <touch file="${dist.manifest.file}" />
  99 -    <copy file="${manifest.file}" tofile="${dist.manifest.file}" overwrite="true" failonerror="false" />
 100
 101      <manifest file="${dist.manifest.file}" mode="update">
 102        <attribute name="Implementation-Title" value="${impl.title}" />