From a7c1ff1129c813d2aa6b5f79fd1b1926a83efc39 Mon Sep 17 00:00:00 2001 From: Jean-Francois Lefebvre Date: Mon, 20 May 2002 14:26:23 +0000 Subject: [PATCH] 2002-05-20 16:20 UTC+0100 J.lefebvre (Mafact) --- harbour/ChangeLog | 7 ++ harbour/contrib/htmllib/make_b32.bat | 44 +++++++++++ harbour/contrib/htmllib/make_vc.bat | 43 ++++++++++ harbour/contrib/htmllib/makefile.vc | 114 +++++++++++++++++++++++++++ 4 files changed, 208 insertions(+) create mode 100644 harbour/contrib/htmllib/make_b32.bat create mode 100644 harbour/contrib/htmllib/make_vc.bat create mode 100644 harbour/contrib/htmllib/makefile.vc diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ef2521e10b..733e76ed81 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,13 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ +2002-05-20 16:20 UTC+0100 J.lefebvre (Mafact) + * contrib/htmllib + + make_b32.bat (not tested !!!!) + + make_vc.bat (ok) + + makefile.vc + + 2002-05-20 14:55 UTC+0300 Alexander Kresin * contrib/rdd_ads/ads1.c ! Bug fixed in adsSysName() for that case when file isn't opened yet in diff --git a/harbour/contrib/htmllib/make_b32.bat b/harbour/contrib/htmllib/make_b32.bat new file mode 100644 index 0000000000..2dffe375e7 --- /dev/null +++ b/harbour/contrib/htmllib/make_b32.bat @@ -0,0 +1,44 @@ +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "Clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\b32\html.lib ..\..\lib\*.* > nul + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + if exist ..\..\lib\b32\html.lib del ..\..\lib\b32\html.lib + if exist ..\..\lib\b32\html.bak del ..\..\lib\b32\html.bak + if exist ..\..\obj\b32\ohtm.obj del ..\..\obj\b32\ads1.obj + if exist ..\..\obj\b32\htmbrows.obj del ..\..\obj\b32\adsfunc.obj + if exist ..\..\obj\b32\oedit.obj del ..\..\obj\b32\adsmgmnt.obj + if exist ..\..\obj\b32\ofile.obj del ..\..\obj\b32\ofile.obj + if exist ..\..\obj\b32\jlist.obj del ..\..\obj\b32\jlist.obj + if exist ..\..\obj\b32\oini.obj del ..\..\obj\b32\oini.obj + if exist ..\..\obj\b32\jwindow.obj del ..\..\obj\b32\jwindow.obj + if exist ..\..\obj\b32\ocgi.obj del ..\..\obj\b32\ocgi.obj + if exist ..\..\obj\b32\oframe.obj del ..\..\obj\b32\oframe.obj + if exist ..\..\obj\b32\counter.obj del ..\..\obj\b32\counter.obj + if exist ..\..\obj\b32\errorsys.obj del ..\..\obj\b32\errorsys.obj + if exist ..\..\obj\b32\htmutil.obj del ..\..\obj\b32\htmutil.obj + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/htmllib/make_vc.bat b/harbour/contrib/htmllib/make_vc.bat new file mode 100644 index 0000000000..5709ae2cc4 --- /dev/null +++ b/harbour/contrib/htmllib/make_vc.bat @@ -0,0 +1,43 @@ +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "Clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + nmake /f makefile.vc %1 %2 %3 > make_vc.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\vc\html.lib ..\..\lib\*.* >nul + goto EXIT + +:BUILD_ERR + + notepad make_vc.log + +:CLEAN + if exist ..\..\lib\vc\html.lib del ..\..\lib\vc\html.lib + if exist ..\..\lib\vc\html.bak del ..\..\lib\vc\html.bak + if exist ..\..\obj\vc\ohtm.obj del ..\..\obj\vc\ads1.obj + if exist ..\..\obj\vc\htmbrows.obj del ..\..\obj\vc\adsfunc.obj + if exist ..\..\obj\vc\oedit.obj del ..\..\obj\vc\adsmgmnt.obj + if exist ..\..\obj\vc\ofile.obj del ..\..\obj\vc\ofile.obj + if exist ..\..\obj\vc\jlist.obj del ..\..\obj\vc\jlist.obj + if exist ..\..\obj\vc\oini.obj del ..\..\obj\vc\oini.obj + if exist ..\..\obj\vc\jwindow.obj del ..\..\obj\vc\jwindow.obj + if exist ..\..\obj\vc\ocgi.obj del ..\..\obj\vc\ocgi.obj + if exist ..\..\obj\vc\oframe.obj del ..\..\obj\vc\oframe.obj + if exist ..\..\obj\vc\counter.obj del ..\..\obj\vc\counter.obj + if exist ..\..\obj\vc\errorsys.obj del ..\..\obj\vc\errorsys.obj + if exist ..\..\obj\vc\htmutil.obj del ..\..\obj\vc\htmutil.obj + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/htmllib/makefile.vc b/harbour/contrib/htmllib/makefile.vc new file mode 100644 index 0000000000..1adfb52802 --- /dev/null +++ b/harbour/contrib/htmllib/makefile.vc @@ -0,0 +1,114 @@ +# +# $Id$ +# + +# +# Directory macros. These should never have to change. +# + +INCLUDE_DIR = ..\..\include +OBJ_DIR = ..\..\obj\vc +LIB_DIR = ..\..\lib\vc +BIN_DIR = ..\..\bin\vc + +# +# C compiler definition and C flags. These should never have to change. +# + +CC = cl +CFLAGS = -TP -W3 -nologo -I$(INCLUDE_DIR) +CLIBFLAGS = $(CFLAGS) -c +CLIBFLAGSDEBUG = $(CLIBFLAGS) -Zi +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -w0 -gc0 $(PRG_USR) $(HARBOURFLAGS) -p +LDFLAGS = $(LDFLAGS) + +# +# Macros to access our library names +# + +TOOLS_LIB = $(LIB_DIR)\html.lib +HARBOUR_EXE = $(BIN_DIR)\harbour.exe + +# +# Rules +# + +# +# TOOLS.LIB rules +# +TOOLS_LIB_OBJS = \ +$(OBJ_DIR)\ohtm.obj \ +$(OBJ_DIR)\htmbrows.obj \ +$(OBJ_DIR)\oedit.obj \ +$(OBJ_DIR)\ofile.obj \ +$(OBJ_DIR)\jlist.obj \ +$(OBJ_DIR)\oini.obj \ +$(OBJ_DIR)\jwindow.obj \ +$(OBJ_DIR)\ocgi.obj \ +$(OBJ_DIR)\oframe.obj \ +$(OBJ_DIR)\counter.obj \ +$(OBJ_DIR)\errorsys.obj \ +$(OBJ_DIR)\htmutil.obj + +# +# Our default target +# + +all: \ + $(TOOLS_LIB) \ + +# +# Library dependencies and build rules +# + +$(TOOLS_LIB) : $(TOOLS_LIB_OBJS) + lib /OUT:$(TOOLS_LIB) $(TOOLS_LIB_OBJS) + +$(OBJ_DIR)\ohtm.obj : ohtm.prg + $(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c + $(CC) $(CLIBFLAGS) -Fo$@ $*.c + +$(OBJ_DIR)\htmbrows.obj : htmbrows.prg + $(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c + $(CC) $(CLIBFLAGS) -Fo$@ $*.c + +$(OBJ_DIR)\oedit.obj : oedit.prg + $(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c + $(CC) $(CLIBFLAGS) -Fo$@ $*.c + +$(OBJ_DIR)\ofile.obj : ofile.prg + $(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c + $(CC) $(CLIBFLAGS) -Fo$@ $*.c + +$(OBJ_DIR)\jlist.obj : jlist.prg + $(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c + $(CC) $(CLIBFLAGS) -Fo$@ $*.c + +$(OBJ_DIR)\oini.obj : oini.prg + $(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c + $(CC) $(CLIBFLAGS) -Fo$@ $*.c + +$(OBJ_DIR)\jwindow.obj : jwindow.prg + $(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c + $(CC) $(CLIBFLAGS) -Fo$@ $*.c + +$(OBJ_DIR)\ocgi.obj : ocgi.prg + $(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c + $(CC) $(CLIBFLAGS) -Fo$@ $*.c + +$(OBJ_DIR)\oframe.obj : oframe.prg + $(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c + $(CC) $(CLIBFLAGS) -Fo$@ $*.c + +$(OBJ_DIR)\counter.obj : counter.prg + $(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c + $(CC) $(CLIBFLAGS) -Fo$@ $*.c + +$(OBJ_DIR)\errorsys.obj : errorsys.prg + $(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c + $(CC) $(CLIBFLAGS) -Fo$@ $*.c + +$(OBJ_DIR)\htmutil.obj : htmutil.prg + $(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c + $(CC) $(CLIBFLAGS) -Fo$@ $*.c +