diff options
Diffstat (limited to 'nbproject')
| -rw-r--r-- | nbproject/build-impl.xml | 35 | ||||
| -rw-r--r-- | nbproject/genfiles.properties | 6 | ||||
| -rw-r--r-- | nbproject/project.properties | 6 | ||||
| -rw-r--r-- | nbproject/project.xml | 3 |
4 files changed, 41 insertions, 9 deletions
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 7fb33e9..57f3abf 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -42,18 +42,43 @@ is divided into following sections: <property file="nbproject/private/configs/${config}.properties"/> <property file="nbproject/private/private.properties"/> </target> - <target depends="-pre-init,-init-private" name="-init-user"> + <target name="-pre-init-libraries"> + <property location="./lib/nblibraries.properties" name="libraries.path"/> + <dirname file="${libraries.path}" property="libraries.dir.nativedirsep"/> + <pathconvert dirsep="/" property="libraries.dir"> + <path path="${libraries.dir.nativedirsep}"/> + </pathconvert> + <basename file="${libraries.path}" property="libraries.basename" suffix=".properties"/> + <available file="${libraries.dir}/${libraries.basename}-private.properties" property="private.properties.available"/> + </target> + <target depends="-pre-init-libraries" if="private.properties.available" name="-init-private-libraries"> + <loadproperties encoding="ISO-8859-1" srcfile="${libraries.dir}/${libraries.basename}-private.properties"> + <filterchain> + <replacestring from="$${base}" to="${libraries.dir}"/> + <escapeunicode/> + </filterchain> + </loadproperties> + </target> + <target depends="-pre-init,-init-private,-init-private-libraries" name="-init-libraries"> + <loadproperties encoding="ISO-8859-1" srcfile="${libraries.path}"> + <filterchain> + <replacestring from="$${base}" to="${libraries.dir}"/> + <escapeunicode/> + </filterchain> + </loadproperties> + </target> + <target depends="-pre-init,-init-private,-init-libraries" name="-init-user"> <property file="${user.properties.file}"/> <!-- The two properties below are usually overridden --> <!-- by the active platform. Just a fallback. --> <property name="default.javac.source" value="1.4"/> <property name="default.javac.target" value="1.4"/> </target> - <target depends="-pre-init,-init-private,-init-user" name="-init-project"> + <target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project"> <property file="nbproject/configs/${config}.properties"/> <property file="nbproject/project.properties"/> </target> - <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init"> + <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init"> <property name="platform.java" value="${java.home}/bin/java"/> <available file="${manifest.file}" property="manifest.available"/> <condition property="splashscreen.available"> @@ -228,7 +253,7 @@ is divided into following sections: <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> - <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check"> + <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check"> <fail unless="src.dir">Must set src.dir</fail> <fail unless="test.src.dir">Must set test.src.dir</fail> <fail unless="build.dir">Must set build.dir</fail> @@ -881,7 +906,7 @@ is divided into following sections: <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline"> <property name="ap.cmd.line.internal" value=""/> </target> - <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/> + <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/> <!-- =================== COMPILATION SECTION diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 0390e98..db5ad96 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=84db0246 +build.xml.data.CRC32=c819d446 build.xml.script.CRC32=bbbf2609 build.xml.stylesheet.CRC32=8064a381@1.79.1.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=84db0246 -nbproject/build-impl.xml.script.CRC32=d4e75421 +nbproject/build-impl.xml.data.CRC32=c819d446 +nbproject/build-impl.xml.script.CRC32=243d4ab8 nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48 diff --git a/nbproject/project.properties b/nbproject/project.properties index 574fc6c..3b2b37c 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -29,9 +29,13 @@ dist.jar=${dist.dir}/IceBox.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= +file.reference.LGoodDatePicker-7.6.3-backport.jar=lib/LGoodDatePicker-7.6.3-backport.jar +file.reference.threetenbp-1.3.1.jar=lib/threetenbp-1.3.1.jar includes=** jar.compress=false -javac.classpath= +javac.classpath=\ + ${file.reference.threetenbp-1.3.1.jar}:\ + ${file.reference.LGoodDatePicker-7.6.3-backport.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false diff --git a/nbproject/project.xml b/nbproject/project.xml index e2cd950..d518143 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -11,5 +11,8 @@ <root id="test.src.dir"/> </test-roots> </data> + <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1"> + <definitions>./lib/nblibraries.properties</definitions> + </libraries> </configuration> </project> |