aboutsummaryrefslogtreecommitdiff
path: root/nbproject
diff options
context:
space:
mode:
authorGravatar Ugnich Anton2013-08-14 09:21:47 +0700
committerGravatar Ugnich Anton2013-08-14 09:21:47 +0700
commit2a8c4f613f397619c563fbb74c04e39074d6e98e (patch)
tree233015f82f5766515fe9aeeeb07605bcf9ef217a /nbproject
parentdb2d48c068715c2841fd60b955c98580236c400d (diff)
RFC 6455
Diffstat (limited to 'nbproject')
-rw-r--r--nbproject/build-impl.xml14
-rw-r--r--nbproject/genfiles.properties6
-rw-r--r--nbproject/project.properties9
-rw-r--r--nbproject/project.xml8
4 files changed, 33 insertions, 4 deletions
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index d38c01df..06162daf 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -578,6 +578,13 @@ is divided into following sections:
</antcall>
<antcall target="-maybe-call-dep">
<param name="call.built.properties" value="${built-jar.properties}"/>
+ <param location="${project.com_juick_json}" name="call.subproject"/>
+ <param location="${project.com_juick_json}/build.xml" name="call.script"/>
+ <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.com_juick_server}" name="call.subproject"/>
<param location="${project.com_juick_server}/build.xml" name="call.script"/>
<param name="call.target" value="jar"/>
@@ -1033,6 +1040,13 @@ is divided into following sections:
</antcall>
<antcall target="-maybe-call-dep">
<param name="call.built.properties" value="${built-clean.properties}"/>
+ <param location="${project.com_juick_json}" name="call.subproject"/>
+ <param location="${project.com_juick_json}/build.xml" name="call.script"/>
+ <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.com_juick_server}" name="call.subproject"/>
<param location="${project.com_juick_server}/build.xml" name="call.script"/>
<param name="call.target" value="clean"/>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index d01461cb..8b83736c 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=935965cc
+build.xml.data.CRC32=68cbdaea
build.xml.script.CRC32=2ec0c6a9
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=935965cc
-nbproject/build-impl.xml.script.CRC32=3d733aec
+nbproject/build-impl.xml.data.CRC32=68cbdaea
+nbproject/build-impl.xml.script.CRC32=e6ac4bc8
nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 8858bd3a..e6b5db4c 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -26,13 +26,18 @@ dist.jar=${dist.dir}/com.juick.jabber.ws.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
+file.reference.org.json.jar=lib/org.json.jar
+file.reference.xpp3_min-1.1.4.jar=lib/xpp3_min-1.1.4.jar
includes=**
jar.compress=false
javac.classpath=\
${reference.com_juick_xmpp.jar}:\
${reference.com_juick_server.jar}:\
+ ${reference.com_juick_json.jar}:\
${reference.com_juick.jar}:\
- ${libs.MySQLDriver.classpath}
+ ${libs.MySQLDriver.classpath}:\
+ ${file.reference.org.json.jar}:\
+ ${file.reference.xpp3_min-1.1.4.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
@@ -62,9 +67,11 @@ meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false
platform.active=default_platform
project.com_juick=../com.juick
+project.com_juick_json=../com.juick.json
project.com_juick_server=../com.juick.server
project.com_juick_xmpp=../com.juick.xmpp
reference.com_juick.jar=${project.com_juick}/dist/com.juick.jar
+reference.com_juick_json.jar=${project.com_juick_json}/dist/com.juick.json.jar
reference.com_juick_server.jar=${project.com_juick_server}/dist/com.juick.server.jar
reference.com_juick_xmpp.jar=${project.com_juick_xmpp}/dist/com.juick.xmpp.jar
run.classpath=\
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 0445b566..48bac001 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -19,6 +19,14 @@
<id>jar</id>
</reference>
<reference>
+ <foreign-project>com_juick_json</foreign-project>
+ <artifact-type>jar</artifact-type>
+ <script>${project.com_juick_json}/build.xml</script>
+ <target>jar</target>
+ <clean-target>clean</clean-target>
+ <id>jar</id>
+ </reference>
+ <reference>
<foreign-project>com_juick_server</foreign-project>
<artifact-type>jar</artifact-type>
<script>${project.com_juick_server}/build.xml</script>