diff options
Diffstat (limited to 'EssentialsXMPP/nbproject')
| -rw-r--r-- | EssentialsXMPP/nbproject/build-impl.xml | 14 | ||||
| -rw-r--r-- | EssentialsXMPP/nbproject/genfiles.properties | 4 | ||||
| -rw-r--r-- | EssentialsXMPP/nbproject/project.properties | 5 | ||||
| -rw-r--r-- | EssentialsXMPP/nbproject/project.xml | 8 |
4 files changed, 28 insertions, 3 deletions
diff --git a/EssentialsXMPP/nbproject/build-impl.xml b/EssentialsXMPP/nbproject/build-impl.xml index 3293bd709..239c397bf 100644 --- a/EssentialsXMPP/nbproject/build-impl.xml +++ b/EssentialsXMPP/nbproject/build-impl.xml @@ -610,6 +610,13 @@ is divided into following sections: <param name="call.target" value="jar"/> <param name="transfer.built-jar.properties" value="${built-jar.properties}"/> </antcall> + <antcall target="-maybe-call-dep"> + <param name="call.built.properties" value="${built-jar.properties}"/> + <param location="${project.Essentials2Compat}" name="call.subproject"/> + <param location="${project.Essentials2Compat}/build.xml" name="call.script"/> + <param name="call.target" value="jar"/> + <param name="transfer.built-jar.properties" value="${built-jar.properties}"/> + </antcall> </target> <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/> <target depends="init" name="-check-automatic-build"> @@ -1063,6 +1070,13 @@ is divided into following sections: <param name="call.target" value="clean"/> <param name="transfer.built-clean.properties" value="${built-clean.properties}"/> </antcall> + <antcall target="-maybe-call-dep"> + <param name="call.built.properties" value="${built-clean.properties}"/> + <param location="${project.Essentials2Compat}" name="call.subproject"/> + <param location="${project.Essentials2Compat}/build.xml" name="call.script"/> + <param name="call.target" value="clean"/> + <param name="transfer.built-clean.properties" value="${built-clean.properties}"/> + </antcall> </target> <target depends="init" name="-do-clean"> <delete dir="${build.dir}"/> diff --git a/EssentialsXMPP/nbproject/genfiles.properties b/EssentialsXMPP/nbproject/genfiles.properties index ae2a6f962..bb9779474 100644 --- a/EssentialsXMPP/nbproject/genfiles.properties +++ b/EssentialsXMPP/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=db2fb22f build.xml.stylesheet.CRC32=28e38971@1.42.1.45 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=1012a5dd -nbproject/build-impl.xml.script.CRC32=8cccbe45 +nbproject/build-impl.xml.data.CRC32=6a299da6 +nbproject/build-impl.xml.script.CRC32=a83e8167 nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.1.46 diff --git a/EssentialsXMPP/nbproject/project.properties b/EssentialsXMPP/nbproject/project.properties index 66d780451..dd7aa95e3 100644 --- a/EssentialsXMPP/nbproject/project.properties +++ b/EssentialsXMPP/nbproject/project.properties @@ -72,7 +72,8 @@ jar.index=${jnlp.enabled} javac.classpath=\ ${reference.Essentials.jar}:\ ${file.reference.smack-3.2.1.jar}:\ - ${file.reference.bukkit.jar} + ${file.reference.bukkit.jar}:\ + ${reference.Essentials2Compat.jar} # Space-separated list of extra javac options javac.compilerargs=-Xlint:unchecked javac.deprecation=false @@ -112,7 +113,9 @@ meta.inf.dir=${src.dir}/META-INF mkdist.disabled=true platform.active=default_platform project.Essentials=../Essentials +project.Essentials2Compat=../Essentials2Compat reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar +reference.Essentials2Compat.jar=${project.Essentials2Compat}/dist/Essentials2Compat.jar run.classpath=\ ${javac.classpath}:\ ${build.classes.dir} diff --git a/EssentialsXMPP/nbproject/project.xml b/EssentialsXMPP/nbproject/project.xml index 5c9eee1dd..e5ee6cd11 100644 --- a/EssentialsXMPP/nbproject/project.xml +++ b/EssentialsXMPP/nbproject/project.xml @@ -23,6 +23,14 @@ <clean-target>clean</clean-target> <id>jar</id> </reference> + <reference> + <foreign-project>Essentials2Compat</foreign-project> + <artifact-type>jar</artifact-type> + <script>build.xml</script> + <target>jar</target> + <clean-target>clean</clean-target> + <id>jar</id> + </reference> </references> </configuration> </project> |