Revision: 6984
http://languagetool.svn.sourceforge.net/languagetool/?rev=6984&view=rev
Author: milek_pl
Date: 2012-05-19 10:53:37 +0000 (Sat, 19 May 2012)
Log Message:
-----------
add hunspell to builds, create a zip for standalone (unfortunately, hunspell
still doesn't work for jws!)
Modified Paths:
--------------
trunk/JLanguageTool/.classpath
trunk/JLanguageTool/build.xml
Added Paths:
-----------
trunk/JLanguageTool/jnlp/LanguageTool.jnlp
trunk/JLanguageTool/jnlp/LanguageToolServer.jnlp
trunk/JLanguageTool/myalias.p12
Removed Paths:
-------------
trunk/JLanguageTool/LanguageTool.jnlp
trunk/JLanguageTool/LanguageToolServer.jnlp
Modified: trunk/JLanguageTool/.classpath
===================================================================
--- trunk/JLanguageTool/.classpath 2012-05-19 10:51:28 UTC (rev 6983)
+++ trunk/JLanguageTool/.classpath 2012-05-19 10:53:37 UTC (rev 6984)
@@ -3,14 +3,28 @@
<classpathentry kind="src" path="src/test"/>
<classpathentry kind="src" path="src/dev"/>
<classpathentry kind="src" path="src/java"/>
- <classpathentry excluding="test/|dev/|java/" kind="src" path="src"/>
- <classpathentry kind="lib" path="libs/build/junit.jar"/>
+ <classpathentry excluding="test/|dev/|java/" kind="src" path="src">
+ <attributes>
+ <attribute
name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"
value="JLanguageTool/libs"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" path="libs/native-lib"/>
+ <classpathentry kind="lib" path="libs/build/junit.jar">
+ <attributes>
+ <attribute
name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"
value="JLanguageTool/libs/native-lib"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="lib" path="libs/ooo/juh.jar"/>
<classpathentry kind="lib" path="libs/ooo/jurt.jar"/>
<classpathentry kind="lib" path="libs/ooo/ridl.jar"/>
<classpathentry kind="lib" path="libs/ooo/unoil.jar"/>
<classpathentry kind="lib"
path="libs/swc-engine-1.0.1-SNAPSHOT-jar-with-dependencies.jar"/>
<classpathentry kind="lib" path="libs/segment-1.3.8.jar"/>
+ <classpathentry kind="lib" path="libs/jna.jar">
+ <attributes>
+ <attribute
name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"
value="JLanguageTool/libs/native-lib"/>
+ </attributes>
+ </classpathentry>
<classpathentry exported="true" kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="lib" path="libs/jWordSplitter.jar"
sourcepath="/jWordSplitter"/>
Deleted: trunk/JLanguageTool/LanguageTool.jnlp
===================================================================
(Binary files differ)
Deleted: trunk/JLanguageTool/LanguageToolServer.jnlp
===================================================================
--- trunk/JLanguageTool/LanguageToolServer.jnlp 2012-05-19 10:51:28 UTC (rev
6983)
+++ trunk/JLanguageTool/LanguageToolServer.jnlp 2012-05-19 10:53:37 UTC (rev
6984)
@@ -1,47 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- This file starts LanguageTool in a server mode. Note:
- it will not be visible in any window, so to stop the process,
- you need to kill the corresponding Java process.
-
- Note: currently, you can call the server only locally.
- -->
-
-<jnlp version="@version@"
- codebase="http://www.languagetool.org/webstart/web/";>
- <information>
- <title>LanguageTool</title>
- <vendor>Daniel Naber</vendor>
- <homepage href="http://www.languagetool.org/"; />
- <icon href="LanguageToolBig.gif" />
- <offline-allowed />
- </information>
-
-
- <security>
- <all-permissions />
- </security>
-
- <resources>
- <j2se version="1.6+" />
- <jar href="morfologik-stemming-1.5.2.jar" />
- <jar href="morfologik-fsa-1.5.2.jar" />
- <jar href="tika-core-0.9.jar" />
- <jar href="@segment.lib@" />
- <jar href="@logging.lib@" />
- <jar href="commons-lang-2.4.jar" />
- <jar href="rules.jar" />
- <jar href="resource.jar" />
- <jar href="jWordSplitter.jar" />
- <jar href="ictclas4j-1.0.jar" />
- <jar href="CJFtransform_v1.0.1_bin.jar" />
- <jar href="LanguageTool.jar" main="true" />
- </resources>
-
- <application-desc main-class="org.languagetool.server.HTTPServer">
- <argument>-p</argument>
- <!-- the port number -->
- <argument>8082</argument>
- </application-desc>
-
-</jnlp>
Modified: trunk/JLanguageTool/build.xml
===================================================================
--- trunk/JLanguageTool/build.xml 2012-05-19 10:51:28 UTC (rev 6983)
+++ trunk/JLanguageTool/build.xml 2012-05-19 10:53:37 UTC (rev 6984)
@@ -439,19 +439,33 @@
<zip compress="yes" destfile="${dist.dir}/LanguageTool-${version}-src.zip"
basedir="${dist.dir}" includes="**" excludes="turn.sh,deploy.sh,undeploy.sh" />
</target>
+
+<!-- =========================================================================
-->
+<!-- LanguageTool standalone with hunspell, without OpenOffice.org integration
-->
+<!-- =========================================================================
-->
+
+<target name="dist-standalone" depends="common" description="Builds a ZIP for
stand-alone use">
+ <zip compress="yes" destfile="${dist.dir}/LanguageTool-${version}.zip"
basedir="${dist.dir}" includes="**"
+
excludes="deploy.sh,undeploy.sh,turn.sh,printlocales.jar,LanguageTool.uno.jar"
/>
+</target>
+
+
+
<!-- ================================================================== -->
<!-- LanguageTool including OpenOffice.org integration -->
<!-- ================================================================== -->
-<target name="dist" depends="ooo-internal" description="Builds one ZIP for
both OpenOffice.org and stand-alone use">
-<zip compress="yes" destfile="${dist.dir}/LanguageTool-${version}.oxt"
basedir="${dist.dir}" includes="**"
excludes="deploy.sh,undeploy.sh,turn.sh,printlocales.jar" />
+<target name="dist" depends="ooo-internal" description="Builds
LibreOffice/ApacheOpenOffice extension">
+<zip compress="yes" destfile="${dist.dir}/LanguageTool-${version}.oxt"
basedir="${dist.dir}" includes="**"
+
excludes="deploy.sh,undeploy.sh,turn.sh,printlocales.jar,**/hunspell/**,${bliki.lib},junit.jar,Rule*.jar,
+
lucene*.jar,testwikipedia.*,LanguageTool.jar,LanguageToolGUI.jar,*.xsl,${jna.lib}"
/>
</target>
<target name="fast" depends="ooo-internal" description="like dist, but without
ZIP compression (for development only)">
<zip compress="no" destfile="${dist.dir}/LanguageTool-${version}.oxt"
basedir="${dist.dir}" includes="**"
excludes="deploy.sh,undeploy.sh,turn.sh,printlocales.jar" />
</target>
-<target name="common" depends="clean,init,build,ooo-build">
+<target name="common" depends="clean,init,build">
<copy file="${resource.dir}/TrayIcon.png" todir="${dist.dir}/resource/"
/>
<filter filtersFile="build.properties" />
@@ -490,7 +504,7 @@
<copy file="${ext.CJFtransform.lib}" todir="${dist.dir}" />
<copy file="${ext.commons-validator.lib}" todir="${dist.dir}" />
<copy file="${ext.lucene-core.lib}" todir="${dist.dir}" />
- <copy file="${ext.lucene-queries.lib}" todir="${dist.dir}" />
+ <copy file="${ext.lucene-queries.lib}" todir="${dist.dir}" />
<copy file="${ext.jna.lib}" todir="${dist.dir}" />
@@ -578,9 +592,7 @@
<copy file="${resource.dir}/pl/compounds.txt"
todir="${dist.dir}/resource/pl" />
<copy file="${resource.dir}/pl/multiwords.txt"
todir="${dist.dir}/resource/pl" />
<copy file="${resource.dir}/pl/disambiguation.xml"
todir="${dist.dir}/resource/pl" />
- <copy file="${resource.dir}/pl/hunspell/pl_PL.aff"
todir="${dist.dir}/resource/pl/hunspell" />
- <copy file="${resource.dir}/pl/hunspell/pl_PL.dic"
todir="${dist.dir}/resource/pl/hunspell" />
-
+
<copy file="${resource.dir}/nl/dutch.dict"
todir="${dist.dir}/resource/nl" />
<copy file="${resource.dir}/nl/dutch.info"
todir="${dist.dir}/resource/nl" />
<copy file="${resource.dir}/nl/dutch_synth.dict"
todir="${dist.dir}/resource/nl" />
@@ -664,9 +676,18 @@
<fileset dir="src/rules" excludes="CVS" />
</copy>
+ <!-- general pattern for all hunspell-related files, including any
license or readme files -->
+ <copy todir="${dist.dir}/resource">
+ <fileset dir="${resource.dir}" includes="**/hunspell/*.*"/>
+ </copy>
+ <copy file="${ext.jna.lib}" todir="${dist.dir}" />
+ <copy todir="${dist.dir}">
+ <fileset dir="${ext.dir}/native-lib" />
+ </copy>
+
</target>
-<target name="ooo-internal" depends="common">
+<target name="ooo-internal" depends="common,ooo-build">
<!-- prepare properties file automatically -->
<javac encoding="${encoding}" srcdir="${src.dir}/dev"
includes="org/languagetool/dev/PrintLocales.java" destdir="${build.classes}"
source="${source}" target="${target}" debug="${debug}">
</javac>
@@ -684,6 +705,8 @@
<java jar="${dist.dir}/printlocales.jar" fork="true" />
+<delete file="${dist.dir}/printlocales.jar" />
+
<filter filtersFile="ooolocales.properties" />
<copy filtering="true" encoding="${encoding}" todir="${dist.dir}/">
<fileset dir="openoffice/"
includes="description.xml,*.xcu,Options.xdl,META-INF/**" />
@@ -693,29 +716,118 @@
</copy>
</target>
+
+<!-- ================================================================== -->
+<!-- LanguageTool Java Web Start compile -->
+<!-- ================================================================== -->
+
+
<target name="jnlp" depends="common" description="Builds JNLP distribution
file">
<mkdir dir="${dist.dir}/web" />
-<mkdir dir="${dist.dir}/web/linux" />
-<mkdir dir="${dist.dir}/web/windows" />
-<mkdir dir="${dist.dir}/web/sunos" />
<filter filtersFile="build.properties" />
-<copy file="./LanguageTool.jnlp" todir="${dist.dir}/web" filtering="true" />
-<copy file="./LanguageToolServer.jnlp" todir="${dist.dir}/web"
filtering="true" />
+<copy file="jnlp/LanguageTool.jnlp" todir="${dist.dir}/web" filtering="true" />
+<copy file="jnlp/LanguageToolServer.jnlp" todir="${dist.dir}/web"
filtering="true" />
+<copy file="jnlp/LanguageToolBig.gif" todir="${dist.dir}/web" />
<copy todir="${dist.dir}/web/">
<fileset dir="${dist.dir}" casesensitive="yes">
<include name="**/*.jar" />
- <exclude name="**/printlocales.jar"/>
<exclude name="**/LanguageTool.uno.jar"/>
<exclude name="**/junit.jar"/>
+ <exclude name="**/Rule*.jar"/>
<exclude name="**/${bliki.lib}"/>
- </fileset>
+ </fileset>
</copy>
<jar compress="yes" basedir="${dist.dir}"
destfile="${dist.dir}/web/resource.jar" includes="resource/**" />
<jar compress="yes" basedir="${dist.dir}" destfile="${dist.dir}/web/rules.jar"
includes="rules/**" />
+
+<!--
+ Split the monolithic jna file into a shared one with java code and
+ platform specifc ones for each supported platform, this is needed for
+ webstart that handles native libs.
+-->
+ <zip destfile="${dist.dir}/web/jna.jar">
+ <zipfileset src="${ext.jna.lib}">
+ <exclude name="**/*.dll" />
+ <exclude name="**/*.so" />
+ <exclude name="**/*.jnilib" />
+ <exclude name="**/*.dylib" />
+ </zipfileset>
+ </zip>
+
+ <zip destfile="${dist.dir}/web/jna-linux-i386.jar">
+ <zipfileset src="${ext.jna.lib}"
includes="com/sun/jna/linux-i386/libjnidispatch.so"
fullpath="libjnidispatch.so"/>
+ </zip>
+
+ <zip destfile="${dist.dir}/web/jna-linux-amd64.jar">
+ <zipfileset src="${ext.jna.lib}"
includes="com/sun/jna/linux-amd64/libjnidispatch.so"
fullpath="libjnidispatch.so"/>
+ </zip>
+
+ <zip destfile="${dist.dir}/web/jna-darwin.jar">
+ <zipfileset src="${ext.jna.lib}"
includes="com/sun/jna/darwin/libjnidispatch.jnilib"
fullpath="libjnidispatch.jnilib"/>
+ </zip>
+
+ <zip destfile="${dist.dir}/web/jna-win32-x86.jar">
+ <zipfileset src="${ext.jna.lib}"
includes="com/sun/jna/win32-x86/jnidispatch.dll" fullpath="jnidispatch.dll"/>
+ </zip>
+
+ <zip destfile="${dist.dir}/web/jna-win32-amd64.jar">
+ <zipfileset src="${ext.jna.lib}"
includes="com/sun/jna/win32-amd64/jnidispatch.dll" fullpath="jnidispatch.dll"/>
+ </zip>
+
+ <!--
+ Create separate jar files with the hunspell natives
as well.
+ -->
+ <!-- jar destfile="${dist.dir}/web/hunspell-jws.jar">
+ <fileset dir="build/classes"/>
+ </jar -->
+
+ <zip destfile="${dist.dir}/web/hunspell-win32-x86.jar">
+ <fileset dir="${ext.dir}/native-lib">
+ <filename name="hunspell-win-x86-32.dll"/>
+ </fileset>
+ </zip>
+
+ <zip destfile="${dist.dir}/web/hunspell-win32-amd64.jar">
+ <fileset dir="${ext.dir}/native-lib">
+ <filename name="hunspell-win-x86-64.dll"/>
+ </fileset>
+ </zip>
+
+ <zip destfile="${dist.dir}/web/hunspell-linux-i386.jar">
+ <fileset dir="${ext.dir}/native-lib">
+ <filename name="libhunspell-linux-x86-32.so"/>
+ </fileset>
+ </zip>
+
+ <zip destfile="${dist.dir}/web/hunspell-linux-amd64.jar">
+ <fileset dir="${ext.dir}/native-lib">
+ <filename name="libhunspell-linux-x86-64.so"/>
+ </fileset>
+ </zip>
+
+ <zip destfile="${dist.dir}/web/hunspell-darwin-i386.jar">
+ <fileset dir="${ext.dir}/native-lib">
+ <filename name="hunspell-darwin-x86-32.*"/>
+ </fileset>
+ </zip>
+
+ <zip destfile="${dist.dir}/web/hunspell-darwin-amd64.jar">
+ <fileset dir="${ext.dir}/native-lib">
+ <filename name="hunspell-darwin-x86-64.*"/>
+ </fileset>
+ </zip>
+
+ <zip destfile="${dist.dir}/web/hunspell-darwin-ppc.jar">
+ <fileset dir="${ext.dir}/native-lib">
+ <filename name="hunspell-darwin-ppc-32.*"/>
+ </fileset>
+ </zip>
+
+
<signjar keypass="blabla" keystore="./myalias.p12"
storetype="pkcs12" storepass="blabla"
alias="8ac09659-7332-11e1-ba27-8c89a57cdeaa">
<path>
Copied: trunk/JLanguageTool/jnlp/LanguageTool.jnlp (from rev 6979,
trunk/JLanguageTool/LanguageTool.jnlp)
===================================================================
(Binary files differ)
Property changes on: trunk/JLanguageTool/jnlp/LanguageTool.jnlp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Copied: trunk/JLanguageTool/jnlp/LanguageToolServer.jnlp (from rev 6979,
trunk/JLanguageTool/LanguageToolServer.jnlp)
===================================================================
--- trunk/JLanguageTool/jnlp/LanguageToolServer.jnlp
(rev 0)
+++ trunk/JLanguageTool/jnlp/LanguageToolServer.jnlp 2012-05-19 10:53:37 UTC
(rev 6984)
@@ -0,0 +1,72 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- This file starts LanguageTool in a server mode. Note:
+ it will not be visible in any window, so to stop the process,
+ you need to kill the corresponding Java process.
+
+ Note: currently, you can call the server only locally.
+ -->
+
+<jnlp version="@version@"
+ codebase="http://www.languagetool.org/webstart/web/";>
+ <information>
+ <title>LanguageTool</title>
+ <vendor>Daniel Naber</vendor>
+ <homepage href="http://www.languagetool.org/"; />
+ <icon href="LanguageToolBig.gif" />
+ <offline-allowed />
+ </information>
+
+
+ <security>
+ <all-permissions />
+ </security>
+
+ <resources>
+ <j2se version="1.6+" />
+ <jar href="@morfologik.stemming.lib@" />
+ <jar href="@morfologik.fsa.lib@" />
+ <jar href="@tika.lib@" />
+ <jar href="@segment.lib@" />
+ <jar href="@logging.lib@" />
+ <jar href="@commons.lang.lib@" />
+ <jar href="rules.jar" />
+ <jar href="resource.jar" />
+ <jar href="jWordSplitter.jar" />
+ <jar href="@ictclas4j.lib@" />
+ <jar href="@CJFtransform.lib@" />
+ <jar href="LanguageTool.jar" />
+ <jar href="LanguageToolGUI.jar" main="true" />
+ <jar href="jna.jar" />
+ </resources>
+
+
+ <resources os="Windows" arch="x86">
+ <jar href="hunspell-win32-x86.jar" />
+ </resources>
+ <resources os="Windows" arch="amd64">
+ <jar href="hunspell-win32-amd64.jar" />
+ </resources>
+ <resources os="Linux" arch="x86">
+ <jar href="hunspell-linux-i386.jar" />
+ </resources>
+ <resources os="Linux" arch="amd64">
+ <jar href="hunspell-linux-amd64.jar" />
+ </resources>
+ <resources os="Mac OS X" arch="x86">
+ <jar href="hunspell-darwin-i386.jar" />
+ </resources>
+ <resources os="Mac OS X" arch="amd64">
+ <jar href="hunspell-darwin-amd64.jar" />
+ </resources>
+ <resources os="Mac OS X" arch="ppc">
+ <jar href="hunspell-darwin-ppc.jar" />
+ </resources>
+
+ <application-desc main-class="org.languagetool.server.HTTPServer">
+ <argument>-p</argument>
+ <!-- the port number -->
+ <argument>8082</argument>
+ </application-desc>
+
+</jnlp>
Added: trunk/JLanguageTool/myalias.p12
===================================================================
(Binary files differ)
Property changes on: trunk/JLanguageTool/myalias.p12
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Languagetool-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-cvs
