From 536c2132e2b1db78b66c91268f66eb069c62bcad Mon Sep 17 00:00:00 2001 From: clay_shooter Date: Sat, 8 Jan 2005 17:04:09 +0000 Subject: [PATCH] changing data type to ascii so diffs will work --- LICENSE.TXT | 58 ++++++++++++++++++++++++++--------------------------- README.TXT | 56 +++++++++++++++++++++++++-------------------------- makefile | 36 ++++++++++++++++----------------- 3 files changed, 75 insertions(+), 75 deletions(-) diff --git a/LICENSE.TXT b/LICENSE.TXT index 69a2eda..7491311 100644 --- a/LICENSE.TXT +++ b/LICENSE.TXT @@ -1,29 +1,29 @@ -/* - * Copyright (c) 1999-2004 Sourceforge JACOB Project. - * All rights reserved. Originator: Dan Adler (http://danadler.com). - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Redistributions in any form must be accompanied by information on - * how to obtain complete source code for the JACOB software. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ +/* + * Copyright (c) 1999-2004 Sourceforge JACOB Project. + * All rights reserved. Originator: Dan Adler (http://danadler.com). + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Redistributions in any form must be accompanied by information on + * how to obtain complete source code for the JACOB software. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ diff --git a/README.TXT b/README.TXT index c4a5c9c..dbfa0ff 100644 --- a/README.TXT +++ b/README.TXT @@ -1,28 +1,28 @@ -For documentation see: http://users.rcn.com/danadler/jacob/ - -The java code is in com\jacob\*. - -The C++ code is in .\jni. - -To build, run: - -nmake -f makefile - -That will first compile the JAVA files and build the JAR file, and -then compile the C++ code and build the DLL. - -Building the jni: - -The following are hardcoded into the makefile, so you may have to -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 -work. - -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. - -DEST_DIR is a destination directory into which to copy the final DLL. - -JDK = d:\j2sdk1.4.2_06 -DEST_DIR = d:\jacob -MSDEVDIR = d:\apps\\"Microsoft Visual Studio"\VC98 +For documentation see: http://users.rcn.com/danadler/jacob/ + +The java code is in com\jacob\*. + +The C++ code is in .\jni. + +To build, run: + +nmake -f makefile + +That will first compile the JAVA files and build the JAR file, and +then compile the C++ code and build the DLL. + +Building the jni: + +The following are hardcoded into the makefile, so you may have to +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 +work. + +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. + +DEST_DIR is a destination directory into which to copy the final DLL. + +JDK = d:\j2sdk1.4.2_06 +DEST_DIR = d:\jacob +MSDEVDIR = d:\apps\\"Microsoft Visual Studio"\VC98 diff --git a/makefile b/makefile index cc7538d..62f8fa5 100644 --- a/makefile +++ b/makefile @@ -1,18 +1,18 @@ -JAVAC = d:\j2sdk1.4.2_06\bin\javac -O -JAR = d:\j2sdk1.4.2_06\bin\jar -cvf jacob.jar -COM_DIR = com\jacob\com -ACX_DIR = com\jacob\activeX - -all: java jni - rm -f jacobSrc_18.zip jacobBin_18.zip - jar -cvf jacobSrc_18.zip . - jar -cvf jacobBin_18.zip jacob.dll jacob.jar LICENSE.TXT README.TXT samples - -java: jacob.jar - $(JAVAC) $(COM_DIR)\*.java $(ACX_DIR)\*.java - $(JAR) $(COM_DIR)\*.class $(ACX_DIR)\*.class - -jni: jni\jacob.dll - cd jni - nmake -f makefile all - cd ..\ +JAVAC = d:\j2sdk1.4.2_06\bin\javac -O +JAR = d:\j2sdk1.4.2_06\bin\jar -cvf jacob.jar +COM_DIR = com\jacob\com +ACX_DIR = com\jacob\activeX + +all: java jni + rm -f jacobSrc_18.zip jacobBin_18.zip + jar -cvf jacobSrc_18.zip . + jar -cvf jacobBin_18.zip jacob.dll jacob.jar LICENSE.TXT README.TXT samples + +java: jacob.jar + $(JAVAC) $(COM_DIR)\*.java $(ACX_DIR)\*.java + $(JAR) $(COM_DIR)\*.class $(ACX_DIR)\*.class + +jni: jni\jacob.dll + cd jni + nmake -f makefile all + cd ..\