mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add libiconv-2 for new PostgreSQL dependency

Browse Source
This commit is contained in:
Karl Mortensen 2016-06-28 10:55:39 -04:00
parent c4888f511e
commit 846fd421c5
5 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Core/src/org/sleuthkit/autopsy/core/Installer.java
View File

@ -66,7 +66,7 @@ public class Installer extends ModuleInstall {
//We should update this if we officially switch to a new version of CRT/compiler
System.loadLibrary("msvcr100"); //NON-NLS
System.loadLibrary("msvcp100"); //NON-NLS
logger.log(Level.INFO, "MSVCR100 and MSVCP100 libraries loaded"); //NON-NLS
} catch (UnsatisfiedLinkError e) {
logger.log(Level.SEVERE, "Error loading MSVCR100 and MSVCP100 libraries, ", e); //NON-NLS
@ -85,14 +85,14 @@ public class Installer extends ModuleInstall {
} catch (UnsatisfiedLinkError e) {
logger.log(Level.SEVERE, "Error loading EWF library, ", e); //NON-NLS
}
try {
System.loadLibrary("libvmdk"); //NON-NLS
logger.log(Level.INFO, "VMDK library loaded"); //NON-NLS
} catch (UnsatisfiedLinkError e) {
logger.log(Level.SEVERE, "Error loading VMDK library, ", e); //NON-NLS
}
try {
System.loadLibrary("libvhdi"); //NON-NLS
logger.log(Level.INFO, "VHDI library loaded"); //NON-NLS
@ -107,7 +107,7 @@ public class Installer extends ModuleInstall {
} catch (UnsatisfiedLinkError e) {
logger.log(Level.SEVERE, "Error loading MSVCR120 library, ", e); //NON-NLS
}
try {
System.loadLibrary("libeay32"); //NON-NLS
logger.log(Level.INFO, "LIBEAY32 library loaded"); //NON-NLS
@ -122,18 +122,20 @@ public class Installer extends ModuleInstall {
logger.log(Level.SEVERE, "Error loading SSLEAY32 library, ", e); //NON-NLS
}
// This library name is different in 32-bit versus 64-bit
String libintlName = "libintl-8"; //NON-NLS
if (PlatformUtil.is64BitJVM() == false) {
libintlName = "intl"; //NON-NLS
}
try {
System.loadLibrary(libintlName); //NON-NLS
logger.log(Level.INFO, libintlName + " library loaded"); //NON-NLS
System.loadLibrary("libiconv-2"); //NON-NLS
logger.log(Level.INFO, "libiconv-2 library loaded"); //NON-NLS
} catch (UnsatisfiedLinkError e) {
logger.log(Level.SEVERE, "Error loading " + libintlName + " library, ", e); //NON-NLS
logger.log(Level.SEVERE, "Error loading libiconv-2 library, ", e); //NON-NLS
}
try {
System.loadLibrary("libintl-8"); //NON-NLS
logger.log(Level.INFO, "libintl-8 library loaded"); //NON-NLS
} catch (UnsatisfiedLinkError e) {
logger.log(Level.SEVERE, "Error loading libintl-8 library, ", e); //NON-NLS
}
try {
System.loadLibrary("libpq"); //NON-NLS
logger.log(Level.INFO, "LIBPQ library loaded"); //NON-NLS
@ -156,7 +158,7 @@ public class Installer extends ModuleInstall {
/**
* Check if JavaFx initialized
*
* @return false if java fx not initialized (classes coult not load), true
* @return false if java fx not initialized (classes could not load), true
* if initialized
*/
public static boolean isJavaFxInited() {

2
branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
View File

@ -1,5 +1,5 @@
#Updated by build script
#Mon, 22 Feb 2016 16:37:47 -0500
#Tue, 28 Jun 2016 10:55:17 -0400
LBL_splash_window_title=Starting Autopsy
SPLASH_HEIGHT=314
SPLASH_WIDTH=538

2
branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
View File

@ -1,4 +1,4 @@
#Updated by build script
#Mon, 22 Feb 2016 16:37:47 -0500
#Tue, 28 Jun 2016 10:55:17 -0400
CTL_MainWindow_Title=Autopsy 4.1.0
CTL_MainWindow_Title_No_Project=Autopsy 4.1.0

1
build-windows.xml
View File

@ -53,6 +53,7 @@
<include name="libeay32.dll"/>
<include name="ssleay32.dll"/>
<include name="libintl-8.dll"/>
<include name="libiconv-2.dll"/>
<include name="libpq.dll"/>
<include name="msvcr120.dll"/>
</fileset>

1
build.xml
View File

@ -115,6 +115,7 @@
<include name="libvhdi.dll"/>
<include name="zlib.dll" />
<include name="libintl-8.dll"/>
<include name="libiconv-2.dll"/>
<include name="ssleay32.dll"/>
<include name="libeay32.dll"/>
<include name="libpq.dll"/>