Redesigned database

- removed trackinfo table - deleting directory is now faster
iamKunal · Nov 27, 2016 · e0d8707 · e0d8707
1 parent 2286a7f
commit e0d8707
Show file tree

Hide file tree

Showing 31 changed files with 5,687 additions and 1,711 deletions.
diff --git a/nbproject/UPDATED.TXT b/nbproject/UPDATED.TXT
@@ -1,11 +1,11 @@
-======================================
-Project BeatBoxer build script updated
-======================================
+======================================
+Project BeatBoxer build script updated
+======================================
 
 Project build script file jfx-impl.xml in nbproject sub-directory has not been recognized
 as compliant with this version of NetBeans JavaFX support module. To ensure correct
 and complete functionality within this NetBeans installation the script file has been
-backed up to jfx-impl_backup_5.xml and then updated to the currently supported state.
+backed up to jfx-impl_backup_6.xml and then updated to the currently supported state.
 
 FX Project build script auto-update may be triggered on project open either after
 NetBeans installation update or by manual changes in jfx-impl.xml. Please note that
@@ -20,4 +20,4 @@ javafx.disable.autoupdate.notification=true
 
 Remark: Files nbproject/jfx-impl_backup*.xml and this file nbproject/UPDATED.TXT
 are not used when building the project and can be freely deleted.
-
+
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=9dc95d2c
-build.xml.script.CRC32=ccec5fcf
-build.xml.stylesheet.CRC32=[email protected]
-# 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=9dc95d2c
-nbproject/build-impl.xml.script.CRC32=9f1830ae
-nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
+build.xml.data.CRC32=9dc95d2c
+build.xml.script.CRC32=ccec5fcf
+build.xml.stylesheet.CRC32=[email protected]
+# 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=830140ee
+nbproject/build-impl.xml.script.CRC32=f506dd0f
+nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
diff --git a/nbproject/jfx-impl.xml b/nbproject/jfx-impl.xml
@@ -327,26 +327,48 @@
         <property name="ant-javafx.jar.location" value="${platform.home}${file.separator}tools${file.separator}ant-javafx.jar"/>
     </target>
     <target name="-check-ant-javafx-in-probjdk-lib" unless="ant-javafx.jar.location">
+        <condition property="do.set.ant-javafx.in.probjdk.lib.has_jre">
+            <available file="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar"/>
+        </condition>
+        <condition property="do.set.ant-javafx.in.probjdk.lib.no_jre">
+            <available file="${java.home}${file.separator}lib${file.separator}ant-javafx.jar"/>
+        </condition>
         <condition property="do.set.ant-javafx.in.probjdk.lib">
             <and>
                 <not><isset property="ant-javafx.jar.location"/></not>
-                <available file="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar"/>
+                <or>
+                    <isset property="do.set.ant-javafx.in.probjdk.lib.has_jre"/>
+                    <isset property="do.set.ant-javafx.in.probjdk.lib.no_jre"/>
+                </or>
             </and>
         </condition>
     </target>
     <target name="-set-ant-javafx-in-probjdk-lib" depends="-set-ant-javafx-in-platform-home-tools,-check-ant-javafx-in-probjdk-lib" if="do.set.ant-javafx.in.probjdk.lib">
-        <property name="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar"/>
+        <condition property="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar" else="${java.home}${file.separator}lib${file.separator}ant-javafx.jar">
+            <isset property="do.set.ant-javafx.in.probjdk.lib.has_jre"/>
+        </condition>
     </target>
     <target name="-check-ant-javafx-in-probjdk-tools" unless="ant-javafx.jar.location">
+        <condition property="do.set.ant-javafx.in.probjdk.tools.has_jre">
+            <available file="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar"/>
+        </condition>
+        <condition property="do.set.ant-javafx.in.probjdk.tools.no_jre">
+            <available file="${java.home}${file.separator}tools${file.separator}ant-javafx.jar"/>
+        </condition>
         <condition property="do.set.ant-javafx.in.probjdk.tools">
             <and>
                 <not><isset property="ant-javafx.jar.location"/></not>
-                <available file="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar"/>
+                <or>
+                    <isset property="do.set.ant-javafx.in.probjdk.tools.has_jre"/>
+                    <isset property="do.set.ant-javafx.in.probjdk.tools.no_jre"/>
+                </or>
             </and>
         </condition>
     </target>
     <target name="-set-ant-javafx-in-probjdk-tools" depends="-set-ant-javafx-in-probjdk-lib,-check-ant-javafx-in-probjdk-tools" if="do.set.ant-javafx.in.probjdk.tools">
-        <property name="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar"/>
+        <condition property="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar" else="${java.home}${file.separator}tools${file.separator}ant-javafx.jar">
+            <isset property="do.set.ant-javafx.in.probjdk.tools.has_jre"/>
+        </condition>
     </target>
     <target name="-check-ant-javafx-in-macjdk-lib" unless="ant-javafx.jar.location">
         <condition property="do.set.ant-javafx.in.macjdk.lib">
@@ -1825,6 +1847,25 @@
                     
                     // manifest
                     var man = jar.createManifest();
+                    var userManifestPath = project.getProperty("manifest.file");
+                    if (userManifestPath) {
+                        var userManifestFile = project.resolveFile(userManifestPath);
+                        if (userManifestFile.isFile()) {
+                            var manifestEncoding = project.getProperty("manifest.encoding");
+                            var userManifestReader = manifestEncoding ?
+                                    new java.io.InputStreamReader(
+                                        new java.io.FileInputStream(userManifestFile),
+                                        manifestEncoding) :
+                                    new java.io.InputStreamReader(
+                                        new java.io.FileInputStream(userManifestFile));
+                            try {
+                                var userManifest = new org.apache.tools.ant.taskdefs.Manifest(userManifestReader);
+                                man.merge(userManifest);
+                            } finally {
+                                userManifestReader.close();
+                            }
+                        }
+                    }
                     var a1val = new String(project.getProperty("application.vendor"));
                     var a1 = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
                     a1.setName("Implementation-Vendor");