| Index: trunk/lucene-search-2/build.xml |
| — | — | @@ -9,8 +9,11 @@ |
| 10 | 10 | <property name="src.name" value="lucene-search-src-2.1"/> |
| 11 | 11 | <property name="binary.name" value="ls2.1-bin"/> |
| 12 | 12 | <property name="jar.name" value="LuceneSearch.jar"/> |
| 13 | | - <property name="include" value="src/** lib/** sql/** test-data/** webinterface/** *-example *.txt lsearch* build.xml scripts/* VERSION configure build update resources/** test/** udplogger/**"/> |
| 14 | | - <property name="include.src" value="src/** sql/** build.xml scripts/* webinterface/* VERSION configure build update test/** udplogger/**"/> |
| | 13 | + <property name="include" value="src/** lib/** sql/** test-data/** webinterface/** *-example *.txt |
| | 14 | + lsearch* build.xml scripts/* VERSION configure build update |
| | 15 | + resources/** test/** udplogger/**"/> |
| | 16 | + <property name="include.src" value="src/** sql/** build.xml scripts/* webinterface/* VERSION |
| | 17 | + configure build update test/** udplogger/**"/> |
| 15 | 18 | <property name="include.bin" value="*.log4j *.txt config.inc template/** udplogger/**"/> |
| 16 | 19 | <property name="include.sh" value="configure build update lsearchd"/> |
| 17 | 20 | |
| — | — | @@ -24,20 +27,25 @@ |
| 25 | 28 | <java jar="${jar.name}" fork="yes"> |
| 26 | 29 | <sysproperty key="java.rmi.server.codebase" value="file://${basedir}/${jar.name}"/> |
| 27 | 30 | <sysproperty key="java.rmi.server.hostname" value="${hostname}"/> |
| 28 | | - <classpath> |
| 29 | | - <fileset dir="${lib}"> |
| 30 | | - <include name="*.jar"/> |
| 31 | | - </fileset> |
| 32 | | - </classpath> |
| 33 | | - </java> |
| 34 | | - </target> |
| | 31 | + <classpath> |
| | 32 | + <fileset dir="${lib}"> |
| | 33 | + <include name="*.jar"/> |
| | 34 | + </fileset> |
| | 35 | + </classpath> |
| | 36 | + </java> |
| | 37 | + </target> |
| 35 | 38 | |
| 36 | 39 | <target name="makejar" depends="build"> |
| 37 | 40 | <jar destfile="${basedir}/${jar.name}"> |
| 38 | 41 | <manifest> |
| 39 | | - <attribute name="Main-Class" value="org.wikimedia.lsearch.config.StartupManager"/> |
| 40 | | - <attribute name="Class-Path" value="${jar.name} lib/xmlrpc-common-3.0.jar lib/xmlrpc-client-3.0.jar lib/xmlrpc-server-3.0.jar lib/commons-logging-1.1.jar lib/ws-commons-util-1.0.1.jar lib/log4j-1.2.14.jar lib/lucene-core-2.3.jar lib/lucene-analyzers.jar lib/snowball.jar lib/mwdumper.jar lib/mysql-connector-java-3.0.17-ga-bin.jar"/> |
| 41 | | - </manifest> |
| | 42 | + <attribute name="Main-Class" value="org.wikimedia.lsearch.config.StartupManager"/> |
| | 43 | + <attribute name="Class-Path" value="${jar.name} lib/xmlrpc-common-3.0.jar |
| | 44 | + lib/xmlrpc-client-3.0.jar lib/xmlrpc-server-3.0.jar |
| | 45 | + lib/commons-logging-1.1.jar lib/ws-commons-util-1.0.1.jar |
| | 46 | + lib/log4j-1.2.14.jar lib/lucene-core-2.3.jar |
| | 47 | + lib/lucene-analyzers.jar lib/snowball.jar lib/mwdumper.jar |
| | 48 | + lib/mysql-connector-java-3.0.17-ga-bin.jar"/> |
| | 49 | + </manifest> |
| 42 | 50 | <zipfileset dir="${bin}" prefix=""> |
| 43 | 51 | <include name="org/**"/> |
| 44 | 52 | </zipfileset> |
| — | — | @@ -70,11 +78,11 @@ |
| 71 | 79 | |
| 72 | 80 | |
| 73 | 81 | <target name="build" description="Compile classes"> |
| 74 | | - <mkdir dir="${bin}"/> |
| 75 | | - <javac srcdir="${src}/org/" debug="on" encoding="UTF-8" includes="**/*.java" destdir="${bin}/"> |
| 76 | | - <classpath refid="classpath"/> |
| 77 | | - </javac> |
| 78 | | - </target> |
| | 82 | + <mkdir dir="${bin}"/> |
| | 83 | + <javac srcdir="${src}/org/" debug="on" encoding="UTF-8" includes="**/*.java" destdir="${bin}/"> |
| | 84 | + <classpath refid="classpath"/> |
| | 85 | + </javac> |
| | 86 | + </target> |
| 79 | 87 | |
| 80 | 88 | <target name="pack" description="Make tar.gz distribution"> |
| 81 | 89 | <mkdir dir="${dist}"/> |
| — | — | @@ -106,7 +114,8 @@ |
| 107 | 115 | <delete file="${dist}/${binary.name}.tar"/> |
| 108 | 116 | <delete file="${dist}/${binary.name}.tar.gz"/> |
| 109 | 117 | <tar tarfile="${dist}/${binary.name}.tar"> |
| 110 | | - <tarfileset prefix="${pack.name}" dir="." includes="${jar.name} ${include.bin}" excludes="template/backup/**"/> |
| | 118 | + <tarfileset prefix="${pack.name}" dir="." includes="${jar.name} ${include.bin}" |
| | 119 | + excludes="template/backup/**"/> |
| 111 | 120 | <tarfileset prefix="${pack.name}" mode="755" dir="." includes="${include.sh}"/> |
| 112 | 121 | </tar> |
| 113 | 122 | |