diff options
author | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-13 23:14:03 +0000 |
---|---|---|
committer | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-13 23:14:03 +0000 |
commit | cf86a79f1f1ea0a207d436d73798ccb491fe2145 (patch) | |
tree | 122c6824a7f275a20a17120d976e1a9a61b7865c /EssentialsProtect/nbproject | |
parent | 816fb79a1a0e27bbd78a390b6c13b18d037071fb (diff) | |
download | Essentials-cf86a79f1f1ea0a207d436d73798ccb491fe2145.tar Essentials-cf86a79f1f1ea0a207d436d73798ccb491fe2145.tar.gz Essentials-cf86a79f1f1ea0a207d436d73798ccb491fe2145.tar.lz Essentials-cf86a79f1f1ea0a207d436d73798ccb491fe2145.tar.xz Essentials-cf86a79f1f1ea0a207d436d73798ccb491fe2145.zip |
Add Register as dependency for all projects.
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1453 e251c2fe-e539-e718-e476-b85c1f46cddb
Diffstat (limited to 'EssentialsProtect/nbproject')
-rw-r--r-- | EssentialsProtect/nbproject/build-impl.xml | 14 | ||||
-rw-r--r-- | EssentialsProtect/nbproject/genfiles.properties | 4 | ||||
-rw-r--r-- | EssentialsProtect/nbproject/project.properties | 5 | ||||
-rw-r--r-- | EssentialsProtect/nbproject/project.xml | 64 |
4 files changed, 56 insertions, 31 deletions
diff --git a/EssentialsProtect/nbproject/build-impl.xml b/EssentialsProtect/nbproject/build-impl.xml index e69131a5a..95424134e 100644 --- a/EssentialsProtect/nbproject/build-impl.xml +++ b/EssentialsProtect/nbproject/build-impl.xml @@ -608,6 +608,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.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"> @@ -1051,6 +1058,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.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/EssentialsProtect/nbproject/genfiles.properties b/EssentialsProtect/nbproject/genfiles.properties index 663396f31..8b5d3b093 100644 --- a/EssentialsProtect/nbproject/genfiles.properties +++ b/EssentialsProtect/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=1ed11cc3 build.xml.stylesheet.CRC32=28e38971@1.38.3.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=40644caa -nbproject/build-impl.xml.script.CRC32=0a5523ea +nbproject/build-impl.xml.data.CRC32=672252fb +nbproject/build-impl.xml.script.CRC32=663029e3 nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45 diff --git a/EssentialsProtect/nbproject/project.properties b/EssentialsProtect/nbproject/project.properties index 8d0c349b8..f0325deb7 100644 --- a/EssentialsProtect/nbproject/project.properties +++ b/EssentialsProtect/nbproject/project.properties @@ -35,7 +35,8 @@ jar.index=${jnlp.enabled} javac.classpath=\ ${reference.Essentials.jar}:\ ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\ - ${file.reference.c3p0-0.9.1.2.jar} + ${file.reference.c3p0-0.9.1.2.jar}:\ + ${reference.Register.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false @@ -71,7 +72,9 @@ manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF 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/EssentialsProtect/nbproject/project.xml b/EssentialsProtect/nbproject/project.xml index 821d66672..735cb2d60 100644 --- a/EssentialsProtect/nbproject/project.xml +++ b/EssentialsProtect/nbproject/project.xml @@ -1,28 +1,36 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.java.j2seproject</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
- <name>EssentialsProtect</name>
- <source-roots>
- <root id="src.dir"/>
- </source-roots>
- <test-roots>
- <root id="test.src.dir"/>
- </test-roots>
- </data>
- <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
- <definitions>../lib\nblibraries.properties</definitions>
- </libraries>
- <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
- <reference>
- <foreign-project>Essentials</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>
+<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.java.j2seproject</type> + <configuration> + <data xmlns="http://www.netbeans.org/ns/j2se-project/3"> + <name>EssentialsProtect</name> + <source-roots> + <root id="src.dir"/> + </source-roots> + <test-roots> + <root id="test.src.dir"/> + </test-roots> + </data> + <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1"> + <definitions>../lib\nblibraries.properties</definitions> + </libraries> + <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"> + <reference> + <foreign-project>Essentials</foreign-project> + <artifact-type>jar</artifact-type> + <script>build.xml</script> + <target>jar</target> + <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> |