@@ -190,18 +190,6 @@ is divided into following sections:
190190 <istrue value =" ${not.archive.disabled}" />
191191 </or >
192192 </condition >
193- <condition property =" do.mkdist" >
194- <and >
195- <isset property =" do.archive" />
196- <isset property =" libs.CopyLibs.classpath" />
197- <not >
198- <istrue value =" ${mkdist.disabled}" />
199- </not >
200- <not >
201- <istrue value =" ${modules.supported.internal}" />
202- </not >
203- </and >
204- </condition >
205193 <condition property =" do.archive+manifest.available" >
206194 <and >
207195 <isset property =" manifest.available" />
@@ -1218,13 +1206,27 @@ is divided into following sections:
12181206 <attribute name =" SplashScreen-Image" value =" META-INF/${splashscreen.basename}" />
12191207 </manifest >
12201208 </target >
1221- <target depends =" init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if =" do.mkdist" name =" -do-jar-copylibs" >
1209+ <target depends =" init,compile" name =" -check-do-mkdist" >
1210+ <condition property =" do.mkdist" >
1211+ <and >
1212+ <isset property =" do.archive" />
1213+ <isset property =" libs.CopyLibs.classpath" />
1214+ <not >
1215+ <istrue value =" ${mkdist.disabled}" />
1216+ </not >
1217+ <not >
1218+ <available file =" ${build.classes.dir}/module-info.class" />
1219+ </not >
1220+ </and >
1221+ </condition >
1222+ </target >
1223+ <target depends =" init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if =" do.mkdist" name =" -do-jar-copylibs" >
12221224 <j2seproject3 : copylibs manifest =" ${tmp.manifest.file}" />
12231225 <echo level =" info" >To run this application from the command line without Ant, try:</echo >
12241226 <property location =" ${dist.jar}" name =" dist.jar.resolved" />
12251227 <echo level =" info" >${platform.java} -jar "${dist.jar.resolved}"</echo >
12261228 </target >
1227- <target depends =" init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if =" do.archive" name =" -do-jar-jar" unless =" do.mkdist" >
1229+ <target depends =" init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist " if =" do.archive" name =" -do-jar-jar" unless =" do.mkdist" >
12281230 <j2seproject1 : jar manifest =" ${tmp.manifest.file}" />
12291231 <property location =" ${build.classes.dir}" name =" build.classes.dir.resolved" />
12301232 <property location =" ${dist.jar}" name =" dist.jar.resolved" />
0 commit comments