diff options
| author | KHobbits <rob@khobbits.co.uk> | 2011-10-29 02:50:57 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2011-10-29 02:50:57 +0100 |
| commit | 071175e013ab3a031a4a886875465b8e2430db25 (patch) | |
| tree | 3eabe9bdf8a07699463cde7802855ead46ab6528 /EssentialsChat | |
| parent | fac66b07c29a2de7e57e84b897bfbf1a0c4cfeb0 (diff) | |
| download | Essentials-071175e013ab3a031a4a886875465b8e2430db25.tar Essentials-071175e013ab3a031a4a886875465b8e2430db25.tar.gz Essentials-071175e013ab3a031a4a886875465b8e2430db25.tar.lz Essentials-071175e013ab3a031a4a886875465b8e2430db25.tar.xz Essentials-071175e013ab3a031a4a886875465b8e2430db25.zip | |
More teamcity fixes.
Diffstat (limited to 'EssentialsChat')
| -rw-r--r-- | EssentialsChat/nbproject/build-impl.xml | 14 | ||||
| -rw-r--r-- | EssentialsChat/nbproject/genfiles.properties | 4 | ||||
| -rw-r--r-- | EssentialsChat/nbproject/project.properties | 5 | ||||
| -rw-r--r-- | EssentialsChat/nbproject/project.xml | 8 |
4 files changed, 3 insertions, 28 deletions
diff --git a/EssentialsChat/nbproject/build-impl.xml b/EssentialsChat/nbproject/build-impl.xml index 6f55e790e..4dc2d2659 100644 --- a/EssentialsChat/nbproject/build-impl.xml +++ b/EssentialsChat/nbproject/build-impl.xml @@ -608,13 +608,6 @@ 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.EssentialsGroupManager}" name="call.subproject"/> - <param location="${project.EssentialsGroupManager}/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"> @@ -1059,13 +1052,6 @@ 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.EssentialsGroupManager}" name="call.subproject"/> - <param location="${project.EssentialsGroupManager}/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/EssentialsChat/nbproject/genfiles.properties b/EssentialsChat/nbproject/genfiles.properties index 4925e0e01..95704bf4b 100644 --- a/EssentialsChat/nbproject/genfiles.properties +++ b/EssentialsChat/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=71afd555 build.xml.stylesheet.CRC32=28e38971@1.38.2.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=5177d978 -nbproject/build-impl.xml.script.CRC32=8fa72f48 +nbproject/build-impl.xml.data.CRC32=7c7f517b +nbproject/build-impl.xml.script.CRC32=2447bdf5 nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45 diff --git a/EssentialsChat/nbproject/project.properties b/EssentialsChat/nbproject/project.properties index e5f2dddbc..867228a92 100644 --- a/EssentialsChat/nbproject/project.properties +++ b/EssentialsChat/nbproject/project.properties @@ -66,8 +66,7 @@ includes=** jar.compress=true javac.classpath=\ ${reference.Essentials.jar}:\ - ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}:\ - ${reference.EssentialsGroupManager.jar} + ${file.reference.bukkit-0.0.1-SNAPSHOT.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false @@ -97,9 +96,7 @@ meta.inf.dir=${src.dir}/META-INF mkdist.disabled=true platform.active=default_platform project.Essentials=../Essentials -project.EssentialsGroupManager=../EssentialsGroupManager reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar -reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar run.classpath=\ ${javac.classpath}:\ ${build.classes.dir} diff --git a/EssentialsChat/nbproject/project.xml b/EssentialsChat/nbproject/project.xml index c768e6eeb..993881f29 100644 --- a/EssentialsChat/nbproject/project.xml +++ b/EssentialsChat/nbproject/project.xml @@ -23,14 +23,6 @@ <clean-target>clean</clean-target> <id>jar</id> </reference> - <reference> - <foreign-project>EssentialsGroupManager</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> |