summaryrefslogtreecommitdiffstats
path: root/EssentialsGeoIP
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2011-10-29 02:31:05 +0100
committerKHobbits <rob@khobbits.co.uk>2011-10-29 02:31:05 +0100
commitc05e8085ed48cd385a1b79e915c7bc53f028fc09 (patch)
treea859ee95a66ea325244e7fb1ba54c63855f18e6a /EssentialsGeoIP
parent6d86f40ca3c59d63ca7d08cdcc25934237ef6a90 (diff)
downloadEssentials-c05e8085ed48cd385a1b79e915c7bc53f028fc09.tar
Essentials-c05e8085ed48cd385a1b79e915c7bc53f028fc09.tar.gz
Essentials-c05e8085ed48cd385a1b79e915c7bc53f028fc09.tar.lz
Essentials-c05e8085ed48cd385a1b79e915c7bc53f028fc09.tar.xz
Essentials-c05e8085ed48cd385a1b79e915c7bc53f028fc09.zip
Lets try a adding a few dependencies.
Diffstat (limited to 'EssentialsGeoIP')
-rw-r--r--EssentialsGeoIP/nbproject/build-impl.xml14
-rw-r--r--EssentialsGeoIP/nbproject/genfiles.properties8
-rw-r--r--EssentialsGeoIP/nbproject/project.properties5
-rw-r--r--EssentialsGeoIP/nbproject/project.xml8
4 files changed, 30 insertions, 5 deletions
diff --git a/EssentialsGeoIP/nbproject/build-impl.xml b/EssentialsGeoIP/nbproject/build-impl.xml
index 41af95ec2..43f7d1cbb 100644
--- a/EssentialsGeoIP/nbproject/build-impl.xml
+++ b/EssentialsGeoIP/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.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">
@@ -1052,6 +1059,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.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/EssentialsGeoIP/nbproject/genfiles.properties b/EssentialsGeoIP/nbproject/genfiles.properties
index 8a865da7b..12c45d323 100644
--- a/EssentialsGeoIP/nbproject/genfiles.properties
+++ b/EssentialsGeoIP/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=cbf94f59
+build.xml.data.CRC32=8721034b
build.xml.script.CRC32=c4b1bb0e
-build.xml.stylesheet.CRC32=28e38971@1.43.1.45
+build.xml.stylesheet.CRC32=28e38971@1.44.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=cbf94f59
-nbproject/build-impl.xml.script.CRC32=e7684555
+nbproject/build-impl.xml.data.CRC32=8721034b
+nbproject/build-impl.xml.script.CRC32=6c6018d2
nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
diff --git a/EssentialsGeoIP/nbproject/project.properties b/EssentialsGeoIP/nbproject/project.properties
index 80cd8778f..ec50ee1d2 100644
--- a/EssentialsGeoIP/nbproject/project.properties
+++ b/EssentialsGeoIP/nbproject/project.properties
@@ -66,7 +66,8 @@ includes=**
jar.compress=true
javac.classpath=\
${reference.Essentials.jar}:\
- ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
+ ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}:\
+ ${reference.EssentialsGroupManager.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
@@ -98,7 +99,9 @@ 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/EssentialsGeoIP/nbproject/project.xml b/EssentialsGeoIP/nbproject/project.xml
index 2c6cc9d84..ee84bc43b 100644
--- a/EssentialsGeoIP/nbproject/project.xml
+++ b/EssentialsGeoIP/nbproject/project.xml
@@ -23,6 +23,14 @@
<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>