From 93b1efd14003ec994a1f56d019f0577f8f5e81ee Mon Sep 17 00:00:00 2001 From: Jeff Wallace Date: Wed, 18 Sep 2013 16:13:02 -0400 Subject: [PATCH 1/5] Moved adding of jdkhome property to the windows installer targets. --- build-windows.xml | 11 +++++++++++ build.xml | 1 - 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/build-windows.xml b/build-windows.xml index 330321f372..f048ee98b2 100644 --- a/build-windows.xml +++ b/build-windows.xml @@ -27,6 +27,17 @@ + + + + + + + + + + + diff --git a/build.xml b/build.xml index 11f80417cb..417487251e 100644 --- a/build.xml +++ b/build.xml @@ -78,7 +78,6 @@ - From 7eb0bb56ba045ea815b15fbbc46b7903e1b2e6e5 Mon Sep 17 00:00:00 2001 From: Jeff Wallace Date: Fri, 20 Sep 2013 09:29:03 -0400 Subject: [PATCH 2/5] Updated default heap size to be 2GB. Config file gets updated for 32 bit build during installer creation. --- build-windows.xml | 30 +++++++++++++++++++----------- nbproject/project.properties | 2 +- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/build-windows.xml b/build-windows.xml index f048ee98b2..1341d80ff6 100644 --- a/build-windows.xml +++ b/build-windows.xml @@ -28,16 +28,7 @@ - - - - - - - - - - + @@ -83,6 +74,7 @@ + @@ -97,6 +89,7 @@ + @@ -129,7 +122,22 @@ replace="ProductVersion" Value="${app.version}" /> - + + + + + + + + + + + + + + + + diff --git a/nbproject/project.properties b/nbproject/project.properties index e671be54f8..d477d9c856 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -12,7 +12,7 @@ build.type=DEVELOPMENT update_versions=false #custom JVM options #Note: can be higher on 64 bit systems, should be in sync with build.xml -run.args.extra=-J-Xms24m -J-Xmx512m -J-XX:MaxPermSize=128M -J-Xverify:none +run.args.extra=-J-Xms24m -J-Xmx2048m -J-XX:MaxPermSize=128M -J-Xverify:none auxiliary.org-netbeans-modules-apisupport-installer.license-type=apache.v2 auxiliary.org-netbeans-modules-apisupport-installer.os-linux=false auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=false From 5472a0924addc33d974f2170ccd67a425d37b305 Mon Sep 17 00:00:00 2001 From: Jeff Wallace Date: Tue, 24 Sep 2013 10:47:22 -0400 Subject: [PATCH 3/5] Disabled ok button when there are no recent cases. --- .../org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java index 082d094948..1e9d01d4cd 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java @@ -62,6 +62,8 @@ class OpenRecentCasePanel extends javax.swing.JPanel { // If there are any images, let's select the first one if (imagesTable.getRowCount() > 0) { imagesTable.setRowSelectionInterval(0, 0); + } else { + openButton.setEnabled(false); } } From eab134636622d3883b580e9dd19e9ad06c23bd20 Mon Sep 17 00:00:00 2001 From: Jeff Wallace Date: Tue, 24 Sep 2013 10:51:43 -0400 Subject: [PATCH 4/5] Disable ok button when there are no recent cases. --- .../org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java index 1e9d01d4cd..e7d5fc2b11 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java @@ -62,6 +62,7 @@ class OpenRecentCasePanel extends javax.swing.JPanel { // If there are any images, let's select the first one if (imagesTable.getRowCount() > 0) { imagesTable.setRowSelectionInterval(0, 0); + openButton.setEnabled(true); } else { openButton.setEnabled(false); } From 088e1ed90bb1b7367492d64c796335c4d1406533 Mon Sep 17 00:00:00 2001 From: Jeff Wallace Date: Tue, 24 Sep 2013 10:55:49 -0400 Subject: [PATCH 5/5] Updated installer script to update max heap size for 64 bit, fixed installation path for 64 bit. --- build-windows.xml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/build-windows.xml b/build-windows.xml index 1341d80ff6..cb9f2faec8 100644 --- a/build-windows.xml +++ b/build-windows.xml @@ -27,8 +27,6 @@ - - @@ -75,6 +73,9 @@ + + + @@ -91,6 +92,9 @@ + + + @@ -125,15 +129,15 @@ - - + + - + @@ -155,7 +159,6 @@ -