diff options
author | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-13 23:39:18 +0000 |
---|---|---|
committer | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-13 23:39:18 +0000 |
commit | ea52e817b56c3b0df0d87007b278b60298cf6fbb (patch) | |
tree | a33499d4f240b2d907470eed294f7644247c7a78 /EssentialsChat | |
parent | cf86a79f1f1ea0a207d436d73798ccb491fe2145 (diff) | |
download | Essentials-ea52e817b56c3b0df0d87007b278b60298cf6fbb.tar Essentials-ea52e817b56c3b0df0d87007b278b60298cf6fbb.tar.gz Essentials-ea52e817b56c3b0df0d87007b278b60298cf6fbb.tar.lz Essentials-ea52e817b56c3b0df0d87007b278b60298cf6fbb.tar.xz Essentials-ea52e817b56c3b0df0d87007b278b60298cf6fbb.zip |
Move Register stuff inside Essentials
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1454 e251c2fe-e539-e718-e476-b85c1f46cddb
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 e29ddc780..84fb4835f 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.Register}" name="call.subproject"/> - <param location="${project.Register}/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"> @@ -1058,13 +1051,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.Register}" name="call.subproject"/> - <param location="${project.Register}/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 4cd2c5511..49f0e1c6b 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=3869278d -nbproject/build-impl.xml.script.CRC32=2a1bb0f3 +nbproject/build-impl.xml.data.CRC32=7c7f517b +nbproject/build-impl.xml.script.CRC32=9d5d3374 nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45 diff --git a/EssentialsChat/nbproject/project.properties b/EssentialsChat/nbproject/project.properties index 09ad86fb8..89b368bee 100644 --- a/EssentialsChat/nbproject/project.properties +++ b/EssentialsChat/nbproject/project.properties @@ -33,8 +33,7 @@ jar.compress=false javac.classpath=\ ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\ ${file.reference.Permissions.jar}:\ - ${reference.Essentials.jar}:\ - ${reference.Register.jar} + ${reference.Essentials.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false @@ -64,9 +63,7 @@ meta.inf.dir=${src.dir}/META-INF mkdist.disabled=false platform.active=default_platform project.Essentials=../Essentials -project.Register=../Register reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar -reference.Register.jar=${project.Register}/dist/Register.jar run.classpath=\ ${javac.classpath}:\ ${build.classes.dir} diff --git a/EssentialsChat/nbproject/project.xml b/EssentialsChat/nbproject/project.xml index bd945a361..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>Register</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> |