diff options
Diffstat (limited to 'jfreereport/patches/common_build.patch')
| -rwxr-xr-x | jfreereport/patches/common_build.patch | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/jfreereport/patches/common_build.patch b/jfreereport/patches/common_build.patch index 3d5330b..2bc5459 100755 --- a/jfreereport/patches/common_build.patch +++ b/jfreereport/patches/common_build.patch @@ -1,5 +1,23 @@ --- misc/libloader-1.1.3/common_build.xml 2009-11-16 10:25:34.000000000 +0100 +++ misc/build/libloader-1.1.3/common_build.xml 2009-12-04 10:22:24.277647200 +0100 +@@ -261,7 +261,7 @@ TYPICAL TARGET SEQUENCE + <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)" /> + <fail message="A project revision number has not been determined!"> + <condition> +- <matches string="${project.revision}" pattern="\$\{.*\}" /> ++ <contains string="${project.revision}" substring="\$\{" /> + </condition> + </fail> + +@@ -270,7 +270,7 @@ TYPICAL TARGET SEQUENCE + <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)" /> + <fail message="A project title has not been determined!"> + <condition> +- <matches string="${impl.title}" pattern="\$\{.*\}" /> ++ <contains string="${impl.title}" substring="\$\{" /> + </condition> + </fail> + @@ -497,7 +497,7 @@ Sets a property build.id to the either "development" or the svn revision if in release mode @@ -21,7 +39,7 @@ <javac destdir="${classes.dir}" debug="${javac.debug}" deprecation="${javac.deprecation}" -@@ -1082,27 +1082,32 @@ +@@ -1082,27 +1087,32 @@ duplicate copying of resources from src tree (handled by compile.src_copy if jar.include.source is set. ====================================================================--> @@ -74,3 +92,11 @@ <!--======================================================================= +@@ -1167,7 +1177,6 @@ + <target name="generate.manifest" depends="init,set-build.id"> + <delete file="${dist.manifest.file}" /> + <touch file="${dist.manifest.file}" /> +- <copy file="${manifest.file}" tofile="${dist.manifest.file}" overwrite="true" failonerror="false" /> + + <manifest file="${dist.manifest.file}" mode="update"> + <attribute name="Implementation-Title" value="${impl.title}" /> |