external/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 @@ -136,8 +136,6 @@
   4    <property name="javac.deprecation"
   5              value="true"
   6              description="Indicates whether source should be compiled with deprecation information" />
   7 -  <property name="javac.source" value="1.5" description="Provide source compatibility with specified release" />
   8 -  <property name="javac.target" value="1.5" description="Generate class files for specific VM version" />
   9
  10    <!-- Build Cache properties -->
  11    <property name="build.cache.dir"
  12 @@ -261,7 +261,7 @@ TYPICAL TARGET SEQUENCE
  13    <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)" />
  14    <fail message="A project revision number has not been determined!">
  15      <condition>
  16 -      <matches string="${project.revision}" pattern="\$\{.*\}" />
  17 +      <contains string="${project.revision}" substring="\$\{" />
  18      </condition>
  19    </fail>
  20
  21 @@ -270,7 +270,7 @@ TYPICAL TARGET SEQUENCE
  22    <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)" />
  23    <fail message="A project title has not been determined!">
  24      <condition>
  25 -      <matches string="${impl.title}" pattern="\$\{.*\}" />
  26 +      <contains string="${impl.title}" substring="\$\{" />
  27      </condition>
  28    </fail>
  29
  30 @@ -497,7 +497,7 @@
  31          Sets a property build.id to the either "development" or the svn revision
  32          if in release mode
  33          ====================================================================-->
  34 -  <target name="set-build.id" unless="build.id" depends="install-antcontrib">
  35 +  <target name="set-build.id" unless="build.id" >
  36      <if>
  37        <istrue value="${release}" />
  38        <then>
  39 @@ -1061,12 +1061,17 @@
  40             Performs the actual compile
  41             ====================================================================-->
  42    <target name="compile.compile" depends="init">
  43 +    <copy todir="${classes.dir}">
  44 +      <fileset dir="source">
  45 +        <include name="**/*.properties"/>
  46 +      </fileset>
  47 +    </copy>
  48      <javac destdir="${classes.dir}"
  49             debug="${javac.debug}"
  50             deprecation="${javac.deprecation}"
  51             fork="true"
  52 -           source="${javac.source}"
  53 -           target="${javac.target}">
  54 +           source="${ant.build.javac.source}"
  55 +           target="${ant.build.javac.target}">
  56        <classpath>
  57          <path refid="classpath" />
  58        </classpath>
  59 @@ -1082,27 +1087,32 @@
  60             duplicate copying of resources from src tree (handled by compile.src_copy
  61             if jar.include.source is set.
  62             ====================================================================-->
  63 -  <target name="compile.res_copy" depends="install-antcontrib">
  64 -    <if>
  65 -      <available file="${res.dir}" />
  66 -      <then>
  67 -        <copy todir="${classes.dir}">
  68 -          <fileset dir="${res.dir}" />
  69 -        </copy>
  70 -      </then>
  71 -    </if>
  72 +  <target name="compile.res_copy" >
  73 +    <condition property="copy.res.available">
  74 +        <available file="$(res.dir)" type="dir" />
  75 +    </condition>
  76 +    <antcall target="copy.res" />
  77
  78 -    <if>
  79 -      <not>
  80 -        <isset property="jar.include.source" />
  81 -      </not>
  82 -      <then>
  83 -        <copy todir="${classes.dir}" flatten="false">
  84 -          <fileset dir="${src.dir}" excludes="**/*.java" />
  85 -        </copy>
  86 -      </then>
  87 -    </if>
  88 -  </target>
  89 +    <condition property="copy.res.class.available">
  90 +        <not>
  91 +            <isset property="jar.include.source" />
  92 +        </not>
  93 +    </condition>
  94 +    <antcall target="copy.res.class" />
  95 + </target>
  96 +
  97 + <target name="copy.res" if="copy.res.available" >
  98 +    <copy todir="${classes.dir}">
  99 +        <fileset dir="${res.dir}"/>
 100 +    </copy>
 101 + </target>
 102 +
 103 + <target name="copy.res.class" if="copy.res.class.available" >
 104 +    <uptodate targetfile="${classes.dir}" property="s">
 105 +        <srcfiles dir= "${src.dir}" excludes="**/*.java" />
 106 +        <flattenmapper/>
 107 +    </uptodate>
 108 + </target>
 109
 110
 111    <!--=======================================================================
 112 @@ -1167,7 +1177,6 @@
 113    <target name="generate.manifest" depends="init,set-build.id">
 114      <delete file="${dist.manifest.file}" />
 115      <touch file="${dist.manifest.file}" />
 116 -    <copy file="${manifest.file}" tofile="${dist.manifest.file}" overwrite="true" failonerror="false" />
 117
 118      <manifest file="${dist.manifest.file}" mode="update">
 119        <attribute name="Implementation-Title" value="${impl.title}" />