From 41d73bf90e2e94c91df8a865d54d5cb23b9101c9 Mon Sep 17 00:00:00 2001 From: snowleo Date: Sun, 1 May 2011 11:04:34 +0000 Subject: EssentialsGeoIP is now officially part of Essentials git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1292 e251c2fe-e539-e718-e476-b85c1f46cddb --- BuildAll/build.xml | 148 +++++++++++++------------- BuildAll/nbproject/build-impl.xml | 28 +++++ BuildAll/nbproject/genfiles.properties | 8 +- BuildAll/nbproject/project.properties | 186 +++++++++++++++++---------------- BuildAll/nbproject/project.xml | 152 +++++++++++++++------------ 5 files changed, 286 insertions(+), 236 deletions(-) (limited to 'BuildAll') diff --git a/BuildAll/build.xml b/BuildAll/build.xml index 496f85c34..d41b561fd 100644 --- a/BuildAll/build.xml +++ b/BuildAll/build.xml @@ -1,74 +1,74 @@ - - - - - - - - - - - Builds, tests, and runs the project BuildAll. - - - + + + + + + + + + + + Builds, tests, and runs the project BuildAll. + + + diff --git a/BuildAll/nbproject/build-impl.xml b/BuildAll/nbproject/build-impl.xml index cf93b9f26..bb58a3de4 100644 --- a/BuildAll/nbproject/build-impl.xml +++ b/BuildAll/nbproject/build-impl.xml @@ -615,6 +615,13 @@ is divided into following sections: + + + + + + + @@ -643,6 +650,13 @@ is divided into following sections: + + + + + + + @@ -1093,6 +1107,13 @@ is divided into following sections: + + + + + + + @@ -1121,6 +1142,13 @@ is divided into following sections: + + + + + + + diff --git a/BuildAll/nbproject/genfiles.properties b/BuildAll/nbproject/genfiles.properties index bc9de7132..7ff7a7694 100644 --- a/BuildAll/nbproject/genfiles.properties +++ b/BuildAll/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=60061751 +build.xml.data.CRC32=ce72f3c5 build.xml.script.CRC32=7a797370 -build.xml.stylesheet.CRC32=28e38971@1.42.1.45 +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=60061751 -nbproject/build-impl.xml.script.CRC32=d43c7626 +nbproject/build-impl.xml.data.CRC32=ce72f3c5 +nbproject/build-impl.xml.script.CRC32=79b2da51 nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45 diff --git a/BuildAll/nbproject/project.properties b/BuildAll/nbproject/project.properties index 6b8e235e1..3a4db66ed 100644 --- a/BuildAll/nbproject/project.properties +++ b/BuildAll/nbproject/project.properties @@ -1,90 +1,96 @@ -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=false -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -application.title=BuildAll -application.vendor=Paul -build.classes.dir=${build.dir}/classes -build.classes.excludes=**/*.java,**/*.form -# This directory is removed when the project is cleaned: -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -# Only compile against the classpath explicitly listed here: -build.sysclasspath=ignore -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -# Uncomment to specify the preferred debugger connection transport: -#debug.transport=dt_socket -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} -# This directory is removed when the project is cleaned: -dist.dir=dist -dist.jar=${dist.dir}/BuildAll.jar -dist.javadoc.dir=${dist.dir}/javadoc -endorsed.classpath= -excludes= -includes=** -jar.compress=false -javac.classpath=\ - ${reference.Essentials.jar}:\ - ${reference.EssentialsChat.jar}:\ - ${reference.EssentialsGroupBridge.jar}:\ - ${reference.EssentialsGroupManager.jar}:\ - ${reference.EssentialsProtect.jar}:\ - ${reference.EssentialsSpawn.jar} -# Space-separated list of extra javac options -javac.compilerargs= -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.5 -javac.target=1.5 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath}:\ - ${libs.junit_4.classpath} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -meta.inf.dir=${src.dir}/META-INF -mkdist.disabled=false -platform.active=default_platform -project.Essentials=../Essentials -project.EssentialsChat=../EssentialsChat -project.EssentialsGroupBridge=../EssentialsGroupBridge -project.EssentialsGroupManager=../EssentialsGroupManager -project.EssentialsProtect=../EssentialsProtect -project.EssentialsSpawn=../EssentialsSpawn -reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar -reference.EssentialsChat.jar=${project.EssentialsChat}/dist/EssentialsChat.jar -reference.EssentialsGroupBridge.jar=${project.EssentialsGroupBridge}/dist/EssentialsGroupBridge.jar -reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar -reference.EssentialsProtect.jar=${project.EssentialsProtect}/dist/original-EssentialsProtect.jar -reference.EssentialsSpawn.jar=${project.EssentialsSpawn}/dist/EssentialsSpawn.jar -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -# Space-separated list of JVM arguments used when running the project -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value -# or test-sys-prop.name=value to set system properties for unit tests): -run.jvmargs= -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -source.encoding=UTF-8 -src.dir=src -test.src.dir=test +annotation.processing.enabled=true +annotation.processing.enabled.in.editor=false +annotation.processing.run.all.processors=true +annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output +application.title=BuildAll +application.vendor=Paul +build.classes.dir=${build.dir}/classes +build.classes.excludes=**/*.java,**/*.form +# This directory is removed when the project is cleaned: +build.dir=build +build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources +# Only compile against the classpath explicitly listed here: +build.sysclasspath=ignore +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +# Uncomment to specify the preferred debugger connection transport: +#debug.transport=dt_socket +debug.classpath=\ + ${run.classpath} +debug.test.classpath=\ + ${run.test.classpath} +# This directory is removed when the project is cleaned: +dist.dir=dist +dist.jar=${dist.dir}/BuildAll.jar +dist.javadoc.dir=${dist.dir}/javadoc +endorsed.classpath= +excludes= +includes=** +jar.compress=false +javac.classpath=\ + ${reference.Essentials.jar}:\ + ${reference.EssentialsChat.jar}:\ + ${reference.EssentialsGroupBridge.jar}:\ + ${reference.EssentialsGroupManager.jar}:\ + ${reference.EssentialsProtect.jar}:\ + ${reference.EssentialsSpawn.jar}:\ + ${reference.EssentialsGeoIP.jar}:\ + ${reference.EssentialsiConomyBridge.jar} +# Space-separated list of extra javac options +javac.compilerargs= +javac.deprecation=false +javac.processorpath=\ + ${javac.classpath} +javac.source=1.5 +javac.target=1.5 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir}:\ + ${libs.junit.classpath}:\ + ${libs.junit_4.classpath} +javac.test.processorpath=\ + ${javac.test.classpath} +javadoc.additionalparam= +javadoc.author=false +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle= +meta.inf.dir=${src.dir}/META-INF +mkdist.disabled=false +platform.active=default_platform +project.Essentials=../Essentials +project.EssentialsChat=../EssentialsChat +project.EssentialsGeoIP=../EssentialsGeoIP +project.EssentialsGroupBridge=../EssentialsGroupBridge +project.EssentialsGroupManager=../EssentialsGroupManager +project.EssentialsiConomyBridge=../EssentialsiConomyBridge +project.EssentialsProtect=../EssentialsProtect +project.EssentialsSpawn=../EssentialsSpawn +reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar +reference.EssentialsChat.jar=${project.EssentialsChat}/dist/EssentialsChat.jar +reference.EssentialsGeoIP.jar=${project.EssentialsGeoIP}/dist/EssentialsGeoIP.jar +reference.EssentialsGroupBridge.jar=${project.EssentialsGroupBridge}/dist/EssentialsGroupBridge.jar +reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar +reference.EssentialsiConomyBridge.jar=${project.EssentialsiConomyBridge}/dist/EssentialsiConomyBridge.jar +reference.EssentialsProtect.jar=${project.EssentialsProtect}/dist/original-EssentialsProtect.jar +reference.EssentialsSpawn.jar=${project.EssentialsSpawn}/dist/EssentialsSpawn.jar +run.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +# Space-separated list of JVM arguments used when running the project +# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value +# or test-sys-prop.name=value to set system properties for unit tests): +run.jvmargs= +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +source.encoding=UTF-8 +src.dir=src +test.src.dir=test diff --git a/BuildAll/nbproject/project.xml b/BuildAll/nbproject/project.xml index 86e1cc4a7..4193b92ee 100644 --- a/BuildAll/nbproject/project.xml +++ b/BuildAll/nbproject/project.xml @@ -1,68 +1,84 @@ - - - org.netbeans.modules.java.j2seproject - - - BuildAll - - - - - - - - - ..\lib\nblibraries.properties - - - - Essentials - jar - - jar - clean - jar - - - EssentialsChat - jar - - jar - clean - jar - - - EssentialsGroupBridge - jar - - jar - clean - jar - - - EssentialsGroupManager - jar - - jar - clean - jar - - - EssentialsProtect - jar - - jar - clean - jar - - - EssentialsSpawn - jar - - jar - clean - jar - - - - + + + org.netbeans.modules.java.j2seproject + + + BuildAll + + + + + + + + + ..\lib\nblibraries.properties + + + + Essentials + jar + + jar + clean + jar + + + EssentialsChat + jar + + jar + clean + jar + + + EssentialsGeoIP + jar + + jar + clean + jar + + + EssentialsGroupBridge + jar + + jar + clean + jar + + + EssentialsGroupManager + jar + + jar + clean + jar + + + EssentialsProtect + jar + + jar + clean + jar + + + EssentialsSpawn + jar + + jar + clean + jar + + + EssentialsiConomyBridge + jar + + jar + clean + jar + + + + -- cgit v1.2.3