sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Updates jna library to use original file structure, skipping duplicate binaries (keeping the same version 3.2.7).

Browse Source
cusax-fix
Damian Minkov 13 years ago
parent 98f8286b3d
commit d9da9e376a
14 changed files with 11 additions and 43 deletions
Show Stats Download Patch File Download Diff File

3
.classpath
Unescape View File

@ -76,7 +76,7 @@
<classpathentry kind="lib" path="lib/installer-exclude/smack.jar" sourcepath="lib/installer-exclude/smack-src.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/smackx.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/swing-worker-1.2.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/transparency.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/jna-platform.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/unix-0.5.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/ymsg_network_v0_67.jar"/>
@ -87,7 +87,6 @@
<classpathentry kind="lib" path="lib/os-specific/mac/OrangeExtensions.jar"/>
<classpathentry kind="lib" path="lib/os-specific/solaris/jdic_stub.jar"/>
<classpathentry kind="lib" path="lib/os-specific/windows/jdic_stub.jar"/>
<classpathentry kind="lib" path="lib/os-specific/windows/installer-exclude/jna-platform-win32.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>

40
build.xml
Unescape View File

@ -1347,42 +1347,11 @@ javax.swing.event, javax.swing.border"/>
<target name="bundle-jnalib">
<!-- Creates a bundle containing the win jna implementation.-->
<jar
compress="false" destfile="${bundles.dest.win}/jnalib.jar"
compress="false" destfile="${bundles.dest}/jnalib.jar"
manifest="${lib.noinst}/jna.manifest.mf">
<zipfileset src="${lib.win.noinst}/jna.jar" prefix=""/>
<zipfileset src="${lib.win.noinst}/jna-platform-win32.jar" prefix=""/>
</jar>
<!-- Creates a bundle containing the linux jna implementation.-->
<jar
compress="false" destfile="${bundles.dest.lin}/jnalib.jar"
manifest="${lib.noinst}/jna.manifest.mf">
<zipfileset src="${lib.lin.noinst}/jna.jar" prefix=""/>
</jar>
<!-- Creates a bundle containing the mac jna implementation.-->
<jar
compress="false" destfile="${bundles.dest.mac}/jnalib.jar"
manifest="${lib.noinst}/jna.manifest.mf">
<zipfileset src="${lib.mac.noinst}/jna.jar" prefix=""/>
</jar>
<!-- Creates a bundle containing the freebsd jna implementation.-->
<jar
compress="false" destfile="${bundles.dest.freebsd}/jnalib.jar"
manifest="${lib.noinst}/jna.manifest.mf">
<zipfileset src="${lib.freebsd.noinst}/jna.jar" prefix=""/>
</jar>
<!-- Creates a bundle containing the freebsd jna implementation.-->
<jar
compress="false" destfile="${bundles.dest.sol}/jnalib.jar"
manifest="${lib.noinst}/jna.manifest.mf">
<zipfileset src="${lib.sol.noinst}/jna.jar" prefix=""/>
<zipfileset src="${lib.noinst}/jna.jar" prefix=""/>
<zipfileset src="${lib.noinst}/jna-platform.jar" prefix=""/>
</jar>
</target>
@ -1559,7 +1528,6 @@ javax.swing.event, javax.swing.border"/>
manifest="${src}/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf">
<zipfileset dir="${dest}/net/java/sip/communicator/impl/gui"
prefix="net/java/sip/communicator/impl/gui"/>
<zipfileset src="lib/installer-exclude/transparency.jar" prefix=""/>
<zipfileset src="lib/installer-exclude/swing-worker-1.2.jar" prefix=""/>
<zipfileset src="lib/installer-exclude/mac_widgets-0.9.5.jar" prefix=""/>
<zipfileset src="lib/installer-exclude/forms-1.2.1.jar" prefix=""/>
@ -1759,7 +1727,7 @@ javax.swing.event, javax.swing.border"/>
</target>
<!--BUNDLE-GROWLNOTIFICATION-->
<target name="bundle-growlnotification">
<target name="bundle-growlnotification" if="is.running.macos">
<!-- Creates a bundle for the growlnotification plugin.-->
<jar compress="false" destfile="${bundles.dest.mac}/growlnotification.jar"
manifest="${src}/net/java/sip/communicator/impl/growlnotification/growlnotification.manifest.mf">

2
lib/installer-exclude/jna.manifest.mf
Unescape View File

@ -6,7 +6,7 @@ System-Bundle: yes
Export-Package: com.sun.jna.win32,
com.sun.jna,
com.sun.jna.ptr,
com.sun.jna.examples,
com.sun.jna.platform,
com.sun.jna.platform.win32

BIN
lib/installer-exclude/transparency.jar
View File

Binary file not shown.

BIN
lib/os-specific/freebsd/installer-exclude/jna.jar
View File

Binary file not shown.

BIN
lib/os-specific/linux/installer-exclude/jna.jar
View File

Binary file not shown.

BIN
lib/os-specific/mac/installer-exclude/jna.jar
View File

Binary file not shown.

BIN
lib/os-specific/solaris/installer-exclude/jna.jar
View File

Binary file not shown.

BIN
lib/os-specific/windows/installer-exclude/jna-platform-win32.jar
View File

Binary file not shown.

BIN
lib/os-specific/windows/installer-exclude/jna.jar
View File

Binary file not shown.

2
nbproject/project.xml
Unescape View File

@ -116,7 +116,7 @@
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
<compilation-unit>
<package-root>src</package-root>
<classpath mode="compile">lib/felix.jar:lib/jdic-all.jar:lib/bundle/commons-logging.jar:lib/bundle/junit.jar:lib/bundle/log4j.jar:lib/installer-exclude/aclibico-2.1.jar:lib/installer-exclude/apache-ant-1.7.0.jar:lib/installer-exclude/dhcp4java-1.00.jar:lib/installer-exclude/dict4j.jar:lib/installer-exclude/dnsjava.jar:lib/installer-exclude/fmj.jar:lib/installer-exclude/forms-1.2.1.jar:lib/installer-exclude/gdata-client-1.0.jar:lib/installer-exclude/gdata-client-meta-1.0.jar:lib/installer-exclude/gdata-contacts-3.0.jar:lib/installer-exclude/gdata-contacts-meta-3.0.jar:lib/installer-exclude/gdata-core-1.0.jar:lib/installer-exclude/google-collect-1.0-rc1.jar:lib/installer-exclude/hexdump-0.2.jar:lib/installer-exclude/httpclient-4.1.2.jar:lib/installer-exclude/httpcore-4.1.2.jar:lib/installer-exclude/httpmime-4.1.2.jar:lib/installer-exclude/ice4j.jar:lib/installer-exclude/jain-sdp.jar:lib/installer-exclude/jain-sip-api.jar:lib/installer-exclude/jain-sip-ri.jar:lib/installer-exclude/jdic_misc.jar:lib/installer-exclude/jdom.jar:lib/installer-exclude/jfontchooser-1.0.5.jar:lib/installer-exclude/jmdns.jar:lib/installer-exclude/jml-1.0b5.jar:lib/installer-exclude/jmyspell-core.jar:lib/installer-exclude/jna.jar:lib/installer-exclude/jnsapi.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/jsch-0.1.36.jar:lib/installer-exclude/jsocks-klea.jar:lib/installer-exclude/json-simple-1.1.1.jar:lib/installer-exclude/jspeex.jar:lib/installer-exclude/junit.jar:lib/installer-exclude/laf-widget.jar:lib/installer-exclude/lcrypto-jdk16-143.jar:lib/installer-exclude/libdbus-java-2.7.jar:lib/installer-exclude/libjitsi.jar:lib/installer-exclude/log4j-1.2.8.jar:lib/installer-exclude/lti-civil-no_s_w_t.jar:lib/installer-exclude/mac_widgets-0.9.5.jar:lib/installer-exclude/nist-sdp-1.0.jar:lib/installer-exclude/otr4j.jar:lib/installer-exclude/pircbot.jar:lib/installer-exclude/profiler4j-1.0-beta3-SC.jar:lib/installer-exclude/rome-0.9.jar:lib/installer-exclude/sdes4j.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/smackx.jar:lib/installer-exclude/swing-worker-1.2.jar:lib/installer-exclude/transparency.jar:lib/installer-exclude/unix-0.5.jar:lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar:lib/installer-exclude/ymsg_network_v0_67.jar:lib/installer-exclude/zrtp4j-light.jar:lib/os-specific/linux/jdic_stub.jar:lib/os-specific/mac/growl4j.jar:lib/os-specific/mac/jdic_stub.jar:lib/os-specific/mac/OrangeExtensions.jar:lib/os-specific/mac/installer-exclude/dock.jar:lib/os-specific/solaris/jdic_stub.jar:lib/os-specific/windows/jdic_stub.jar:lib/os-specific/windows/installer-exclude/jna-platform-win32.jar</classpath>
<classpath mode="compile">lib/felix.jar:lib/jdic-all.jar:lib/bundle/commons-logging.jar:lib/bundle/junit.jar:lib/bundle/log4j.jar:lib/installer-exclude/aclibico-2.1.jar:lib/installer-exclude/apache-ant-1.7.0.jar:lib/installer-exclude/dhcp4java-1.00.jar:lib/installer-exclude/dict4j.jar:lib/installer-exclude/dnsjava.jar:lib/installer-exclude/fmj.jar:lib/installer-exclude/forms-1.2.1.jar:lib/installer-exclude/gdata-client-1.0.jar:lib/installer-exclude/gdata-client-meta-1.0.jar:lib/installer-exclude/gdata-contacts-3.0.jar:lib/installer-exclude/gdata-contacts-meta-3.0.jar:lib/installer-exclude/gdata-core-1.0.jar:lib/installer-exclude/google-collect-1.0-rc1.jar:lib/installer-exclude/hexdump-0.2.jar:lib/installer-exclude/httpclient-4.1.2.jar:lib/installer-exclude/httpcore-4.1.2.jar:lib/installer-exclude/httpmime-4.1.2.jar:lib/installer-exclude/ice4j.jar:lib/installer-exclude/jain-sdp.jar:lib/installer-exclude/jain-sip-api.jar:lib/installer-exclude/jain-sip-ri.jar:lib/installer-exclude/jdic_misc.jar:lib/installer-exclude/jdom.jar:lib/installer-exclude/jfontchooser-1.0.5.jar:lib/installer-exclude/jmdns.jar:lib/installer-exclude/jml-1.0b5.jar:lib/installer-exclude/jmyspell-core.jar:lib/installer-exclude/jna.jar:lib/installer-exclude/jnsapi.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/jsch-0.1.36.jar:lib/installer-exclude/jsocks-klea.jar:lib/installer-exclude/json-simple-1.1.1.jar:lib/installer-exclude/jspeex.jar:lib/installer-exclude/junit.jar:lib/installer-exclude/laf-widget.jar:lib/installer-exclude/lcrypto-jdk16-143.jar:lib/installer-exclude/libdbus-java-2.7.jar:lib/installer-exclude/libjitsi.jar:lib/installer-exclude/log4j-1.2.8.jar:lib/installer-exclude/lti-civil-no_s_w_t.jar:lib/installer-exclude/mac_widgets-0.9.5.jar:lib/installer-exclude/nist-sdp-1.0.jar:lib/installer-exclude/otr4j.jar:lib/installer-exclude/pircbot.jar:lib/installer-exclude/profiler4j-1.0-beta3-SC.jar:lib/installer-exclude/rome-0.9.jar:lib/installer-exclude/sdes4j.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/smackx.jar:lib/installer-exclude/swing-worker-1.2.jar:lib/installer-exclude/jna-platform.jar:lib/installer-exclude/unix-0.5.jar:lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar:lib/installer-exclude/ymsg_network_v0_67.jar:lib/installer-exclude/zrtp4j-light.jar:lib/os-specific/linux/jdic_stub.jar:lib/os-specific/mac/growl4j.jar:lib/os-specific/mac/jdic_stub.jar:lib/os-specific/mac/OrangeExtensions.jar:lib/os-specific/mac/installer-exclude/dock.jar:lib/os-specific/solaris/jdic_stub.jar:lib/os-specific/windows/jdic_stub.jar</classpath>
<built-to>classes</built-to>
<source-level>1.5</source-level>
</compilation-unit>

2
src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
Unescape View File

@ -44,7 +44,7 @@
import org.jitsi.util.*;
import org.osgi.framework.*;
import com.sun.jna.examples.*;
import com.sun.jna.platform.*;
/**
* An implementation of the <tt>UIService</tt> that gives access to other

2
src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf
Unescape View File

@ -5,7 +5,7 @@ Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: com.apple.eawt,
com.sun.jna.examples,
com.sun.jna.platform,
javax.accessibility,
javax.imageio,
javax.swing,

3
src/net/java/sip/communicator/util/util.manifest.mf
Unescape View File

@ -63,4 +63,5 @@ Export-Package: net.java.sip.communicator.util,
net.java.sip.communicator.util.swing.event,
net.java.sip.communicator.util.swing.plaf,
net.java.sip.communicator.util.swing.transparent,
net.java.sip.communicator.util.xml
net.java.sip.communicator.util.xml,
org.xbill.DNS

Write Preview
Loading…
Cancel
Save