diff options
Diffstat (limited to 'resources/install/build.xml')
| -rw-r--r-- | resources/install/build.xml | 150 |
1 files changed, 99 insertions, 51 deletions
diff --git a/resources/install/build.xml b/resources/install/build.xml index 64fd24b..c1087c3 100644 --- a/resources/install/build.xml +++ b/resources/install/build.xml @@ -131,6 +131,42 @@ <mkdir dir="${generic.app.dir}"/> </target> + <target name="strip-multi-platform-jar"> + <condition property="win64"> + <equals arg1="${platform}" arg2="windows-64" /> + </condition> + <condition property="win32"> + <equals arg1="${platform}" arg2="windows-32" /> + </condition> + <condition property="linux64"> + <equals arg1="${platform}" arg2="linux-64" /> + </condition> + <condition property="linux32"> + <equals arg1="${platform}" arg2="linux-32" /> + </condition> + <condition property="macos"> + <equals arg1="${platform}" arg2="osx" /> + </condition> + <zip destfile="${jar}.tmp"> + <zipfileset src="${jar}"> + <exclude name="**/darwin/*.jnilib" unless="${macos}"/> + <exclude name="**/linux-x86/*.so" unless="${linux32}"/> + <exclude name="**/linux-x86-64/*.so" unless="${linux64}"/> + <exclude name="**/win32-x86/*.dll" unless="${win32}"/> + <exclude name="**/win32-x86-64/*.dll" unless="${win64}"/> + + <exclude name="**/freebsd-x86/*.so"/> + <exclude name="**/freebsd-x86-64/*.so"/> + <exclude name="**/linux-arm/*.so"/> + <exclude name="**/openbsd-x86/*.so"/> + <exclude name="**/openbsd-x86-64/*.so"/> + <exclude name="**/sunos-*/*.so"/> + <exclude name="**/w32ce-arm/*.dll"/> + </zipfileset> + </zip> + <move file="${jar}.tmp" tofile="${jar}"/> + </target> + <target name="build-installation-generic" depends="clean-install-generic,define-izpack-task,version,load-properties"> @@ -539,6 +575,22 @@ <exclude name="*slick.jar" /> </fileset> </copy> + <antcall target="strip-multi-platform-jar"> + <param name="jar" value="${light.dir}/sc-bundles/libjitsi.jar"/> + <param name="platform" value="windows-${windows.arch}" /> + </antcall> + <antcall target="strip-multi-platform-jar"> + <param name="jar" value="${light.dir}/sc-bundles/jitsi-gpl-dependencies.jar"/> + <param name="platform" value="windows-${windows.arch}" /> + </antcall> + <antcall target="strip-multi-platform-jar"> + <param name="jar" value="${light.dir}/sc-bundles/jitsi-lgpl-dependencies.jar"/> + <param name="platform" value="windows-${windows.arch}" /> + </antcall> + <antcall target="strip-multi-platform-jar"> + <param name="jar" value="${light.dir}/sc-bundles/jna.jar"/> + <param name="platform" value="windows-${windows.arch}" /> + </antcall> <!-- Include a private Java Runtime Environment if it has been specified. @@ -1006,6 +1058,25 @@ <arg value="${sign.cert.password}" /> <arg value="${file.to.sign}" /> </exec> + + <exec executable="${inst.resrc}/windows/signtool.exe" + failonerror="false"> + <arg value="sign" /> + <arg value="/d" /> + <arg value="${application.name}" /> + <arg value="/fd" /> + <arg value="sha256" /> + <arg value="/tr" /> + <arg value="http://tsa.starfieldtech.com" /> + <arg value="/td" /> + <arg value="sha256" /> + <arg value="/as" /> + <arg value="/f" /> + <arg value="${sign.cert.file}" /> + <arg value="/p" /> + <arg value="${sign.cert.password}" /> + <arg value="${file.to.sign}" /> + </exec> </target> <!-- signs all dll files in folder - $folder.to.sign @@ -1128,6 +1199,22 @@ <include name="**/*.jar"/> </fileset> </copy> + <antcall target="strip-multi-platform-jar"> + <param name="jar" value="${bundles.dest}/libjitsi.jar"/> + <param name="platform" value="osx" /> + </antcall> + <antcall target="strip-multi-platform-jar"> + <param name="jar" value="${bundles.dest}/jitsi-gpl-dependencies.jar"/> + <param name="platform" value="osx" /> + </antcall> + <antcall target="strip-multi-platform-jar"> + <param name="jar" value="${bundles.dest}/jitsi-lgpl-dependencies.jar"/> + <param name="platform" value="osx" /> + </antcall> + <antcall target="strip-multi-platform-jar"> + <param name="jar" value="${bundles.dest}/jna.jar"/> + <param name="platform" value="osx" /> + </antcall> <!-- Delete the old .app if it exists --> <delete dir="${macosx.app.dir}/${application.name}.app" @@ -1267,6 +1354,8 @@ <key>CFBundleURLSchemes</key> <array> <string>sip</string> + <string>tel</string> + <string>callto</string> </array> </dict> <dict> @@ -1677,7 +1766,7 @@ <!-- the designated param value is taken after executing the command on already installed and signed application $ codesign -d -r- /Applications/Jitsi.app --> - <arg value="=designated => identifier "org.${package.name}" and anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "BE8738ZVRM""/> + <arg value="=designated => identifier "org.${package.name}" and anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "9J46G85C89""/> <arg value="${macosx.app.dir}/${application.name}.app"/> </exec> @@ -2254,9 +2343,6 @@ todir="${debianize.dir}" overwrite="true"/> - <!-- use postinst and postrm files only if used from deb target --> - <antcall target="-deb-post-files-update"/> - <copy todir="${debianize.dir}/source"> <fileset dir="${inst.resrc}/debian/source"/> </copy> @@ -2392,7 +2478,7 @@ and libjdic.so to deb and i386 package fail to build --> <replace file="${debianize.dir}/rules" token="get-orig-source:" - value="override_dh_shlibdeps:
	dh_shlibdeps -Xlibjunbound.so -Xlibsysactivitynotifications.so

get-orig-source:"/> + value="override_dh_shlibdeps:
	dh_shlibdeps -Xlibsysactivitynotifications.so

get-orig-source:"/> <!-- removes the rule override_dh_auto_clean --> <replace file="${debianize.dir}/rules" @@ -2459,16 +2545,6 @@ token="/usr/lib/jni" value="$SCDIR/lib/native"/> </target> - <!-- use postinst and postrm files only if used from deb target --> - <target name="-deb-post-files-update" - unless="debianize.src.pkg"> - <copy file="${inst.resrc}/debian/postinst" - tofile="${debianize.dir}/postinst" - overwrite="true"/> - <copy file="${inst.resrc}/debian/postrm" - tofile="${debianize.dir}/postrm" - overwrite="true"/> - </target> <!-- Prepare to deploy the Debian package - This needs dpkg utilities --> <target name="deb-rel" depends="deb,dpkg-scan-warning" @@ -2534,7 +2610,6 @@ <exclude name="**/ssh/**"/> <exclude name="**/sshaccregwizz/**"/> <exclude name="**/profiler4j/**"/> - <exclude name="**/windows/**"/> <exclude name="**/windows32/**"/> <exclude name="**/windows64/**"/> <exclude name="**/native/addrbook/macosx/**"/> @@ -2687,10 +2762,6 @@ <unzip src="${sc.basedir}/../libsrc/jmyspell-core-src.zip" dest="${debian.src.dir}/lib/src/jmyspell"/> - <!-- jfontchooser --> - <unzip src="${sc.basedir}/../libsrc/jfontchooser-src.zip" - dest="${debian.src.dir}/lib/src/jfontchooser"/> - <!-- gdata <unzip src="${sc.basedir}/../libsrc/gdata-src.java-1.43.0.zip" dest="${debian.src.dir}/lib/src"> @@ -2752,8 +2823,6 @@ failonerror="false"/> <delete dir="${debian.src.dir}/lib/src/jmyspell/classes" failonerror="false"/> - <delete dir="${debian.src.dir}/lib/src/jfontchooser/classes" - failonerror="false"/> <delete dir="${debian.src.dir}/lib/src/OrangeExtensions/classes" failonerror="false"/> <!--ant dir="${debian.src.dir}/lib/src/gdata-java-client/java" @@ -2825,7 +2894,7 @@ <symlink resource="/usr/share/java/weupnp.jar" overwrite="true" - link="${debian.src.dir}/lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar"/> + link="${debian.src.dir}/lib/installer-exclude/weupnp-0.1.4.jar"/> <!-- swingworker --> <ant dir="${debian.src.dir}/lib/src/swingworker" @@ -2969,15 +3038,6 @@ overwrite="true" link="${debian.src.dir}/lib/installer-exclude/json-simple-1.1.1.jar"/> - <!-- jymsg --> - <ant dir="${debian.src.dir}/lib/src/jymsg" - inheritAll="false" - target="jars"> - </ant> - <symlink resource="../src/jymsg/classes/ymsg_network_v0_67.jar" - overwrite="true" - link="${debian.src.dir}/lib/installer-exclude"/> - <!-- dhcp4j --> <mkdir dir="${debian.src.dir}/lib/src/dhcp4java/classes"/> <javac debug="true" @@ -3057,23 +3117,6 @@ <symlink resource="../src/jmyspell/jmyspell-core.jar" overwrite="true" link="${debian.src.dir}/lib/installer-exclude"/> - <!-- jfontchooser --> - <mkdir dir="${debian.src.dir}/lib/src/jfontchooser/classes"/> - <javac debug="true" - deprecation="true" destdir="${debian.src.dir}/lib/src/jfontchooser/classes" - nowarn="false" - source="1.5" target="1.5" fork="true"> - <src path="${debian.src.dir}/lib/src/jfontchooser/src"/> - <include name="**/*.java" /> - </javac> - <jar compress="true" - destfile="${debian.src.dir}/lib/src/jfontchooser/jfontchooser-1.0.5.jar"> - <zipfileset dir="${debian.src.dir}/lib/src/jfontchooser/classes"/> - </jar> - <symlink resource="../src/jfontchooser/jfontchooser-1.0.5.jar" - overwrite="true" - link="${debian.src.dir}/lib/installer-exclude"/> - <!-- libcommons-codec-java --> <symlink resource="/usr/share/java/commons-codec.jar" overwrite="true" @@ -3212,6 +3255,10 @@ <symlink resource="/usr/share/libjitsi/lib/ice4j.jar" overwrite="true" link="${debian.src.dir}/lib/installer-exclude"/> + <!-- jitsi-gpl-dependencies --> + <symlink resource="/usr/share/libjitsi/lib/jitsi-gpl-dependencies.jar" + overwrite="true" + link="${debian.src.dir}/lib/installer-exclude/"/> <!-- jitsi-lgpl-dependencies --> <symlink resource="/usr/share/libjitsi/lib/jitsi-lgpl-dependencies.jar" overwrite="true" @@ -3285,7 +3332,6 @@ <antcall target="globalshortcut"/> <antcall target="hid"/> <antcall target="sysactivity"/> - <antcall target="unbound"/> <antcall target="hwaddressretriever"/> </target> @@ -3733,6 +3779,8 @@ link="${debian.bundles.common.dest}/libjitsi.jar/"/> <symlink resource="/usr/share/libjitsi/libjitsi.jar" link="${debian.bundles.common.dest}/libjitsi.jar/"/> + <symlink resource="/usr/share/libjitsi/lib/jitsi-gpl-dependencies.jar" + link="${debian.bundles.common.dest}/libjitsi.jar/"/> <symlink resource="/usr/share/libjitsi/lib/jitsi-lgpl-dependencies.jar" link="${debian.bundles.common.dest}/libjitsi.jar/"/> <symlink resource="/usr/share/libjitsi/lib/fmj.jar" @@ -3759,7 +3807,7 @@ destfile="${debian.bundles.common.dest}/libjitsi.jar/META-INF/MANIFEST.MF" append="true" eol="crlf" - fixlastline="true">Bundle-ClassPath: .,libjitsi-impl.jar,fmj.jar,jitsi-lgpl-dependencies.jar,libjitsi.jar,bcpkix.jar

</concat> + fixlastline="true">Bundle-ClassPath: .,libjitsi-impl.jar,fmj.jar,jitsi-gpl-dependencies.jar,jitsi-lgpl-dependencies.jar,libjitsi.jar,bcpkix.jar

</concat> <replace file="${debian.bundles.dest}/../lib/felix.client.run.properties" token="reference:file:sc-bundles/libjitsi.jar"> <replacevalue>reference:file:/usr/share/jitsi-common/libjitsi.jar</replacevalue> |