From: Roland Häder Date: Sat, 15 Apr 2017 18:56:19 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f0aa133d5240d24763d430e4e416e5a19aae5b25;p=addressbook-swing.git Continued: - addressbook-core/mailer are now referenced as projects as they are application-specific projects and not libraries (like e.g. juser-core is) Signed-off-by: Roland Häder --- diff --git a/lib/addressbook-core.jar b/lib/addressbook-core.jar deleted file mode 100644 index 36c8f87..0000000 Binary files a/lib/addressbook-core.jar and /dev/null differ diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 68971d4..0f8fd25 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -927,6 +927,14 @@ is divided into following sections: + + + + + + + + @@ -1420,6 +1428,14 @@ is divided into following sections: + + + + + + + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 68ef8a3..5011028 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=9bef99a6 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=a2ef3a71 -nbproject/build-impl.xml.script.CRC32=73834a8e +nbproject/build-impl.xml.data.CRC32=383c2e73 +nbproject/build-impl.xml.script.CRC32=eb30b78c nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48 diff --git a/nbproject/project.properties b/nbproject/project.properties index b7645e2..1341457 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -30,7 +30,6 @@ dist.jar=${dist.dir}/addressbook-swing.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -file.reference.addressbook-core.jar=lib/addressbook-core.jar file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar file.reference.jcontacts-core.jar=lib/jcontacts-core.jar file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar @@ -50,7 +49,7 @@ javac.classpath=\ ${file.reference.jphone-core.jar}:\ ${file.reference.jcontacts-core.jar}:\ ${file.reference.jcontacts-business-core.jar}:\ - ${file.reference.addressbook-core.jar}:\ + ${reference.addressbook-core.jar}:\ ${reference.addressbook-lib.jar} # Space-separated list of extra javac options javac.compilerargs=-Xlint:deprecation -Xlint:unchecked @@ -94,8 +93,10 @@ manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF mkdist.disabled=true platform.active=default_platform +project.addressbook-core=../../NetBeansProjects/addressbook-core project.addressbook-lib=../addressbook-lib project.license=gpl30 +reference.addressbook-core.jar=${project.addressbook-core}/dist/addressbook-core.jar reference.addressbook-lib.jar=${project.addressbook-lib}/dist/addressbook-lib.jar run.classpath=\ ${javac.classpath}:\ @@ -108,7 +109,6 @@ run.test.classpath=\ ${javac.test.classpath}:\ ${build.test.classes.dir} source.encoding=UTF-8 -source.reference.addressbook-core.jar=../addressbook-core/src source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/ source.reference.jcontacts-core.jar=../jcontacts-core/src/ source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/ diff --git a/nbproject/project.xml b/nbproject/project.xml index 96837cd..68226b4 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -15,6 +15,14 @@ ./lib/nblibraries.properties + + addressbook-core + jar + + jar + clean + jar + addressbook-lib jar