Also include lib

Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 429f434b3208e9eb667186ae493ada8d10ca9337..fe0d44c78c99ae73de25349b87cd8b720c1d34d7 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -921,6 +921,14 @@ is divided into following sections:
         <propertyfile file="${built-jar.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-jar.properties}"/>
+            <param location="${project.PizzaService-lib}" name="call.subproject"/>
+            <param location="${project.PizzaService-lib}/build.xml" name="call.script"/>
+            <param name="call.target" value="jar"/>
+            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
+        </antcall>
     </target>
     <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
     <target depends="init" name="-check-automatic-build">
@@ -1406,6 +1414,14 @@ is divided into following sections:
         <propertyfile file="${built-clean.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-clean.properties}"/>
+            <param location="${project.PizzaService-lib}" name="call.subproject"/>
+            <param location="${project.PizzaService-lib}/build.xml" name="call.script"/>
+            <param name="call.target" value="clean"/>
+            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
+        </antcall>
     </target>
     <target depends="init" name="-do-clean">
         <delete dir="${build.dir}"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index bd6d8ee2221b229e6e46232950ec08016ea0d570..f890e401af8b5992e7594759d87eb722efcbb622 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=dd050211
+build.xml.data.CRC32=4f4d08d6
 build.xml.script.CRC32=e8f4b4e8
 build.xml.stylesheet.CRC32=8064a381@1.75.2.48
 # 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=dd050211
-nbproject/build-impl.xml.script.CRC32=442a7e5f
+nbproject/build-impl.xml.data.CRC32=4f4d08d6
+nbproject/build-impl.xml.script.CRC32=ebd15511
 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 3a457c9a1c442c635f2556832de8025c4f0d639c..fb261f7759d84c7a7179ea40fa1601f45065439a 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -39,7 +39,8 @@ javac.classpath=\
     ${file.reference.log4j-api-2.3.jar}:\
     ${file.reference.log4j-core-2.3.jar}:\
     ${file.reference.jswingcore.jar}:\
-    ${file.reference.jshop-core.jar}
+    ${file.reference.jshop-core.jar}:\
+    ${reference.PizzaService-lib.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -68,6 +69,8 @@ manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false
 platform.active=default_platform
+project.PizzaService-lib=../pizzaservice-lib
+reference.PizzaService-lib.jar=${project.PizzaService-lib}/dist/PizzaService-lib.jar
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 249934c92aea1ec8c59b7e207884a7e0f90e871c..1dc5238de9b7934cc68de6f26677ec3dd9bf5536 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -14,5 +14,15 @@
         <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>PizzaService-lib</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>