Changeset 87:5fff85c7f980 for java/sql-vyuka/nbproject/build-impl.xml
- Timestamp:
- 11/09/20 19:00:45 (3 years ago)
- Branch:
- default
- Tags:
- tip
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
java/sql-vyuka/nbproject/build-impl.xml
r82 r87 106 106 <istrue value="${display.browser}"/> 107 107 </condition> 108 <condition property="do.display.browser.debug ">108 <condition property="do.display.browser.debug.old"> 109 109 <and> 110 110 <isset property="do.display.browser"/> … … 112 112 <isset property="do.debug.client"/> 113 113 </not> 114 <not> 115 <isset property="browser.context"/> 116 </not> 117 </and> 118 </condition> 119 <condition property="do.display.browser.debug"> 120 <and> 121 <isset property="do.display.browser"/> 122 <not> 123 <isset property="do.debug.client"/> 124 </not> 125 <isset property="browser.context"/> 114 126 </and> 115 127 </condition> … … 459 471 </union> 460 472 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/> 461 <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="sql-vyuka" testname="TestNG tests" workingDir="${basedir}">473 <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="sql-vyuka" testname="TestNG tests" workingDir="${basedir}"> 462 474 <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> 463 475 <propertyset> … … 968 980 <mkdir dir="${dist.jar.dir}"/> 969 981 <jar compress="${jar.compress}" jarfile="${dist.war}"> 970 <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_* "/>982 <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/> 971 983 </jar> 972 984 </target> … … 975 987 <mkdir dir="${dist.jar.dir}"/> 976 988 <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF"> 977 <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_* "/>989 <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/> 978 990 </jar> 979 991 </target> … … 982 994 <mkdir dir="${dist.jar.dir}"/> 983 995 <jar compress="${jar.compress}" jarfile="${dist.war}"> 984 <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_* "/>996 <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/> 985 997 </jar> 986 998 </target> … … 989 1001 <mkdir dir="${dist.jar.dir}"/> 990 1002 <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF"> 991 <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_* "/>1003 <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/> 992 1004 </jar> 993 1005 </target> … … 1008 1020 <mkdir dir="${dist.jar.dir}"/> 1009 1021 <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF"> 1010 <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_* "/>1022 <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/> 1011 1023 </jar> 1012 1024 </target> … … 1057 1069 <nbverify file="${dist.war}"/> 1058 1070 </target> 1059 <target depends="run-deploy,-init-display-browser,-display-browser-nb ,-display-browser-cl" name="run-display-browser"/>1071 <target depends="run-deploy,-init-display-browser,-display-browser-nb-old,-display-browser-nb,-display-browser-cl" name="run-display-browser"/> 1060 1072 <target if="do.display.browser" name="-init-display-browser"> 1073 <condition property="do.display.browser.nb.old"> 1074 <and> 1075 <isset property="netbeans.home"/> 1076 <not> 1077 <isset property="browser.context"/> 1078 </not> 1079 </and> 1080 </condition> 1061 1081 <condition property="do.display.browser.nb"> 1062 <isset property="netbeans.home"/> 1082 <and> 1083 <isset property="netbeans.home"/> 1084 <isset property="browser.context"/> 1085 </and> 1063 1086 </condition> 1064 1087 <condition property="do.display.browser.cl"> … … 1066 1089 </condition> 1067 1090 </target> 1091 <target if="do.display.browser.nb.old" name="-display-browser-nb-old"> 1092 <nbbrowse url="${client.url}"/> 1093 </target> 1068 1094 <target if="do.display.browser.nb" name="-display-browser-nb"> 1069 <nbbrowse url="${client.url}"/>1095 <nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/> 1070 1096 </target> 1071 1097 <target if="do.display.browser.cl" name="-get-browser" unless="browser"> … … 1136 1162 <antcall target="connect-debugger"/> 1137 1163 <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/> 1164 <antcall target="debug-display-browser-old"/> 1138 1165 <antcall target="debug-display-browser"/> 1139 1166 <antcall target="connect-client-debugger"/> … … 1152 1179 </nbjpdaconnect> 1153 1180 </target> 1181 <target if="do.display.browser.debug.old" name="debug-display-browser-old"> 1182 <nbbrowse url="${client.url}"/> 1183 </target> 1154 1184 <target if="do.display.browser.debug" name="debug-display-browser"> 1155 <nbbrowse url="${client.url}"/>1185 <nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/> 1156 1186 </target> 1157 1187 <target if="do.debug.client" name="connect-client-debugger"> … … 1249 1279 <nbstartserver profilemode="true"/> 1250 1280 <nbdeploy clientUrlPart="${client.urlPart}" forceRedeploy="true" profilemode="true"/> 1281 <antcall target="debug-display-browser-old"/> 1251 1282 <antcall target="debug-display-browser"/> 1252 1283 <antcall target="-profile-start-loadgen"/> … … 1339 1370 </target> 1340 1371 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run"> 1341 <webproject2:test testincludes="**/*Test.java"/>1372 <webproject2:test includes="${includes}" testincludes="**/*Test.java"/> 1342 1373 </target> 1343 1374 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">