changing data type to ascii so diffs will work

This commit is contained in:
clay_shooter
2005-01-08 17:04:09 +00:00
parent 43dce6d42f
commit 536c2132e2
3 changed files with 75 additions and 75 deletions

View File

@@ -1,29 +1,29 @@
/* /*
* Copyright (c) 1999-2004 Sourceforge JACOB Project. * Copyright (c) 1999-2004 Sourceforge JACOB Project.
* All rights reserved. Originator: Dan Adler (http://danadler.com). * All rights reserved. Originator: Dan Adler (http://danadler.com).
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
* 1. Redistributions of source code must retain the above copyright * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in * notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the * the documentation and/or other materials provided with the
* distribution. * distribution.
* 3. Redistributions in any form must be accompanied by information on * 3. Redistributions in any form must be accompanied by information on
* how to obtain complete source code for the JACOB software. * how to obtain complete source code for the JACOB software.
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE. * OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */

View File

@@ -1,28 +1,28 @@
For documentation see: http://users.rcn.com/danadler/jacob/ For documentation see: http://users.rcn.com/danadler/jacob/
The java code is in com\jacob\*. The java code is in com\jacob\*.
The C++ code is in .\jni. The C++ code is in .\jni.
To build, run: To build, run:
nmake -f makefile nmake -f makefile
That will first compile the JAVA files and build the JAR file, and That will first compile the JAVA files and build the JAR file, and
then compile the C++ code and build the DLL. then compile the C++ code and build the DLL.
Building the jni: Building the jni:
The following are hardcoded into the makefile, so you may have to The following are hardcoded into the makefile, so you may have to
change it. I developed this with the C++ compiler and ATL version change it. I developed this with the C++ compiler and ATL version
that ship with VC++ 6.0, so I'm not sure if different versions will that ship with VC++ 6.0, so I'm not sure if different versions will
work. work.
I have compiled this against JDK 1.1.6 and 1.2.2 as well as Microsoft I have compiled this against JDK 1.1.6 and 1.2.2 as well as Microsoft
SDK for Java 3.2 as the JDK setting. SDK for Java 3.2 as the JDK setting.
DEST_DIR is a destination directory into which to copy the final DLL. DEST_DIR is a destination directory into which to copy the final DLL.
JDK = d:\j2sdk1.4.2_06 JDK = d:\j2sdk1.4.2_06
DEST_DIR = d:\jacob DEST_DIR = d:\jacob
MSDEVDIR = d:\apps\\"Microsoft Visual Studio"\VC98 MSDEVDIR = d:\apps\\"Microsoft Visual Studio"\VC98

View File

@@ -1,18 +1,18 @@
JAVAC = d:\j2sdk1.4.2_06\bin\javac -O JAVAC = d:\j2sdk1.4.2_06\bin\javac -O
JAR = d:\j2sdk1.4.2_06\bin\jar -cvf jacob.jar JAR = d:\j2sdk1.4.2_06\bin\jar -cvf jacob.jar
COM_DIR = com\jacob\com COM_DIR = com\jacob\com
ACX_DIR = com\jacob\activeX ACX_DIR = com\jacob\activeX
all: java jni all: java jni
rm -f jacobSrc_18.zip jacobBin_18.zip rm -f jacobSrc_18.zip jacobBin_18.zip
jar -cvf jacobSrc_18.zip . jar -cvf jacobSrc_18.zip .
jar -cvf jacobBin_18.zip jacob.dll jacob.jar LICENSE.TXT README.TXT samples jar -cvf jacobBin_18.zip jacob.dll jacob.jar LICENSE.TXT README.TXT samples
java: jacob.jar java: jacob.jar
$(JAVAC) $(COM_DIR)\*.java $(ACX_DIR)\*.java $(JAVAC) $(COM_DIR)\*.java $(ACX_DIR)\*.java
$(JAR) $(COM_DIR)\*.class $(ACX_DIR)\*.class $(JAR) $(COM_DIR)\*.class $(ACX_DIR)\*.class
jni: jni\jacob.dll jni: jni\jacob.dll
cd jni cd jni
nmake -f makefile all nmake -f makefile all
cd ..\ cd ..\