aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2014-07-01 17:36:37 +0300
committerDamian Minkov <damencho@jitsi.org>2014-07-01 17:36:37 +0300
commit18d1110b73be9acadb5fc1bde1b4a009c8cc916b (patch)
tree729a59cded9a4ed88d5ca4a1c6877b7ca381dac0 /resources
parent04392c4cec0436d002bd22ff6fa9dbccce6b0a8f (diff)
downloadjitsi-18d1110b73be9acadb5fc1bde1b4a009c8cc916b.zip
jitsi-18d1110b73be9acadb5fc1bde1b4a009c8cc916b.tar.gz
jitsi-18d1110b73be9acadb5fc1bde1b4a009c8cc916b.tar.bz2
Updates deb-src to use libphonenumber sources.
Diffstat (limited to 'resources')
-rw-r--r--resources/install/build.xml23
-rw-r--r--resources/install/debian/control-src.tmpl1
2 files changed, 22 insertions, 2 deletions
diff --git a/resources/install/build.xml b/resources/install/build.xml
index b7e89a4..1ce62e4 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -2444,6 +2444,9 @@
and libsrc
-->
+ <unzip src="${sc.basedir}/../libsrc/libphonenumber-6.3-SNAPSHOT-sources.jar"
+ dest="${debian.src.dir}/lib/src/libphonenumber/src"/>
+
<!-- jdic_misc -->
<unzip src="${sc.basedir}/../libsrc/jdic_misc.zip"
dest="${debian.src.dir}/lib/src/">
@@ -2641,10 +2644,28 @@
<property name="debian.src.dir"
value="${debian.tmp.dir}/${package.name}-${sip-communicator.version}" />
- <!--TODO-->
+ <!--TODO
<symlink resource="/usr/share/java/libphonenumber.jar"
overwrite="true"
link="${debian.src.dir}/lib/installer-exclude/"/>
+ -->
+ <mkdir dir="${debian.src.dir}/lib/src/libphonenumber/classes"/>
+ <javac debug="true"
+ deprecation="true" destdir="${debian.src.dir}/lib/src/libphonenumber/classes"
+ nowarn="false"
+ source="1.6" target="1.6" fork="true">
+ <src path="${debian.src.dir}/lib/src/libphonenumber/src"/>
+ <include name="**/*.java" />
+ </javac>
+ <jar compress="true" destfile="${debian.src.dir}/lib/src/libphonenumber/libphonenumber.jar">
+ <zipfileset dir="${debian.src.dir}/lib/src/libphonenumber/classes"/>
+ <zipfileset dir="${debian.src.dir}/lib/src/libphonenumber/src">
+ <include name="com/google/i18n/phonenumbers/data/*"/>
+ </zipfileset>
+ </jar>
+ <symlink resource="${debian.src.dir}/lib/src/libphonenumber/libphonenumber.jar"
+ overwrite="true"
+ link="${debian.src.dir}/lib/installer-exclude/libphonenumber-5.9.jarw"/>
<symlink resource="/usr/share/java/org.apache.felix.main.jar"
overwrite="true"
diff --git a/resources/install/debian/control-src.tmpl b/resources/install/debian/control-src.tmpl
index a6647d7..30256db 100644
--- a/resources/install/debian/control-src.tmpl
+++ b/resources/install/debian/control-src.tmpl
@@ -41,7 +41,6 @@ Build-Depends: debhelper (>= 9), javahelper,
libhttpmime-java,
libhttpclient-java,
libjson-simple-java,
- libphonenumber6-java,
libdbus-java,
libeasymock-java,
libxt-dev,