From: Roland Häder <roland@mxchange.org>
Date: Sat, 15 Apr 2017 18:58:22 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c65e80604ebe34e4e02bfd68684d3cac2adfa629;p=jfinancials-lib.git
Continued:
- jfinancials-core/mailer are now referenced as projects as they are
application-specific projects and not libraries (like e.g. juser-core is)
- replaced jshop-core with jproduct-core as this is what is only needed
Signed-off-by: Roland Häder <roland@mxchange.org>
---
diff --git a/lib/jfinancials-core.jar b/lib/jfinancials-core.jar
deleted file mode 100644
index 48c5de2..0000000
Binary files a/lib/jfinancials-core.jar and /dev/null differ
diff --git a/lib/jproduct-core.jar b/lib/jproduct-core.jar
new file mode 100644
index 0000000..3c8ae07
Binary files /dev/null and b/lib/jproduct-core.jar differ
diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar
deleted file mode 100644
index b158fae..0000000
Binary files a/lib/jshop-core.jar and /dev/null differ
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index c66340b..41a9603 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -927,6 +927,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.jfinancials-core}" name="call.subproject"/>
+ <param location="${project.jfinancials-core}/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">
@@ -1412,6 +1420,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.jfinancials-core}" name="call.subproject"/>
+ <param location="${project.jfinancials-core}/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/project.properties b/nbproject/project.properties
index 0549796..e844784 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -31,11 +31,10 @@ dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar
-file.reference.jfinancials-core.jar=lib/jfinancials-core.jar
file.reference.jcontacts-core.jar=lib/jcontacts-core.jar
file.reference.jcountry-core.jar=lib/jcountry-core.jar
file.reference.jphone-core.jar=lib/jphone-core.jar
-file.reference.jshop-core.jar=lib/jshop-core.jar
+file.reference.jproduct-core.jar=lib/jproduct-core.jar
file.reference.juser-core.jar=lib/juser-core.jar
file.reference.jfinancials-core.jar=lib/jfinancials-core.jar
includes=**
@@ -47,9 +46,9 @@ javac.classpath=\
${file.reference.jphone-core.jar}:\
${file.reference.jcontacts-core.jar}:\
${file.reference.jcontacts-business-core.jar}:\
- ${file.reference.jshop-core.jar}:\
+ ${file.reference.jproduct-core.jar}:\
${file.reference.juser-core.jar}:\
- ${file.reference.jfinancials-core.jar}:\
+ ${reference.jfinancials-core.jar}:\
${libs.javaee-api-7.0.classpath}
# Space-separated list of extra javac options
javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
@@ -92,7 +91,9 @@ manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=true
platform.active=default_platform
+project.jfinancials-core=../../NetBeansProjects/jfinancials-core
project.license=gpl30
+reference.jfinancials-core.jar=${project.jfinancials-core}/dist/jfinancials-core.jar
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
@@ -101,11 +102,10 @@ run.test.classpath=\
${build.test.classes.dir}
source.encoding=UTF-8
source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/
-source.reference.jfinancials-core.jar=../jfinancials-core/src/
source.reference.jcontacts-core.jar=../jcontacts-core/src/
source.reference.jcountry-core.jar=../jcountry-core/src/
source.reference.jphone-core.jar=../jphone-core/src/
-source.reference.jshop-core.jar=../jshop-core/src/
+source.reference.jproduct-core.jar=../jproduct-core/src/
source.reference.juser-core.jar=../juser-core/src/
source.reference.jfinancials-core.jar=../jfinancials-core/src/
src.dir=src
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 011eab2..f698361 100644
--- 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>jfinancials-core</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>