From 80f748ea408b76428f7ed4fb8fcbc93104d728d6 Mon Sep 17 00:00:00 2001 From: clay_shooter Date: Thu, 24 Apr 2008 00:51:56 +0000 Subject: [PATCH] SF 1919441 LoadLibrary reference to x64 dll name had extra space in it --- build.xml | 54 ++++++++++++---------------- docs/BuildingJacobFromSource.html | 24 +++++++++++-- docs/ReleaseNotes.html | 41 +++++++++++++++++++++ docs/UsingJacob.html | 8 ++--- src/com/jacob/com/LibraryLoader.java | 6 +++- 5 files changed, 95 insertions(+), 38 deletions(-) diff --git a/build.xml b/build.xml index 31c94c4..a409066 100644 --- a/build.xml +++ b/build.xml @@ -16,10 +16,10 @@ The file for MS Visual C++ 8.0 building 32 and 64 bit (releases up to 1.11 only supported 32 builds) looks something like: - JDK=d:\\jdk1.5.0_11 - MSDEV_DIR=d:\\apps\\Microsoft Visual Studio 8\\VC - MSDEV_IDE_DIR=d:\\apps\\Microsoft Visual Studio 8\\Common7\\IDE - version=1.14-M1 + JDK=c:\\dev\\jdk1.5.0_15 + MSDEV_DIR=c:\\dev\\Microsoft Visual Studio 8\\VC + MSDEV_IDE_DIR=c:\\dev\\Microsoft Visual Studio 8\\Common7\\IDE + version=1.14.1 DO NOT check compilation_tools.properties into source control as the values are specific to YOUR environment. @@ -126,39 +126,26 @@ This module used to rely on that. Now it just checks to see if we have the right compilers. ================================================================== --> - - - - + + + + - - - - - - - - - - - - - - - - - - + - + + + + + + @@ -166,10 +153,15 @@ - + - - + + + + + + + diff --git a/docs/BuildingJacobFromSource.html b/docs/BuildingJacobFromSource.html index 5b69540..317217b 100644 --- a/docs/BuildingJacobFromSource.html +++ b/docs/BuildingJacobFromSource.html @@ -56,6 +56,7 @@ using the example build.xml as a template. 1.12VC 98 (6.0) & 2003 64bit libs1.4.21.6.53.2.232 and 64 bit 1.13VC 20051.4.21.7.03.332 and 64 bit 1.14VC 20051.5.01.7.03.332 and 64 bit +1.15VC 20051.5.01.7.03.332 and 64 bit Microsoft Visual C++ 8.0 supports 64 bit builds. so no additional tools are required. @@ -108,17 +109,36 @@ Open up the project properties and go to the "Java Build Path" properties panel.
  • Set the default build output directory to jacob-project/release/java
    • +

    Troubleshooting Build Problems

    +
      +
    • +Symptom: The jar is built but no dlls were compiled.

      +Problem: compilation_tools.properties does not have the correct location for the Microsoft tools.

      +

      • +
    • +Sympton: Can't find jni.h or can't find C++ compiler

      +Problem: compilation_tools.properties configured incorrectly. Either +paths are wrong or the separator is wrong. It requires two backslashes for a separator.

      +

      • +

    Running Samples and Tests

    Samples and JUnit test programs can be found in the source jar or in CVS. The programs can be run from a bat file or from inside the Eclipse IDE. The java library path variable must be set to include the directory the jacob.dll is in. The -simplest way to do that is to add it as a command line option. +simplest way to do that is to add it as a command line option. The following +assume that your jacob development area is located in c:\dev\jacob: +
    +	-Djava.library.path=c:/jacob/release/x86 
+	-Dcom.jacob.autogc=false 
+	-Dcom.jacob.debug=false 
+	-Xcheck:jni
+

    JUnit test programs can be individually run from inside eclipse or en-masse via the ant test target. -Last Modified 7/2007 1.13M3 +Last Modified 4/2008 1.15 \ No newline at end of file diff --git a/docs/ReleaseNotes.html b/docs/ReleaseNotes.html index f2ebdd1..f524fc9 100644 --- a/docs/ReleaseNotes.html +++ b/docs/ReleaseNotes.html @@ -1,5 +1,46 @@ + +

    JACOB 1.15

    +

    Tracked Changes

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Bugs
    1919441Type: loading 64 bit jacob.dll. Computed dll + name includes space that is not in name of actual dll
      
    Patches
      
    Feature Requests
      
    Known Issues
    + +

    JACOB 1.14

    What's New

    diff --git a/docs/UsingJacob.html b/docs/UsingJacob.html index 435470c..9958bc8 100644 --- a/docs/UsingJacob.html +++ b/docs/UsingJacob.html @@ -92,7 +92,7 @@ Visual C redistributable installer SP1

    Jacob Command Line Settings

    -This library supports several differentommand line options: +This library supports several different command line options:

    dll path location and dll name customization

    @@ -231,12 +231,12 @@ The Microsoft msdn web site Jacob must know the location of the DLL when running the unit tests in Eclipse. The simplest way to do this is to add the dll path to the unit as a VM argument. The argument should be specified based on where you installed the jacob source package. -If you have jacob unpacked in d:/jacob_1_5 and built using build.xml, +If you have jacob unpacked in c:/dev/jacob and built using build.xml, then the vm arguments would be: -
    -Djava.library.path=d:/jacob_1_5/release/x86 . +
    -Djava.library.path=c:/dev/jacob/release/x86 .

    -Last Modified 12/2007 +Last Modified 4/2008 1.15 \ No newline at end of file diff --git a/src/com/jacob/com/LibraryLoader.java b/src/com/jacob/com/LibraryLoader.java index d595a93..4fd2740 100644 --- a/src/com/jacob/com/LibraryLoader.java +++ b/src/com/jacob/com/LibraryLoader.java @@ -146,6 +146,8 @@ public final class LibraryLoader { } if (path != null) { + JacobObject.debug("Loading library " + path + + " using System.loadLibrary "); System.load(path); } else { // Path was not defined, so use the OS mechanism for loading @@ -176,6 +178,8 @@ public final class LibraryLoader { name = getPreferredDLLName(); } + JacobObject.debug("Loading library " + name + + " using System.loadLibrary "); // System.out.println("Loading " + name); System.loadLibrary(name); } @@ -195,7 +199,7 @@ public final class LibraryLoader { return "jacob" + "-" + JacobReleaseInfo.getBuildVersion() + "-" + DLL_NAME_MODIFIER_32_BIT; } else { - return "jacob" + "-" + JacobReleaseInfo.getBuildVersion() + "- " + return "jacob" + "-" + JacobReleaseInfo.getBuildVersion() + "-" + DLL_NAME_MODIFIER_64_BIT; } }