Changeset 35 for branches

Timestamp:

Nov 17, 2007, 7:32:21 PM (18 years ago)

Author:

lwriemen

Message:

• Use of internal ant.cmd now requires explicit reference to the misc directory. This allows use of external ant, like the latest build from ant.apache.org.
• Removed unused file, swt_file.c, which was a copy of swt.c.
• Added env.cmd for setting up environment variables.
• Added tool specific make files, make_openwatcom.mak and make_vac4.mak, to be called from build.cmd.
• Modified build.cmd to reference tool specific make files.
• Modified make_os2.mak to just set up the DLL name.
• Updated readme.txt for building with an external ant.

Location:

branches/watcom_ant17_java141

Files:

• ant.cmd (deleted)
• env.cmd (added)
• readme.txt (modified) (1 diff)
• src/plugins/org.eclipse.swt/Eclipse SWT PI/pm/library/build.cmd (modified) (2 diffs)
• src/plugins/org.eclipse.swt/Eclipse SWT PI/pm/library/make_openwatcom.mak (added)
• src/plugins/org.eclipse.swt/Eclipse SWT PI/pm/library/make_os2.mak (modified) (1 diff)
• src/plugins/org.eclipse.swt/Eclipse SWT PI/pm/library/make_vac4.mak (added)
• src/plugins/org.eclipse.swt/Eclipse SWT PI/pm/library/swt_file.c (deleted)

branches/watcom_ant17_java141/readme.txt

@@ -8 +8 @@
 
 For more info see the index.html in the /doc directory.
+
+Special Notes on Using Golden Code Java 1.4.1
+==========================================
+The Golden Code jni_md.h doesn't set the JNIEXPORT and JNIIMPORT definitions as was done
+in the IBM Java 1.3.1 in jniproto_md.h. The IBM 1.3.1 definitions must be used for linking
+to a DLL. Specifically, it requires definition to a __declspec() call.
+
+Special Notes on Using Innotek Java 1.4.2
+=======================================
+The Innotek Java distribution doesn't include the jni.h (et.al.) include files. It has been
+reported that the IBM Java 1.3.1 include directory can be used.
+
+Special Notes on Using an Newer Ant
+==================================
+Delete the ant.cmd file in this directory, so it isn't called instead of the Ant
+distribution's file. Modify the env.cmd file to match your environment.

branches/watcom_ant17_java141/src/plugins/org.eclipse.swt/Eclipse SWT PI/pm/library/build.cmd

@@ -6 +6 @@
 rem http://www.eclipse.org/legal/cpl-v10.html
 
+if NOT "%1" == "" set MAKE_TARGET=%1
+
+if NOT "%BUILD_ENV%"=="OPENWATCOM" goto VAC4
+
+set MAKE=wmake
+set MAKE_FILE=openwatcom
+set INCLUDE=D:\WATCOM\h;D:\WATCOM\h\os2
+if "%MAKE_TARGET%" == "clean" set MAKE_TARGET=-c %MAKE_TARGET%
+
+goto RUNMAKE
+
+:VAC4
+
 if "%VACPPMAIN%"=="" goto NOVAC
 
 call %VACPPMAIN%\bin\setenv.cmd
-set INCLUDE=..\..\..\Eclipse SWT\common\library;%INCLUDE%
-nmake -f make_os2.mak %1 %2 %3 %4 %5 %6 %7 %8 %9
-goto END
+set MAKE=nmake
+set MAKE_FILE=vac4
+goto RUNMAKE
 
 :NOVAC
@@ -19 +32 @@
 echo Possibly, Visual Age C/C++ 4.0 is not installed.
 echo.
+goto END
+
+:RUNMAKE
+
+set COMMON_DIR=..\..\..\Eclipse SWT\common\library
+set JNI_DIR=%JAVA_HOME%\include;%JAVA_HOME%\include\os2
+set INCLUDE=%COMMON_DIR%;%JNI_DIR%;%INCLUDE%
+%MAKE% -f make_%MAKE_FILE%.mak %MAKE_TARGET% %2 %3 %4 %5 %6 %7 %8 %9
 
 :END

branches/watcom_ant17_java141/src/plugins/org.eclipse.swt/Eclipse SWT PI/pm/library/make_os2.mak

@@ -27 +27 @@
 SWT_LOCATION = ..\..\..\..\org.eclipse.swt.pm\os\os2\x86
 
-all:
-    @set SWT_LIB=$(SWT_LIB)
-    vacbld make_os2.icc
-    copy $(SWT_LIB) $(SWT_LOCATION)
-
-clean:
-    -del *.obj *.res *.dll *.lib *.ics $(SWT_LOCATION)\*.dll