diff options
author | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-06-02 13:24:26 +0000 |
---|---|---|
committer | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-06-02 13:24:26 +0000 |
commit | a235f350ccfa53c48a0a3655aa6c0bf1ea382a04 (patch) | |
tree | e7bc836b7584e7d2f4901b3f9baf256cc76728cb /BuildAll/nbproject | |
parent | 395f65dc4a81fc8985f7852b4e783ab18959351d (diff) | |
download | Essentials-a235f350ccfa53c48a0a3655aa6c0bf1ea382a04.tar Essentials-a235f350ccfa53c48a0a3655aa6c0bf1ea382a04.tar.gz Essentials-a235f350ccfa53c48a0a3655aa6c0bf1ea382a04.tar.lz Essentials-a235f350ccfa53c48a0a3655aa6c0bf1ea382a04.tar.xz Essentials-a235f350ccfa53c48a0a3655aa6c0bf1ea382a04.zip |
Added EssentialsXMPP from newplugins branch.
Updated to work with trunk.
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1564 e251c2fe-e539-e718-e476-b85c1f46cddb
Diffstat (limited to 'BuildAll/nbproject')
-rw-r--r-- | BuildAll/nbproject/build-impl.xml | 14 | ||||
-rw-r--r-- | BuildAll/nbproject/genfiles.properties | 6 | ||||
-rw-r--r-- | BuildAll/nbproject/project.properties | 5 | ||||
-rw-r--r-- | BuildAll/nbproject/project.xml | 8 |
4 files changed, 29 insertions, 4 deletions
diff --git a/BuildAll/nbproject/build-impl.xml b/BuildAll/nbproject/build-impl.xml index 2d4272990..61cea7f34 100644 --- a/BuildAll/nbproject/build-impl.xml +++ b/BuildAll/nbproject/build-impl.xml @@ -650,6 +650,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.EssentialsXMPP}" name="call.subproject"/> + <param location="${project.EssentialsXMPP}/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"> @@ -1135,6 +1142,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.EssentialsXMPP}" name="call.subproject"/> + <param location="${project.EssentialsXMPP}/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/BuildAll/nbproject/genfiles.properties b/BuildAll/nbproject/genfiles.properties index b2e08c5de..5bff626f0 100644 --- a/BuildAll/nbproject/genfiles.properties +++ b/BuildAll/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=c4188209 +build.xml.data.CRC32=51b33957 build.xml.script.CRC32=7a797370 build.xml.stylesheet.CRC32=28e38971@1.43.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=c4188209 -nbproject/build-impl.xml.script.CRC32=73a4865f +nbproject/build-impl.xml.data.CRC32=51b33957 +nbproject/build-impl.xml.script.CRC32=7a6cee4f nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45 diff --git a/BuildAll/nbproject/project.properties b/BuildAll/nbproject/project.properties index ca7ee69ad..d0076cd5f 100644 --- a/BuildAll/nbproject/project.properties +++ b/BuildAll/nbproject/project.properties @@ -35,7 +35,8 @@ javac.classpath=\ ${reference.EssentialsGroupManager.jar}:\ ${reference.EssentialsProtect.jar}:\ ${reference.EssentialsSpawn.jar}:\ - ${reference.EssentialsGeoIP.jar} + ${reference.EssentialsGeoIP.jar}:\ + ${reference.EssentialsXMPP.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false @@ -71,6 +72,7 @@ project.EssentialsGroupBridge=../EssentialsGroupBridge project.EssentialsGroupManager=../EssentialsGroupManager project.EssentialsProtect=../EssentialsProtect project.EssentialsSpawn=../EssentialsSpawn +project.EssentialsXMPP=../EssentialsXMPP reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar reference.EssentialsChat.jar=${project.EssentialsChat}/dist/EssentialsChat.jar reference.EssentialsGeoIP.jar=${project.EssentialsGeoIP}/dist/EssentialsGeoIP.jar @@ -78,6 +80,7 @@ reference.EssentialsGroupBridge.jar=${project.EssentialsGroupBridge}/dist/Essent reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar reference.EssentialsProtect.jar=${project.EssentialsProtect}/dist/EssentialsProtect.jar reference.EssentialsSpawn.jar=${project.EssentialsSpawn}/dist/EssentialsSpawn.jar +reference.EssentialsXMPP.jar=${project.EssentialsXMPP}/dist/original-EssentialsXMPP.jar run.classpath=\ ${javac.classpath}:\ ${build.classes.dir} diff --git a/BuildAll/nbproject/project.xml b/BuildAll/nbproject/project.xml index e00554632..420233ac9 100644 --- a/BuildAll/nbproject/project.xml +++ b/BuildAll/nbproject/project.xml @@ -71,6 +71,14 @@ <clean-target>clean</clean-target> <id>jar</id> </reference> + <reference> + <foreign-project>EssentialsXMPP</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> |