[closure-compiler] 04/04: Removed unnecessary changes from build_xml.patch
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Thu Sep 12 12:12:38 UTC 2013
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository closure-compiler.
commit c74f11dcd42d9ad210443aea42ac6964975408c7
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Sep 12 14:11:08 2013 +0200
Removed unnecessary changes from build_xml.patch
---
debian/ant.properties | 1 +
debian/changelog | 1 +
debian/patches/build_xml.patch | 73 +++++++++++++++++-----------------------
3 files changed, 33 insertions(+), 42 deletions(-)
diff --git a/debian/ant.properties b/debian/ant.properties
index bdf9575..2097f8a 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1 +1,2 @@
build.svnVersion = 20130227
+lib.dir=/usr/share/java
diff --git a/debian/changelog b/debian/changelog
index bceeded..3da8f29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ closure-compiler (20130227+dfsg1-3) UNRELEASED; urgency=low
in Guava with ByteStreams.limit()
* Added the watch file
* Removed the build dependency on ant1.7
+ * Removed unnecessary changes from build_xml.patch
-- Emmanuel Bourg <ebourg at apache.org> Thu, 12 Sep 2013 12:46:47 +0200
diff --git a/debian/patches/build_xml.patch b/debian/patches/build_xml.patch
index 775df99..354f308 100644
--- a/debian/patches/build_xml.patch
+++ b/debian/patches/build_xml.patch
@@ -10,34 +10,10 @@ Description: Adapt ant build.xml to Debian
Last-Update: 2013-02-22
Forwarded: not-needed
-Index: closure-compiler/build.xml
-===================================================================
---- closure-compiler.orig/build.xml 2013-03-05 09:06:47.192969082 +0100
-+++ closure-compiler/build.xml 2013-03-05 09:08:24.656966907 +0100
-@@ -13,7 +13,7 @@
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
--<project name="compiler" basedir="." default="jar" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-+<project name="compiler" basedir="." default="jar-nodeps" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
- <!--
- Use -Dtest.class to change what tests are run on the command-line.
-@@ -47,7 +47,7 @@
- <property name="classes.dir" value="${build.dir}/classes" />
- <property name="testClasses.dir" value="${build.dir}/test" />
- <property name="javadoc.dir" value="${build.dir}/javadoc" />
-- <property name="lib.dir" value="${basedir}/lib" />
-+ <property name="lib.dir" value="/usr/share/java" />
- <property name="tools.dir" value="${basedir}/tools" />
- <property name="compiler-jarfile"
- value="${build.dir}/${ant.project.name}.jar" />
-@@ -73,21 +73,21 @@
- <!-- proto compiler used to generate java classes from .proto files -->
- <property name="protoc.executable" value="protoc"/>
-
-- <property file="build.properties" />
-+ <property file="debian/ant.properties" />
+--- a/build.xml
++++ b/build.xml
+@@ -76,18 +76,20 @@
+ <property file="build.properties" />
<!-- maven ant tasks -->
- <path id="maven-ant-tasks.classpath" path="${tools.dir}/maven-ant-tasks-2.1.3.jar" />
@@ -48,17 +24,17 @@ Index: closure-compiler/build.xml
<!-- gather svn version -->
<target name="svnversion">
-- <exec outputproperty="build.svnVersion"
-+ <!--exec outputproperty="build.svnVersion"
++<!--
+ <exec outputproperty="build.svnVersion"
executable="svnversion"
failonerror="false"
failifexecutionfails="false"
-- dir="."/>
-+ dir="."/-->
+ dir="."/>
++-->
</target>
<!-- compile rhino -->
-@@ -102,13 +102,14 @@
+@@ -102,13 +104,14 @@
</target>
<target name="rhino-jarjar"
@@ -76,7 +52,7 @@ Index: closure-compiler/build.xml
<rule pattern="org.mozilla.javascript.**"
result="com.google.javascript.rhino.head. at 1"/>
</jarjar>
-@@ -119,6 +120,7 @@
+@@ -119,6 +122,7 @@
<include name="**/*.proto"/>
</fileset>
<pathconvert property="protofiles" pathsep=" " refid="proto.classpath"/>
@@ -84,7 +60,7 @@ Index: closure-compiler/build.xml
<echo message="${protoc.executable} -I ${src.dir} --java_out=${gen.dir} ${protofiles}"/>
<exec executable="${protoc.executable}" searchpath="true">
<arg line="-I ${src.dir}"/>
-@@ -136,9 +138,9 @@
+@@ -136,9 +140,9 @@
</filterset>
</copy>
@@ -97,7 +73,7 @@ Index: closure-compiler/build.xml
<artifact:pom id="project" file="${build.dir}/pom.xml" />
</target>
-@@ -224,7 +226,7 @@
+@@ -224,7 +228,7 @@
<include name="guava.jar"/>
<include name="json.jar"/>
<include name="jsr305.jar"/>
@@ -106,7 +82,7 @@ Index: closure-compiler/build.xml
</fileset>
<fileset dir="${buildlib.dir}">
<include name="rhino.jar"/>
-@@ -234,7 +236,12 @@
+@@ -234,7 +238,12 @@
<path id="allclasspath.path">
<pathelement location="${classes.dir}" />
<fileset dir="${lib.dir}">
@@ -120,7 +96,7 @@ Index: closure-compiler/build.xml
</fileset>
<fileset dir="${buildlib.dir}">
<include name="rhino.jar"/>
-@@ -243,11 +250,12 @@
+@@ -243,11 +252,12 @@
<target name="clean" description="delete generated files">
<delete dir="${build.dir}" />
@@ -134,10 +110,23 @@ Index: closure-compiler/build.xml
<mkdir dir="${classes.dir}" />
<javac srcdir="${gen.dir}"
destdir="${classes.dir}"
-Index: closure-compiler/closure-compiler.pom
-===================================================================
---- closure-compiler.orig/closure-compiler.pom 2013-03-05 09:15:57.748956797 +0100
-+++ closure-compiler/closure-compiler.pom 2013-03-05 09:15:53.268956897 +0100
+@@ -304,14 +314,6 @@
+ <jar destfile="${compiler-jarfile}" update="true">
+ <fileset dir="${classes.dir}" />
+ <fileset dir="${build.dir}" includes="externs.zip" />
+- <zipfileset src="${lib.dir}/args4j.jar"/>
+- <zipfileset src="${lib.dir}/guava.jar"/>
+- <zipfileset src="${lib.dir}/json.jar"/>
+- <zipfileset src="${lib.dir}/jsr305.jar"/>
+- <zipfileset src="${lib.dir}/protobuf-java.jar"/>
+-
+- <zipfileset src="${buildlib.dir}/rhino.jar"/>
+-
+ <manifest>
+ <attribute name="Main-Class"
+ value="com.google.javascript.jscomp.CommandLineRunner" />
+--- a/closure-compiler.pom
++++ b/closure-compiler.pom
@@ -24,7 +24,7 @@
<packaging>jar</packaging>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/closure-compiler.git
More information about the pkg-java-commits
mailing list