Author: ebourg-guest
Date: 2013-07-26 10:12:37 +0000 (Fri, 26 Jul 2013)
New Revision: 17073
Added:
trunk/bnd/debian/patches/fix-encoding.diff
Modified:
trunk/bnd/debian/bootstrap.xml
trunk/bnd/debian/changelog
trunk/bnd/debian/patches/series
Log:
Fixed the unmappable character errors during the compilation
Modified: trunk/bnd/debian/bootstrap.xml
===================================================================
--- trunk/bnd/debian/bootstrap.xml 2013-07-26 09:45:06 UTC (rev 17072)
+++ trunk/bnd/debian/bootstrap.xml 2013-07-26 10:12:37 UTC (rev 17073)
@@ -11,6 +11,7 @@
<javac
destdir="bootstrap/build"
classpath="/usr/share/java/osgi.core.jar:/usr/share/java/osgi.compendium.jar:/usr/share/java/bindex.jar"
+ encoding="UTF-8"
debug="true">
<src path="aQute.libg/src"/>
<src path="biz.aQute.bndlib/src"/>
Modified: trunk/bnd/debian/changelog
===================================================================
--- trunk/bnd/debian/changelog 2013-07-26 09:45:06 UTC (rev 17072)
+++ trunk/bnd/debian/changelog 2013-07-26 10:12:37 UTC (rev 17073)
@@ -3,6 +3,7 @@
* debian/watch: Updated to catch the recent releases on Github
* debian/control: Updated Standards-Version to 3.9.4 (no changes)
* debian/rules: Improved the clean target
+ * Fixed the unmappable character errors during the compilation
-- Emmanuel Bourg <[email protected]> Fri, 26 Jul 2013 11:28:27 +0200
Added: trunk/bnd/debian/patches/fix-encoding.diff
===================================================================
--- trunk/bnd/debian/patches/fix-encoding.diff (rev 0)
+++ trunk/bnd/debian/patches/fix-encoding.diff 2013-07-26 10:12:37 UTC (rev
17073)
@@ -0,0 +1,11 @@
+--- a/cnf/build.xml
++++ b/cnf/build.xml
+@@ -49,7 +49,7 @@
+ -->
+ <target name="compile" depends="dependencies" if="project.sourcepath">
+ <mkdir dir="${project.output}" />
+- <javac fork="yes" executable="${javac}"
srcdir="${project.sourcepath}" destdir="${project.output}"
classpath="${project.buildpath}" bootclasspath="${project.bootclasspath}"
deprecation="true" listfiles="true" target="${javac.target}"
source="${javac.source}" debug="${javac.debug}" includeAntRuntime="no"
verbose="${verbose}" excludes="${javac.excludes}" />
++ <javac fork="yes" executable="${javac}"
srcdir="${project.sourcepath}" destdir="${project.output}"
classpath="${project.buildpath}" bootclasspath="${project.bootclasspath}"
deprecation="true" listfiles="true" target="${javac.target}"
source="${javac.source}" debug="${javac.debug}" includeAntRuntime="no"
verbose="${verbose}" excludes="${javac.excludes}" encoding="UTF-8"/>
+ <!--
+ The eclipse compiler copies resources but the Javac compiler
does not
+ If ${src} == ${bin} then this is not necessary, but
unfortunately, now
Modified: trunk/bnd/debian/patches/series
===================================================================
--- trunk/bnd/debian/patches/series 2013-07-26 09:45:06 UTC (rev 17072)
+++ trunk/bnd/debian/patches/series 2013-07-26 10:12:37 UTC (rev 17073)
@@ -5,3 +5,4 @@
osgi43_fixes.diff
display_bsn_on_missing_bundle.diff
find_swt_jar.diff
+fix-encoding.diff
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
