|
8 | 8 | </description> |
9 | 9 |
|
10 | 10 | <!-- set global properties for this build --> |
11 | | - <property name="srcMM" location="src" /> |
12 | | - <property name="buildMM" location="build" /> |
13 | | - <property name="libMM" location="lib" /> |
14 | | - <property name="release_dir" value="release" /> |
| 11 | + <property name="MMdir" location="../morph-models" /> |
| 12 | + <property name="srcMM" location="${MMdir}/src" /> |
| 13 | + <property name="buildMM" location="${MMdir}/build" /> |
| 14 | + <property name="libMM" location="${MMdir}/lib" /> |
| 15 | + <property name="release_dir" value="${MMdir}/release" /> |
15 | 16 | <property name="distMM" location="${buildMM}/dist" /> |
16 | 17 | <property name="beast2path" location="../beast2" /> |
17 | 18 | <property name="libBeast2" location="${beast2path}/lib" /> |
18 | 19 | <property name="srcBeast2" location="${beast2path}/src" /> |
19 | 20 | <property name="beast2classpath" location="${beast2path}/build" /> |
20 | | - <property name="Add_on_dir" value="${release_dir}/add-on" /> |
21 | | - <property name="version" value="1.1.0" /> |
| 21 | + <property name="beastappclasspath" location="../BeastFX/build" /> |
| 22 | + <property name="Add_on_dir" value="${release_dir}/add-on" /> |
22 | 23 |
|
23 | 24 | <import file="${beast2path}/build.xml" /> |
24 | 25 |
|
|
27 | 28 |
|
28 | 29 | <path id="classpath"> |
29 | 30 | <pathelement path="${buildMM}"/> |
30 | | - <fileset dir="${libBeast2}" includes="junit-4.8.2.jar"/> |
31 | | - <pathelement path="${beast2classpath}"/> |
32 | 31 | <fileset dir="${beast2path}/lib" includes="jam.jar"/> |
33 | 32 | <fileset dir="${beast2path}/lib" includes="beagle.jar"/> |
34 | | - <fileset dir="${beast2path}/lib" includes="fest.jar"/> |
35 | 33 | <fileset dir="${beast2path}/lib" includes="colt.jar"/> |
36 | | - </path> |
| 34 | + <pathelement path="${beast2classpath}"/> |
| 35 | + <pathelement path="${beastappclasspath}"/> |
| 36 | + </path> |
37 | 37 |
|
38 | 38 | <!-- start --> |
39 | 39 | <target name="initMM"> |
40 | 40 | <echo message="${ant.project.name}: ${ant.file}" /> |
| 41 | + <available file="${MMdir}/version.xml" property="versionAvailable"/> |
| 42 | + <fail unless="versionAvailable"> |
| 43 | + ** Required file version.xml does not exist. ** |
| 44 | + </fail> |
| 45 | + |
| 46 | + <!-- Read package name and version from xml file --> |
| 47 | + <xmlproperty file="${MMdir}/version.xml" prefix="fromVersionFile" /> |
| 48 | + <property name="MMversion" value="${fromVersionFile.package(version)}" /> |
41 | 49 | </target> |
42 | 50 |
|
43 | 51 | <target name="cleanMM"> |
|
78 | 86 | memorymaximumsize="256m" |
79 | 87 | source="1.8" |
80 | 88 | target="1.8"> |
81 | | - <include name="beast/**/**" /> |
| 89 | + <include name="morphmodels/**/**" /> |
82 | 90 | <!-- compile JUnit test classes --> |
| 91 | + <!-- |
83 | 92 | <include name="test/beast/**" /> |
| 93 | + --> |
84 | 94 | </javac> |
85 | 95 | <echo message="Successfully compiled." /> |
86 | 96 | </target> |
|
90 | 100 | <!-- Create the distribution directory --> |
91 | 101 | <mkdir dir="${distMM}" /> |
92 | 102 |
|
93 | | - <!-- Put everything in ${buildMM} into the beast.jar file --> |
94 | | - <jar jarfile="${distMM}/MM.jar"> |
95 | | - <manifest> |
96 | | - <attribute name="Built-By" value="${user.name}" /> |
97 | | - <attribute name="Main-Class" value="${main_class_BEAST}" /> |
98 | | - </manifest> |
99 | | - <fileset dir="${buildMM}"> |
100 | | - <include name="beast/**/*.class" /> |
101 | | - </fileset> |
102 | | - <fileset dir="${beast2classpath}"> |
103 | | - <include name="beast/**/*.class" /> |
104 | | - <include name="beast/**/*.properties" /> |
105 | | - <include name="beast/**/*.png" /> |
106 | | - <include name="beagle/**/*.class" /> |
107 | | - <include name="org/**/*.class" /> |
108 | | - </fileset> |
109 | | - </jar> |
110 | 103 | <jar jarfile="${distMM}/MM.src.jar"> |
111 | 104 | <fileset dir="${srcMM}"> |
112 | | - <include name="beast/**/*.java" /> |
113 | | - <include name="beast/**/*.png" /> |
114 | | - <include name="beast/**/*.xsl" /> |
| 105 | + <include name="morphmodels/**/*.java" /> |
| 106 | + <include name="morphmodels/**/*.png" /> |
| 107 | + <include name="morphmodels/**/*.xsl" /> |
115 | 108 | </fileset> |
116 | 109 | </jar> |
117 | 110 | <jar jarfile="${distMM}/MM.addon.jar"> |
118 | 111 | <manifest> |
119 | 112 | <attribute name="Built-By" value="${user.name}" /> |
120 | 113 | </manifest> |
121 | 114 | <fileset dir="${buildMM}"> |
122 | | - <include name="beast/**/*.class" /> |
123 | | - <include name="util/**/*.class" /> |
| 115 | + <include name="morphmodels/**/*.class" /> |
124 | 116 | <include name="**/*.properties" /> |
125 | 117 | </fileset> |
126 | 118 | </jar> |
|
174 | 166 | <mkdir dir="${Add_on_dir}" /> |
175 | 167 | <mkdir dir="${Add_on_dir}/lib" /> |
176 | 168 | <mkdir dir="${Add_on_dir}/examples" /> |
177 | | - <mkdir dir="${Add_on_dir}/templates" /> |
| 169 | + <mkdir dir="${Add_on_dir}/fxtemplates" /> |
178 | 170 |
|
179 | 171 | <copy todir="${Add_on_dir}"> |
180 | 172 | <fileset file="version.xml"/> |
|
188 | 180 | <copy todir="${Add_on_dir}"> |
189 | 181 | <fileset dir="${distMM}" includes="MM.src.jar" /> |
190 | 182 | </copy> |
191 | | - <copy todir="${Add_on_dir}/templates"> |
192 | | - <fileset file="templates/*.xml" /> |
| 183 | + <copy todir="${Add_on_dir}/fxtemplates"> |
| 184 | + <fileset file="fxtemplates/*.xml" /> |
193 | 185 | </copy> |
194 | 186 |
|
195 | | - <jar jarfile="${distMM}/MM.addon.v${version}.zip"> |
| 187 | + <jar jarfile="${distMM}/MM.addon.v${MMversion}.zip"> |
196 | 188 | <fileset dir="${Add_on_dir}"> |
197 | 189 | <include name="**/*" /> |
198 | 190 | </fileset> |
199 | 191 | </jar> |
200 | | - <echo message="Add-on version v${version} release is finished." /> |
| 192 | + <echo message="Add-on version v${MMversion} release is finished." /> |
201 | 193 | </target> |
202 | 194 |
|
203 | 195 | </project> |
0 commit comments