From b9faa70ee884e49648853be931027ae0251453d3 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 4 Feb 2009 22:02:35 +0000 Subject: [PATCH] 2009-02-04 23:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * bin/hb-func.sh * bin/hb-mkslib.sh * bin/hbmk.bat * bin/hbmk_b32.bat * bin/hbmk_vc.bat * bin/pack_src.sh * bin/postinst.bat * contrib/examples/uhttpd/modules/bldhrb.bat * contrib/gtwvg/Makefile * contrib/hbct/ctflist.txt * contrib/hbgf/hbgfwin/Makefile * contrib/hbgf/Makefile * contrib/hbodbc/Makefile * contrib/hbole/Makefile * contrib/hbtpathy/Makefile * contrib/hbwhat/Makefile * contrib/hbwin/Makefile * contrib/make_gcc_all.sh * contrib/mtpl_b32.mak * contrib/mtpl_gcc.mak * contrib/mtpl_gcc.sh * contrib/mtpl_vc.mak * doc/dirstruc.txt * doc/es/dirstruc.txt * doc/funclist.txt * doc/gmake.txt * harbour-wce-spec * harbour-win-spec * make_b32.mak * make_gcc.mak * make_gcc.sh * make_gnu.bat * make_gnu.sh * make_gnu_xmingw.sh * make_gnu_xmingwce.sh * make_vc.mak * Makefile * mpkg_tgz.sh * source/vm/Makefile * source/vm/vmmt/Makefile - config/w32 + config/win * HB_ARCHITECTURE w32 -> win transition. Pass 1. --- harbour/ChangeLog | 45 + harbour/Makefile | 2 +- harbour/bin/hb-func.sh | 10 +- harbour/bin/hb-mkslib.sh | 4 +- harbour/bin/hbmk.bat | 2 +- harbour/bin/hbmk_b32.bat | 6 +- harbour/bin/hbmk_vc.bat | 6 +- harbour/bin/pack_src.sh | 2 +- harbour/bin/postinst.bat | 2 +- harbour/config/{w32 => win}/bcc32.cf | 0 harbour/config/{w32 => win}/dir.cf | 0 harbour/config/{w32 => win}/dm.cf | 0 harbour/config/{w32 => win}/gcc.cf | 0 harbour/config/{w32 => win}/global.cf | 0 harbour/config/{w32 => win}/icc.cf | 0 harbour/config/{w32 => win}/install.cf | 0 harbour/config/{w32 => win}/mingw.cf | 0 harbour/config/{w32 => win}/mingwce.cf | 0 harbour/config/{w32 => win}/msvc.cf | 0 harbour/config/{w32 => win}/msvcce.cf | 0 harbour/config/{w32 => win}/owatcom.cf | 0 harbour/config/{w32 => win}/pocc.cf | 0 harbour/config/{w32 => win}/pocc64.cf | 0 harbour/config/{w32 => win}/poccce.cf | 0 harbour/config/{w32 => win}/rsxnt.cf | 0 harbour/config/{w32 => win}/xcc.cf | 0 .../examples/uhttpd/modules/bldhrb.bat | 2 +- harbour/contrib/gtwvg/Makefile | 2 +- harbour/contrib/hbct/ctflist.txt | 934 +++++++++--------- harbour/contrib/hbgf/Makefile | 2 +- harbour/contrib/hbgf/hbgfwin/Makefile | 2 +- harbour/contrib/hbodbc/Makefile | 2 +- harbour/contrib/hbole/Makefile | 2 +- harbour/contrib/hbtpathy/Makefile | 2 +- harbour/contrib/hbwhat/Makefile | 4 +- harbour/contrib/hbwin/Makefile | 2 +- harbour/contrib/make_gcc_all.sh | 10 +- harbour/contrib/mtpl_b32.mak | 2 +- harbour/contrib/mtpl_gcc.mak | 2 +- harbour/contrib/mtpl_gcc.sh | 4 +- harbour/contrib/mtpl_vc.mak | 2 +- harbour/doc/dirstruc.txt | 2 +- harbour/doc/es/dirstruc.txt | 68 +- harbour/doc/funclist.txt | 12 +- harbour/doc/gmake.txt | 13 +- harbour/harbour-wce-spec | 8 +- harbour/harbour-win-spec | 720 +++++++------- harbour/make_b32.mak | 2 +- harbour/make_gcc.mak | 14 +- harbour/make_gcc.sh | 14 +- harbour/make_gnu.bat | 30 +- harbour/make_gnu.sh | 12 +- harbour/make_gnu_xmingw.sh | 8 +- harbour/make_gnu_xmingwce.sh | 6 +- harbour/make_vc.mak | 2 +- harbour/mpkg_tgz.sh | 12 +- harbour/source/vm/Makefile | 2 +- harbour/source/vm/vmmt/Makefile | 2 +- 58 files changed, 1009 insertions(+), 971 deletions(-) rename harbour/config/{w32 => win}/bcc32.cf (100%) rename harbour/config/{w32 => win}/dir.cf (100%) rename harbour/config/{w32 => win}/dm.cf (100%) rename harbour/config/{w32 => win}/gcc.cf (100%) rename harbour/config/{w32 => win}/global.cf (100%) rename harbour/config/{w32 => win}/icc.cf (100%) rename harbour/config/{w32 => win}/install.cf (100%) rename harbour/config/{w32 => win}/mingw.cf (100%) rename harbour/config/{w32 => win}/mingwce.cf (100%) rename harbour/config/{w32 => win}/msvc.cf (100%) rename harbour/config/{w32 => win}/msvcce.cf (100%) rename harbour/config/{w32 => win}/owatcom.cf (100%) rename harbour/config/{w32 => win}/pocc.cf (100%) rename harbour/config/{w32 => win}/pocc64.cf (100%) rename harbour/config/{w32 => win}/poccce.cf (100%) rename harbour/config/{w32 => win}/rsxnt.cf (100%) rename harbour/config/{w32 => win}/xcc.cf (100%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b47fef9de4..70ceaa81b6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,51 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-04 23:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * bin/hb-func.sh + * bin/hb-mkslib.sh + * bin/hbmk.bat + * bin/hbmk_b32.bat + * bin/hbmk_vc.bat + * bin/pack_src.sh + * bin/postinst.bat + * contrib/examples/uhttpd/modules/bldhrb.bat + * contrib/gtwvg/Makefile + * contrib/hbct/ctflist.txt + * contrib/hbgf/hbgfwin/Makefile + * contrib/hbgf/Makefile + * contrib/hbodbc/Makefile + * contrib/hbole/Makefile + * contrib/hbtpathy/Makefile + * contrib/hbwhat/Makefile + * contrib/hbwin/Makefile + * contrib/make_gcc_all.sh + * contrib/mtpl_b32.mak + * contrib/mtpl_gcc.mak + * contrib/mtpl_gcc.sh + * contrib/mtpl_vc.mak + * doc/dirstruc.txt + * doc/es/dirstruc.txt + * doc/funclist.txt + * doc/gmake.txt + * harbour-wce-spec + * harbour-win-spec + * make_b32.mak + * make_gcc.mak + * make_gcc.sh + * make_gnu.bat + * make_gnu.sh + * make_gnu_xmingw.sh + * make_gnu_xmingwce.sh + * make_vc.mak + * Makefile + * mpkg_tgz.sh + * source/vm/Makefile + * source/vm/vmmt/Makefile + - config/w32 + + config/win + * HB_ARCHITECTURE w32 -> win transition. Pass 1. + 2009-02-04 22:11 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * bin/hbmk.bat * make_gcc.sh diff --git a/harbour/Makefile b/harbour/Makefile index fb190eac9c..820cb5e1bf 100644 --- a/harbour/Makefile +++ b/harbour/Makefile @@ -37,7 +37,7 @@ else ifeq ($(HB_ARCHITECTURE),dos) HB_POSTINST = $(subst /,\,$(TOP)$(ROOT)bin/postinst.bat) $(HB_POSTINSTPARAM) else -ifeq ($(HB_ARCHITECTURE),w32) +ifeq ($(HB_ARCHITECTURE),win) HB_POSTINST = $(subst /,\,$(TOP)$(ROOT)bin/postinst.bat) $(HB_POSTINSTPARAM) endif endif diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh index ea66b82582..d295ca6dd8 100755 --- a/harbour/bin/hb-func.sh +++ b/harbour/bin/hb-func.sh @@ -120,7 +120,7 @@ mk_hbtools() hb_static="yes" hb_static_default=" (default)" hb_exesuf=".exe" - elif [ "${HB_ARCHITECTURE}" = "w32" ]; then + elif [ "${HB_ARCHITECTURE}" = "win" ]; then hb_tool="$1/${hb_pref}-build" hb_path_separator=":" if [ "${HB_MK_STATIC}" = "yes" ]; then @@ -383,7 +383,7 @@ SYSTEM_LIBS="${HB_SYS_LIBS}" # use pthread system library for MT programs if [ "\${HB_MT}" = "MT" ]; then case "\${HB_ARCHITECTURE}" in - dos|w32|os2) + dos|win|os2) ;; *) SYSTEM_LIBS="-lpthread \${SYSTEM_LIBS}" @@ -464,7 +464,7 @@ else pref="lib" ext=".dylib" LN_OPT="\${LN_OPT} -bind_at_load -multiply_defined suppress" - elif [ "\${HB_ARCHITECTURE}" = "w32" ]; then + elif [ "\${HB_ARCHITECTURE}" = "win" ]; then pref="" ext=".dll" HB_LNK_ATTR="__attribute__ ((dllimport))" @@ -725,7 +725,7 @@ mk_hblibso() full_lib_name="lib${name}.${hb_ver}${lib_ext}" full_lib_name_mt="lib${name}mt.${hb_ver}${lib_ext}" linker_options="-L/sw/lib -L/opt/local/lib $linker_options" - elif [ "${HB_ARCHITECTURE}" = "w32" ]; then + elif [ "${HB_ARCHITECTURE}" = "win" ]; then lib_ext=".dll" full_lib_name="${name}${lib_ext}" full_lib_name_mt="${name}mt${lib_ext}" @@ -753,7 +753,7 @@ mk_hblibso() do if [ -f $l ] then - if [ "${HB_ARCHITECTURE}" = "w32" ]; then + if [ "${HB_ARCHITECTURE}" = "win" ]; then if [ "${HB_XBUILD}" = "" ]; then (cd "$dir" mv "${HB_LIB_INSTALL}/$l" "${HB_BIN_INSTALL}") diff --git a/harbour/bin/hb-mkslib.sh b/harbour/bin/hb-mkslib.sh index e78d02bfc3..c9a8f743f1 100755 --- a/harbour/bin/hb-mkslib.sh +++ b/harbour/bin/hb-mkslib.sh @@ -25,7 +25,7 @@ fi linker_options="" case "$hb_arch" in - *windows*|*mingw32*|msys*) hb_arch="w32" ;; + *windows*|*mingw32*|msys*) hb_arch="win" ;; *os/2*) hb_arch="os2" ;; *dos) hb_arch="dos" ;; *bsd) hb_arch="bsd" ;; @@ -33,7 +33,7 @@ esac case "$hb_arch" in darwin) SLIB_EXT=".dylib" ;; - w32) SLIB_EXT=".dll" ;; + win) SLIB_EXT=".dll" ;; os2) SLIB_EXT=".dll" ;; hpux) SLIB_EXT=".sl" ;; *) SLIB_EXT=".so" ;; diff --git a/harbour/bin/hbmk.bat b/harbour/bin/hbmk.bat index 017efeb899..ebed967989 100644 --- a/harbour/bin/hbmk.bat +++ b/harbour/bin/hbmk.bat @@ -206,7 +206,7 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt :A_WIN rem ; Compatibility. Please use 'win'. - if "%HB_ARCHITECTURE%" == "win" set HB_ARCHITECTURE=w32 + if "%HB_ARCHITECTURE%" == "w32" set HB_ARCHITECTURE=win if not "%HB_ARCHITECTURE%" == "win" goto END diff --git a/harbour/bin/hbmk_b32.bat b/harbour/bin/hbmk_b32.bat index d71c220981..3e317637f7 100644 --- a/harbour/bin/hbmk_b32.bat +++ b/harbour/bin/hbmk_b32.bat @@ -4,14 +4,14 @@ rem $Id$ rem rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs +rem This is a generic template file, if it doesn't fit your own needs rem please DON'T MODIFY IT. rem -rem Instead, make a local copy and modify that one, or make a call to +rem Instead, make a local copy and modify that one, or make a call to rem this batch file from your customized one. [vszakats] rem --------------------------------------------------------------- -set HB_ARCHITECTURE=w32 +set HB_ARCHITECTURE=win set HB_COMPILER=bcc32 call hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/bin/hbmk_vc.bat b/harbour/bin/hbmk_vc.bat index 8197e1eb1b..f8873aa275 100644 --- a/harbour/bin/hbmk_vc.bat +++ b/harbour/bin/hbmk_vc.bat @@ -4,14 +4,14 @@ rem $Id$ rem rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs +rem This is a generic template file, if it doesn't fit your own needs rem please DON'T MODIFY IT. rem -rem Instead, make a local copy and modify that one, or make a call to +rem Instead, make a local copy and modify that one, or make a call to rem this batch file from your customized one. [vszakats] rem --------------------------------------------------------------- -set HB_ARCHITECTURE=w32 +set HB_ARCHITECTURE=win set HB_COMPILER=msvc call hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/bin/pack_src.sh b/harbour/bin/pack_src.sh index 075e37bb41..2b635b9937 100755 --- a/harbour/bin/pack_src.sh +++ b/harbour/bin/pack_src.sh @@ -69,7 +69,7 @@ hb_collect_all_svn() hb_collect_all_tree() { - exclude="/obj/|/lib/|/bin/.*/|\.tar|\.zip|\.exe|\.log|/linux/|/w32|/config/" + exclude="/obj/|/lib/|/bin/.*/|\.tar|\.zip|\.exe|\.log|/linux/|/win|/config/" for f in `find -type f | grep -vE ${exclude}` do echo ${f:2} diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat index b099fbed54..d2b8b958d3 100644 --- a/harbour/bin/postinst.bat +++ b/harbour/bin/postinst.bat @@ -19,7 +19,7 @@ rem DOS post install part goto end -:inst_w32 +:inst_win rem Windows post install part goto end diff --git a/harbour/config/w32/bcc32.cf b/harbour/config/win/bcc32.cf similarity index 100% rename from harbour/config/w32/bcc32.cf rename to harbour/config/win/bcc32.cf diff --git a/harbour/config/w32/dir.cf b/harbour/config/win/dir.cf similarity index 100% rename from harbour/config/w32/dir.cf rename to harbour/config/win/dir.cf diff --git a/harbour/config/w32/dm.cf b/harbour/config/win/dm.cf similarity index 100% rename from harbour/config/w32/dm.cf rename to harbour/config/win/dm.cf diff --git a/harbour/config/w32/gcc.cf b/harbour/config/win/gcc.cf similarity index 100% rename from harbour/config/w32/gcc.cf rename to harbour/config/win/gcc.cf diff --git a/harbour/config/w32/global.cf b/harbour/config/win/global.cf similarity index 100% rename from harbour/config/w32/global.cf rename to harbour/config/win/global.cf diff --git a/harbour/config/w32/icc.cf b/harbour/config/win/icc.cf similarity index 100% rename from harbour/config/w32/icc.cf rename to harbour/config/win/icc.cf diff --git a/harbour/config/w32/install.cf b/harbour/config/win/install.cf similarity index 100% rename from harbour/config/w32/install.cf rename to harbour/config/win/install.cf diff --git a/harbour/config/w32/mingw.cf b/harbour/config/win/mingw.cf similarity index 100% rename from harbour/config/w32/mingw.cf rename to harbour/config/win/mingw.cf diff --git a/harbour/config/w32/mingwce.cf b/harbour/config/win/mingwce.cf similarity index 100% rename from harbour/config/w32/mingwce.cf rename to harbour/config/win/mingwce.cf diff --git a/harbour/config/w32/msvc.cf b/harbour/config/win/msvc.cf similarity index 100% rename from harbour/config/w32/msvc.cf rename to harbour/config/win/msvc.cf diff --git a/harbour/config/w32/msvcce.cf b/harbour/config/win/msvcce.cf similarity index 100% rename from harbour/config/w32/msvcce.cf rename to harbour/config/win/msvcce.cf diff --git a/harbour/config/w32/owatcom.cf b/harbour/config/win/owatcom.cf similarity index 100% rename from harbour/config/w32/owatcom.cf rename to harbour/config/win/owatcom.cf diff --git a/harbour/config/w32/pocc.cf b/harbour/config/win/pocc.cf similarity index 100% rename from harbour/config/w32/pocc.cf rename to harbour/config/win/pocc.cf diff --git a/harbour/config/w32/pocc64.cf b/harbour/config/win/pocc64.cf similarity index 100% rename from harbour/config/w32/pocc64.cf rename to harbour/config/win/pocc64.cf diff --git a/harbour/config/w32/poccce.cf b/harbour/config/win/poccce.cf similarity index 100% rename from harbour/config/w32/poccce.cf rename to harbour/config/win/poccce.cf diff --git a/harbour/config/w32/rsxnt.cf b/harbour/config/win/rsxnt.cf similarity index 100% rename from harbour/config/w32/rsxnt.cf rename to harbour/config/win/rsxnt.cf diff --git a/harbour/config/w32/xcc.cf b/harbour/config/win/xcc.cf similarity index 100% rename from harbour/config/w32/xcc.cf rename to harbour/config/win/xcc.cf diff --git a/harbour/contrib/examples/uhttpd/modules/bldhrb.bat b/harbour/contrib/examples/uhttpd/modules/bldhrb.bat index 874d0696ee..c380923722 100644 --- a/harbour/contrib/examples/uhttpd/modules/bldhrb.bat +++ b/harbour/contrib/examples/uhttpd/modules/bldhrb.bat @@ -13,7 +13,7 @@ set OLD_HB_COMPILER=%HB_COMPILER% set OLD_HB_USER_LIBS=%HB_USER_LIBS% set HB_INSTALL=..\..\..\.. -if %HB_ARCHITECTURE%.==. set HB_ARCHITECTURE=w32 +if %HB_ARCHITECTURE%.==. set HB_ARCHITECTURE=win if %HB_COMPILER%.==. set HB_COMPILER=bcc32 SET HB_BIN_INSTALL=%HB_INSTALL%\bin set HB_INC_INSTALL=include;%HB_INSTALL%\include diff --git a/harbour/contrib/gtwvg/Makefile b/harbour/contrib/gtwvg/Makefile index 2c5af0debe..fd03a72cf0 100644 --- a/harbour/contrib/gtwvg/Makefile +++ b/harbour/contrib/gtwvg/Makefile @@ -6,7 +6,7 @@ ROOT = ../../ LIBNAME=gtwvg -ifeq ($(HB_ARCHITECTURE),w32) +ifeq ($(HB_ARCHITECTURE),win) C_SOURCES=\ gtwvg.c \ diff --git a/harbour/contrib/hbct/ctflist.txt b/harbour/contrib/hbct/ctflist.txt index 83925e0cc0..bc66ae8c8a 100644 --- a/harbour/contrib/hbct/ctflist.txt +++ b/harbour/contrib/hbct/ctflist.txt @@ -12,17 +12,17 @@ ; - dos[-bcc16] ; dos[-djgpp] ; dos[-watcom] -; w32[-bcc32][+T] -; w32[-gcc][+T] -; w32[-icc][+T] -; w32[-mingw32][+T] -; w32[-msvc][+T] +; win[-bcc32][+T] +; win[-gcc][+T] +; win[-icc][+T] +; win[-mingw][+T] +; win[-msvc][+T] ; os2[-gcc][+T] ; os2[-icc][+T] ; lin[-gcc][+T] ; mac[-mpw][+T] ; -; Examples: w32-gcc+T, w32, w32-icc +; Examples: win-gcc+T, win, win-icc ; (+T means multithreading ready) ; ; Use ';' for comments @@ -30,38 +30,38 @@ ; Please review the following function status ; ; -; 0. general functions +; 0. general functions ; ======================= ; CTINIT ;R; !NEW! CTEXIT ;R; !NEW! -CSETARGERR ;R; !NEW! +CSETARGERR ;R; !NEW! ; ; -; 1.1 windowing functions +; 1.1 windowing functions ; ======================= ; -WACLOSE ;N; -WBOARD ;N; -WBOX ;N; -WCENTER ;N; -WCLOSE ;N; -WCOL ;N; -WFCOL ;N; -WFLASTCOL ;N; -WFORMAT ;N; -WFROW ;N; -WLASTCOL ;N; -WLASTROW ;N; -WNUM ;N; -WMODE ;N; -WMOVE ;N; -WOPEN ;N; -WROW ;N; -WSELECT ;N; -WSETMOVE ;N; -WSETSHADOW ;N; -WSTEP ;N; +WACLOSE ;N; +WBOARD ;N; +WBOX ;N; +WCENTER ;N; +WCLOSE ;N; +WCOL ;N; +WFCOL ;N; +WFLASTCOL ;N; +WFORMAT ;N; +WFROW ;N; +WLASTCOL ;N; +WLASTROW ;N; +WNUM ;N; +WMODE ;N; +WMOVE ;N; +WOPEN ;N; +WROW ;N; +WSELECT ;N; +WSETMOVE ;N; +WSETSHADOW ;N; +WSTEP ;N; ; ; ;1.2 extended driver @@ -117,396 +117,396 @@ TRAPINPUT ;N; TRAPSHIFT ;N; VGA28 ;N; VGA50 ;N; -; +; ; ;1.3 serial communication ;======================== -; -COM_BREAK ;N; -COM_CLOSE ;N; -COM_COUNT ;N; -COM_CRC ;N; -COM_CTS ;N; -COM_DCD ;N; -COM_DOSCON ;N; -COM_DSR ;N; -COM_DTR ;N; -COM_ERRCHR ;N; -COM_EVENT ;N; -COM_FLUSH ;N; -COM_GETIO ;N; -COM_GETIRQ ;N; -COM_HARD ;N; -COM_INIT ;N; -COM_KEY ;N; -COM_LSR ;N; -COM_MCR ;N; -COM_MSR ;N; -COM_NUM ;N; -COM_OPEN ;N; -COM_READ ;N; -COM_REMOTE ;N; -COM_RING ;N; -COM_RTS ;N; -COM_SCOUNT ;N; -COM_SEND ;N; -COM_SETIO ;N; -COM_SETIRQ ;N; -COM_SFLUSH ;N; -COM_SKEY ;N; -COM_SMODE ;N; -COM_SOFT ;N; -COM_SOFT_R ;N; -COM_SOFT_S ;N; -XMOBLOCK ;N; -XMOCHECK ;N; -ZEROINSERT ;N; -ZEROREMOVE ;N; +; +COM_BREAK ;N; +COM_CLOSE ;N; +COM_COUNT ;N; +COM_CRC ;N; +COM_CTS ;N; +COM_DCD ;N; +COM_DOSCON ;N; +COM_DSR ;N; +COM_DTR ;N; +COM_ERRCHR ;N; +COM_EVENT ;N; +COM_FLUSH ;N; +COM_GETIO ;N; +COM_GETIRQ ;N; +COM_HARD ;N; +COM_INIT ;N; +COM_KEY ;N; +COM_LSR ;N; +COM_MCR ;N; +COM_MSR ;N; +COM_NUM ;N; +COM_OPEN ;N; +COM_READ ;N; +COM_REMOTE ;N; +COM_RING ;N; +COM_RTS ;N; +COM_SCOUNT ;N; +COM_SEND ;N; +COM_SETIO ;N; +COM_SETIRQ ;N; +COM_SFLUSH ;N; +COM_SKEY ;N; +COM_SMODE ;N; +COM_SOFT ;N; +COM_SOFT_R ;N; +COM_SOFT_S ;N; +XMOBLOCK ;N; +XMOCHECK ;N; +ZEROINSERT ;N; +ZEROREMOVE ;N; ; ; ;1.4 string functions ;==================== ; -ADDASCII ;R; -AFTERATNUM ;R; -ASCIISUM ;R; -ASCPOS ;R; -ATADJUST ;R; -ATNUM ;R; -ATREPL ;R; -ATTOKEN ;R; -BEFORATNUM ;R; -CENTER ;R; -CHARADD ;R; -CHARAND ;R; +ADDASCII ;R; +AFTERATNUM ;R; +ASCIISUM ;R; +ASCPOS ;R; +ATADJUST ;R; +ATNUM ;R; +ATREPL ;R; +ATTOKEN ;R; +BEFORATNUM ;R; +CENTER ;R; +CHARADD ;R; +CHARAND ;R; CHAREVEN ;R; CHARHIST ;R; !NEW! -CHARLIST ;R; -CHARMIRR ;R; +CHARLIST ;R; +CHARMIRR ;R; CHARMIX ;R; -CHARNOLIST ;R; -CHARNOT ;R; +CHARNOLIST ;R; +CHARNOT ;R; CHARODD ;R; -CHARONE ;R; -CHARONLY ;R; -CHAROR ;R; -CHARPACK ;N; -CHARRELA ;S; -CHARRELREP ;S; -CHARREM ;R; +CHARONE ;R; +CHARONLY ;R; +CHAROR ;R; +CHARPACK ;N; +CHARRELA ;S; +CHARRELREP ;S; +CHARREM ;R; CHARREPL ;R; CHARRLL ;R; !NEW! CHARRLR ;R; !NEW! CHARSHL ;R; !NEW! CHARSHR ;R; !NEW! CHARSLIST ;R; !NEW! -CHARSORT ;R; -CHARSPREAD ;N; +CHARSORT ;R; +CHARSPREAD ;N; CHARSUB ;R; !NEW! -CHARSWAP ;R; -CHARUNPACK ;N; -CHARXOR ;R; +CHARSWAP ;R; +CHARUNPACK ;N; +CHARXOR ;R; CHECKSUM ;R; COUNTLEFT ;S; COUNTRIGHT ;S; CRYPT ;R; CSETATMUPA ;R; -CSETREF ;R; -EXPAND ;N; -JUSTLEFT ;S; -JUSTRIGHT ;S; -LIKE ;N; +CSETREF ;R; +EXPAND ;N; +JUSTLEFT ;S; +JUSTRIGHT ;S; +LIKE ;N; LTOC ;R; -MAXLINE ;N; -NUMAT ;S; -NUMLINE ;N; +MAXLINE ;N; +NUMAT ;S; +NUMLINE ;N; NUMTOKEN ;R; -PADLEFT ;S; -PADRIGHT ;S; -POSALPHA ;S; -POSCHAR ;S; -POSDEL ;S; -POSDIFF ;S; -POSEQUAL ;S; -POSINS ;S; -POSLOWER ;S; -POSRANGE ;S; -POSREPL ;S; +PADLEFT ;S; +PADRIGHT ;S; +POSALPHA ;S; +POSCHAR ;S; +POSDEL ;S; +POSDIFF ;S; +POSEQUAL ;S; +POSINS ;S; +POSLOWER ;S; +POSRANGE ;S; +POSREPL ;S; POSUPPER ;S; -RANGEREM ;S; -RANGEREPL ;S; -REMALL ;S; -REMLEFT ;S; -REMRIGHT ;S; -REPLALL ;S; -REPLLEFT ;S; -REPLRIGHT ;S; -RESTTOKEN ;R; -SAVETOKEN ;R; -SETATLIKE ;R; -STRDIFF ;R; -STRSWAP ;S; -TABEXPAND ;S; -TABPACK ;S; +RANGEREM ;S; +RANGEREPL ;S; +REMALL ;S; +REMLEFT ;S; +REMRIGHT ;S; +REPLALL ;S; +REPLLEFT ;S; +REPLRIGHT ;S; +RESTTOKEN ;R; +SAVETOKEN ;R; +SETATLIKE ;R; +STRDIFF ;R; +STRSWAP ;S; +TABEXPAND ;S; +TABPACK ;S; TOKEN ;R; -TOKENAT ;R; -TOKENEND ;R; +TOKENAT ;R; +TOKENEND ;R; TOKENEXIT ;R; !NEW! -TOKENINIT ;R; -TOKENLOWER ;R; -TOKENNEXT ;R; +TOKENINIT ;R; +TOKENLOWER ;R; +TOKENNEXT ;R; TOKENNUM ;R; !NEW! -TOKENSEP ;R; -TOKENUPPER ;R; -VALPOS ;R; -WORDONE ;R; +TOKENSEP ;R; +TOKENUPPER ;R; +VALPOS ;R; +WORDONE ;R; WORDONLY ;R; WORDREM ;R; !NEW! -WORDREPL ;R; -WORDSWAP ;R; -WORDTOCHAR ;S; +WORDREPL ;R; +WORDSWAP ;R; +WORDTOCHAR ;S; ; ; ;2.1 number and bit manipulation ;=============================== ; -BITTOC ;S; -CELSIUS ;R; -CLEARBIT ;S; -CTOBIT ;S; -CTOF ;S; -CTON ;S; -EXPONENT ;S; -FAHRENHEIT ;R; -FTOC ;S; -INFINITY ;R; -INTNEG ;N; -INTPOS ;N; -ISBIT ;S; -LTON ;N; -MANTISSA ;S; -NTOC ;S; -NUMAND ;S; +BITTOC ;S; +CELSIUS ;R; +CLEARBIT ;S; +CTOBIT ;S; +CTOF ;S; +CTON ;S; +EXPONENT ;S; +FAHRENHEIT ;R; +FTOC ;S; +INFINITY ;R; +INTNEG ;N; +INTPOS ;N; +ISBIT ;S; +LTON ;N; +MANTISSA ;S; +NTOC ;S; +NUMAND ;S; NUMANDX ;S; !NEW! -NUMCOUNT ;N; -NUMHIGH ;N; -NUMLOW ;N; -NUMMIRR ;S; +NUMCOUNT ;N; +NUMHIGH ;N; +NUMLOW ;N; +NUMMIRR ;S; NUMMIRRX ;S; !NEW! -NUMNOT ;S; +NUMNOT ;S; NUMNOTX ;S; !NEW! -NUMOR ;S; +NUMOR ;S; NUMORX ;S; !NEW! -NUMROL ;S; +NUMROL ;S; NUMROLX ;S; !NEW! -NUMXOR ;S; +NUMXOR ;S; NUMXORX ;S; !NEW! -RAND ;N; -RANDOM ;N; -SETBIT ;S; +RAND ;N; +RANDOM ;N; +SETBIT ;S; ; ; ;2.2 video functions ;=================== ; -CHARPIX ;N; -CHARWIN ;N; -CLEAREOL ;N; -CLEARSLOW ;N; -CLEARWIN ;N; -CLEOL ;N; -CLWIN ;N; -COLORREPL ;N; +CHARPIX ;N; +CHARWIN ;N; +CLEAREOL ;N; +CLEARSLOW ;N; +CLEARWIN ;N; +CLEOL ;N; +CLWIN ;N; +COLORREPL ;N; COLORTON ;S; COLORWIN ;N; EGAPALETTE ;N; ENHANCED ;S; FILESCREEN ;N; -FONTLOAD ;N; -FONTRESET ;N; -FONTROTATE ;N; -FONTSELECT ;N; -GETCLEARA ;N; -GETCLEARB ;N; -GETFONT ;N; -GETSCRSTR ;N; -GETVGAPAL ;N; -INVERTATTR ;N; -INVERTWIN ;S; -ISCGA ;N; -ISEGA ;N; -ISHERCULES ;N; -ISMCGA ;N; -ISMONO ;N; -ISPGA ;N; -ISVGA ;N; -MAXFONT ;N; -MONISWITCH ;N; -NTOCOLOR ;S; -NUMCOL ;N; -RESTCURSOR ;N; -SAVECURSOR ;N; -SAYDOWN ;N; -SAYMOVEIN ;N; -SAYSCREEN ;N; -SAYSPREAD ;N; -SCREENATTR ;S; -SCREENFILE ;N; -SCREENMARK ;N; +FONTLOAD ;N; +FONTRESET ;N; +FONTROTATE ;N; +FONTSELECT ;N; +GETCLEARA ;N; +GETCLEARB ;N; +GETFONT ;N; +GETSCRSTR ;N; +GETVGAPAL ;N; +INVERTATTR ;N; +INVERTWIN ;S; +ISCGA ;N; +ISEGA ;N; +ISHERCULES ;N; +ISMCGA ;N; +ISMONO ;N; +ISPGA ;N; +ISVGA ;N; +MAXFONT ;N; +MONISWITCH ;N; +NTOCOLOR ;S; +NUMCOL ;N; +RESTCURSOR ;N; +SAVECURSOR ;N; +SAYDOWN ;N; +SAYMOVEIN ;N; +SAYSCREEN ;N; +SAYSPREAD ;N; +SCREENATTR ;S; +SCREENFILE ;N; +SCREENMARK ;N; SCREENMIX ;S; -SCREENSIZE ;N; -SCREENSTR ;N; -SETCLEARA ;N; -SETCLEARB ;N; -SETFONT ;N; -SETRC ;N; -SETSCRSTR ;N; +SCREENSIZE ;N; +SCREENSTR ;N; +SETCLEARA ;N; +SETCLEARB ;N; +SETFONT ;N; +SETRC ;N; +SETSCRSTR ;N; STANDARD ;S; -STRSCREEN ;N; -UNSELECTED ;S; -UNTEXTWIN ;N; -VGAPALETTE ;N; -VIDEOINIT ;N; -VIDEOSETUP ;N; -VIDEOTYPE ;N; +STRSCREEN ;N; +UNSELECTED ;S; +UNTEXTWIN ;N; +VGAPALETTE ;N; +VIDEOINIT ;N; +VIDEOSETUP ;N; +VIDEOTYPE ;N; ; ; ;2.3 disc functions ;================== ; -DELETEFILE ;N; -DIRCHANGE ;N; -DIRMAKE ;N; -DIRNAME ;N; -DIRREMOVE ;N; -DISKCHANGE ;N; -DISKCHECK ;N; -DISKFORMAT ;N; -DISKFREE ;N; -DISKNAME ;N; -DISKREADY ;N; -DISKREADYW ;N; -DISKSPEED ;N; -DISKSTAT ;N; -DISKTOTAL ;N; -DISKTYPE ;N; -DRIVETYPE ;N; -FILEAPPEND ;N; -FILEATTR ;N; -FILECCLOSE ;N; -FILECCONT ;N; -FILECDATI ;N; -FILECHECK ;N; -FILECOPEN ;N; -FILECOPY ;N; -FILEDATE ;N; -FILEDELETE ;N; -FILEMOVE ;N; -FILESEEK ;N; -FILESIZE ;N; -FILESTR ;N; -FILETIME ;N; -FILEVALID ;N; -FLOPPYTYPE ;N; -GETSHARE ;N; -NUMDISKF ;N; -NUMDISKH ;N; -NUMDISKL ;N; -RENAMEFILE ;N; -RESTFSEEK ;N; -SAVEFSEEK ;N; -SETFATTR ;N; -SETFCREATE ;N; -SETFDATI ;N; -SETSHARE ;N; -STRFILE ;N; -TEMPFILE ;N; -TRUENAME ;N; -VOLSERIAL ;N; -VOLUME ;N; +DELETEFILE ;N; +DIRCHANGE ;N; +DIRMAKE ;N; +DIRNAME ;N; +DIRREMOVE ;N; +DISKCHANGE ;N; +DISKCHECK ;N; +DISKFORMAT ;N; +DISKFREE ;N; +DISKNAME ;N; +DISKREADY ;N; +DISKREADYW ;N; +DISKSPEED ;N; +DISKSTAT ;N; +DISKTOTAL ;N; +DISKTYPE ;N; +DRIVETYPE ;N; +FILEAPPEND ;N; +FILEATTR ;N; +FILECCLOSE ;N; +FILECCONT ;N; +FILECDATI ;N; +FILECHECK ;N; +FILECOPEN ;N; +FILECOPY ;N; +FILEDATE ;N; +FILEDELETE ;N; +FILEMOVE ;N; +FILESEEK ;N; +FILESIZE ;N; +FILESTR ;N; +FILETIME ;N; +FILEVALID ;N; +FLOPPYTYPE ;N; +GETSHARE ;N; +NUMDISKF ;N; +NUMDISKH ;N; +NUMDISKL ;N; +RENAMEFILE ;N; +RESTFSEEK ;N; +SAVEFSEEK ;N; +SETFATTR ;N; +SETFCREATE ;N; +SETFDATI ;N; +SETSHARE ;N; +STRFILE ;N; +TEMPFILE ;N; +TRUENAME ;N; +VOLSERIAL ;N; +VOLUME ;N; ; ; ;2.4 printer functions ;===================== ; -NUMPRINTER ;N; -PRINTFILE ;N; -PRINTINIT ;N; -PRINTREADY ;S;dos -PRINTSCR ;N; -PRINTSCRX ;N; -PRINTSEND ;N; +NUMPRINTER ;N; +PRINTFILE ;N; +PRINTINIT ;N; +PRINTREADY ;S;dos +PRINTSCR ;N; +PRINTSCRX ;N; +PRINTSEND ;N; PRINTSTAT ;S;dos -SPOOLACTIV ;N; -SPOOLADD ;N; -SPOOLCOUNT ;N; -SPOOLDEL ;N; -SPOOLENTRY ;N; -SPOOLFLUSH ;N; -TOF ;N; +SPOOLACTIV ;N; +SPOOLADD ;N; +SPOOLCOUNT ;N; +SPOOLDEL ;N; +SPOOLENTRY ;N; +SPOOLFLUSH ;N; +TOF ;N; ; ; ;2.5 date & time functions ;========================= ; -ADDMONTH ;S; -BOM ;S; -BOQ ;S; -BOY ;S; -CTODOW ;S; -CTOMONTH ;S; -DMY ;S; -DOY ;S; -EOM ;S; -EOQ ;S; -EOY ;S; -ISLEAP ;S; -LASTDAYOM ;S; -MDY ;S; -NTOCDOW ;S; -NTOCMONTH ;S; -QUARTER ;S; -SECTOTIME ;N; -SETDATE ;N; -SETTIME ;N; -SHOWTIME ;N; -STOD ;S; -TIMETOSEC ;N; -TIMEVALID ;N; -WAITPERIOD ;N; -WEEK ;S; -WOM ;N; +ADDMONTH ;S; +BOM ;S; +BOQ ;S; +BOY ;S; +CTODOW ;S; +CTOMONTH ;S; +DMY ;S; +DOY ;S; +EOM ;S; +EOQ ;S; +EOY ;S; +ISLEAP ;S; +LASTDAYOM ;S; +MDY ;S; +NTOCDOW ;S; +NTOCMONTH ;S; +QUARTER ;S; +SECTOTIME ;N; +SETDATE ;N; +SETTIME ;N; +SHOWTIME ;N; +STOD ;S; +TIMETOSEC ;N; +TIMEVALID ;N; +WAITPERIOD ;N; +WEEK ;S; +WOM ;N; ; ; ;2.6 DBF functions ;================= ; -DBFDSKSIZE ;N; -DBFSIZE ;N; -FIELDDECI ;N; -FIELDNUM ;N; -FIELDSIZE ;N; -FIELDTYPE ;N; -ISDBT ;N; +DBFDSKSIZE ;N; +DBFSIZE ;N; +FIELDDECI ;N; +FIELDNUM ;N; +FIELDSIZE ;N; +FIELDTYPE ;N; +ISDBT ;N; ; ; ;3.1 switch and state functions ;============================== ; -CSETALL ;N; -CSETCLIP ;N; -CSETDATE ;N; -CSETDECI ;N; -CSETDEFA ;N; -CSETFUNC ;N; +CSETALL ;N; +CSETCLIP ;N; +CSETDATE ;N; +CSETDECI ;N; +CSETDEFA ;N; +CSETFUNC ;N; CSETKEY ;R; -CSETLDEL ;N; -CSETMARG ;N; -CSETPATH ;N; -CSETRDEL ;N; -CSETRDONLY ;N; -CSETSAFETY ;N; -CSETSNOW ;N; +CSETLDEL ;N; +CSETMARG ;N; +CSETPATH ;N; +CSETRDEL ;N; +CSETRDONLY ;N; +CSETSAFETY ;N; +CSETSNOW ;N; CSETALTE ;N; CSETBELL ;N; CSETCARR ;N; @@ -528,172 +528,172 @@ CSETSOFT ;N; CSETUNIQ ;N; CSETWRAP ;N; ISDEBUG ;N; -KSETCAPS ;S;dos -KSETINS ;S;dos -KSETNUM ;S;dos -KSETSCROLL ;S;dos -LASTKFUNC ;N; -LASTKLINE ;N; -LASTKPROC ;N; -NUMFKEY ;N; -SETLASTKEY ;N; +KSETCAPS ;S;dos +KSETINS ;S;dos +KSETNUM ;S;dos +KSETSCROLL ;S;dos +LASTKFUNC ;N; +LASTKLINE ;N; +LASTKPROC ;N; +NUMFKEY ;N; +SETLASTKEY ;N; ; ; ;3.2 system info functions ;========================= ; -BIOSDATE ;N; -BOOTCOLD ;N; -BOOTWARM ;N; -CPUTYPE ;N; -DOSPARAM ;N; -ENVPARAM ;N; -ERRORACT ;N; -ERRORBASE ;N; -ERRORCODE ;N; -ERRORORG ;N; -EXENAME ;N; -FILESFREE ;N; -FILESMAX ;N; -GETCOUNTRY ;N; -ISANSI ;N; -ISAT ;N; -ISMATH ;N; -MEMSIZE ;N; -NUMBUFFERS ;N; -NUMFILES ;N; -OSVER ;N; -PCTYPE ;N; -SSETBREAK ;N; -SSETVERIFY ;N; +BIOSDATE ;N; +BOOTCOLD ;N; +BOOTWARM ;N; +CPUTYPE ;N; +DOSPARAM ;N; +ENVPARAM ;N; +ERRORACT ;N; +ERRORBASE ;N; +ERRORCODE ;N; +ERRORORG ;N; +EXENAME ;N; +FILESFREE ;N; +FILESMAX ;N; +GETCOUNTRY ;N; +ISANSI ;N; +ISAT ;N; +ISMATH ;N; +MEMSIZE ;N; +NUMBUFFERS ;N; +NUMFILES ;N; +OSVER ;N; +PCTYPE ;N; +SSETBREAK ;N; +SSETVERIFY ;N; ; ; ;3.3 misc. functions ;=================== ; ALLOFREE ;N; -BLANK ;N; -COMPLEMENT ;N; +BLANK ;N; +COMPLEMENT ;N; DATATYPE ;N; -GETTIC ;N; -KBDDISABLE ;N; -KBDEMULATE ;N; -KBDSPEED ;N; -KBDSTAT ;N; -KBDTYPE ;N; -KEYSEC ;N; -KEYTIME ;N; -MILLISEC ;N; -NUL ;N; -SCANKEY ;N; -SETTIC ;N; -SHOWKEY ;N; -SOUND ;N; -SPEED ;N; -STACKFREE ;N; -TOOLVER ;N; -XTOC ;S; +GETTIC ;N; +KBDDISABLE ;N; +KBDEMULATE ;N; +KBDSPEED ;N; +KBDSTAT ;N; +KBDTYPE ;N; +KEYSEC ;N; +KEYTIME ;N; +MILLISEC ;N; +NUL ;N; +SCANKEY ;N; +SETTIC ;N; +SHOWKEY ;N; +SOUND ;N; +SPEED ;N; +STACKFREE ;N; +TOOLVER ;N; +XTOC ;S; ; ; ;3.4 math functions ;================== ; -ACOS ;R; -ASIN ;R; -ATAN ;R; -ATN2 ;R; -CEILING ;R; -COS ;R; +ACOS ;R; +ASIN ;R; +ATAN ;R; +ATN2 ;R; +CEILING ;R; +COS ;R; COSH ;R; !NEW! -COT ;R; +COT ;R; DTOR ;R; -FACT ;R; -FLOOR ;R; -FV ;R; +FACT ;R; +FLOOR ;R; +FV ;R; GETPREC ;R; -LOG10 ;R; -PAYMENT ;R; -PERIODS ;R; -PI ;R; -PV ;R; +LOG10 ;R; +PAYMENT ;R; +PERIODS ;R; +PI ;R; +PV ;R; RATE ;R; -RTOD ;R; +RTOD ;R; SETPREC ;R; -SIGN ;R; -SIN ;R; +SIGN ;R; +SIN ;R; SINH ;R; !NEW! -TAN ;R; +TAN ;R; TANH ;R; !NEW! ; ; ;3.5 peek and poke functions ;=========================== ; -INBYTE ;N; -INWORD ;N; -OUTBYTE ;N; -OUTWORD ;N; -PEEKBYTE ;N; -PEEKSTR ;N; -PEEKWORD ;N; -POKEBYTE ;N; -POKEWORD ;N; +INBYTE ;N; +INWORD ;N; +OUTBYTE ;N; +OUTWORD ;N; +PEEKBYTE ;N; +PEEKSTR ;N; +PEEKWORD ;N; +POKEBYTE ;N; +POKEWORD ;N; ; ; ;3.6 GET/READ functions ;====================== ; -COUNTGETS ;N; -CURRENTGET ;N; -GETFLDCOL ;N; -GETFLDROW ;N; -GETFLDVAR ;N; -GETINPUT ;N; -GETSECRET ;N; +COUNTGETS ;N; +CURRENTGET ;N; +GETFLDCOL ;N; +GETFLDROW ;N; +GETFLDVAR ;N; +GETINPUT ;N; +GETSECRET ;N; RESTGETS ;R; RESTSETKEY ;N; SAVEGETS ;R; -SAVESETKEY ;N; +SAVESETKEY ;N; ; ; ;4a.1 IBM PC-LAN network functions ;================================== ; -NETCANCEL ;N; -NETDISK ;N; -NETLOCNAME ;N; -NETPRINTER ;N; -NETREDIR ;N; -NETRMTNAME ;N; -NETWORK ;N; +NETCANCEL ;N; +NETDISK ;N; +NETLOCNAME ;N; +NETPRINTER ;N; +NETREDIR ;N; +NETRMTNAME ;N; +NETWORK ;N; ; ; ;4a.2 low level bindery access functions ;======================================= ; -NNETADDSET ;N; -NNETBINACC ;N; -NNETBINCL ;N; -NNETBINOP ;N; -NNETCRTOBJ ;N; -NNETCRTPRP ;N; -NNETDELOBJ ;N; -NNETDELPRP ;N; -NNETDELSET ;N; -NNETINSET ;N; -NNETNUMMEM ;N; -NNETNUMOBJ ;N; -NNETOBJID ;N; -NNETOBJNAM ;N; -NNETOBJSEC ;N; -NNETOBJTYP ;N; -NNETPRPSEC ;N; -NNETRDITM ;N; -NNETRDSET ;N; -NNETRENOBJ ;N; -NNETSCNBIN ;N; -NNETSCNPRP ;N; -NNETWRITITM ;N; +NNETADDSET ;N; +NNETBINACC ;N; +NNETBINCL ;N; +NNETBINOP ;N; +NNETCRTOBJ ;N; +NNETCRTPRP ;N; +NNETDELOBJ ;N; +NNETDELPRP ;N; +NNETDELSET ;N; +NNETINSET ;N; +NNETNUMMEM ;N; +NNETNUMOBJ ;N; +NNETOBJID ;N; +NNETOBJNAM ;N; +NNETOBJSEC ;N; +NNETOBJTYP ;N; +NNETPRPSEC ;N; +NNETRDITM ;N; +NNETRDSET ;N; +NNETRENOBJ ;N; +NNETSCNBIN ;N; +NNETSCNPRP ;N; +NNETWRITITM ;N; ; ; ;4a.3 user and group administration functions @@ -763,13 +763,13 @@ NNETCAPSSF ;N; ;4a.6 volume mapping functions ;============================= ; -NNETDELFAK ;N; -NNETFAKDEP ;N; -NNETMAP ;N; -NNETMAPINF ;N; -NNETMAPMOD ;N; -NNETNXTFRE ;N; -NNETSEARCH ;N; +NNETDELFAK ;N; +NNETFAKDEP ;N; +NNETMAP ;N; +NNETMAPINF ;N; +NNETMAPMOD ;N; +NNETNXTFRE ;N; +NNETSEARCH ;N; ; ; ;4a.7 server volume functions @@ -1047,9 +1047,3 @@ NNETPFUNCS ;N; NNETPFWDTH ;N; NNETPMODES ;N; NNETPMODFU ;N; - - - - - - diff --git a/harbour/contrib/hbgf/Makefile b/harbour/contrib/hbgf/Makefile index 5f506b9644..45fe1687f0 100644 --- a/harbour/contrib/hbgf/Makefile +++ b/harbour/contrib/hbgf/Makefile @@ -4,7 +4,7 @@ ROOT = ../../ -ifeq ($(HB_ARCHITECTURE),w32) +ifeq ($(HB_ARCHITECTURE),win) DIRS = hbgfwin endif diff --git a/harbour/contrib/hbgf/hbgfwin/Makefile b/harbour/contrib/hbgf/hbgfwin/Makefile index 12d182769c..523eed1264 100644 --- a/harbour/contrib/hbgf/hbgfwin/Makefile +++ b/harbour/contrib/hbgf/hbgfwin/Makefile @@ -6,7 +6,7 @@ ROOT = ../../../ LIBNAME=hbgfwin -ifeq ($(HB_ARCHITECTURE),w32) +ifeq ($(HB_ARCHITECTURE),win) C_SOURCES=\ winapi.c \ diff --git a/harbour/contrib/hbodbc/Makefile b/harbour/contrib/hbodbc/Makefile index 1581ca7415..f412005e01 100644 --- a/harbour/contrib/hbodbc/Makefile +++ b/harbour/contrib/hbodbc/Makefile @@ -10,7 +10,7 @@ ifeq ($(HB_COMPILER),rsxnt) HB_WITHOUT_ODBC=yes endif -ifneq ($(HB_ARCHITECTURE),w32) +ifneq ($(HB_ARCHITECTURE),win) ifeq ($(HB_WITHOUT_ODBC),) ifeq ($(HB_INC_ODBC),) diff --git a/harbour/contrib/hbole/Makefile b/harbour/contrib/hbole/Makefile index cd4a9d4395..8974e84f9c 100644 --- a/harbour/contrib/hbole/Makefile +++ b/harbour/contrib/hbole/Makefile @@ -6,7 +6,7 @@ ROOT = ../../ LIBNAME=hbole -ifeq ($(HB_ARCHITECTURE),w32) +ifeq ($(HB_ARCHITECTURE),win) C_SOURCES=\ ole2.c \ diff --git a/harbour/contrib/hbtpathy/Makefile b/harbour/contrib/hbtpathy/Makefile index ca75d3721a..c3bb8b87f6 100644 --- a/harbour/contrib/hbtpathy/Makefile +++ b/harbour/contrib/hbtpathy/Makefile @@ -14,7 +14,7 @@ C_SOURCES=\ tpcommon.c \ endif -ifeq ($(HB_ARCHITECTURE),w32) +ifeq ($(HB_ARCHITECTURE),win) C_SOURCES=\ tpwin.c \ tpcommon.c \ diff --git a/harbour/contrib/hbwhat/Makefile b/harbour/contrib/hbwhat/Makefile index 20b4cd279e..ba89062649 100644 --- a/harbour/contrib/hbwhat/Makefile +++ b/harbour/contrib/hbwhat/Makefile @@ -6,7 +6,7 @@ ROOT = ../../ LIBNAME=hbwhat -ifeq ($(HB_ARCHITECTURE),w32) +ifeq ($(HB_ARCHITECTURE),win) ifneq ($(HB_COMPILER),dm) C_SOURCES = \ @@ -81,7 +81,7 @@ PRG_HEADERS= \ winstruc.ch \ winuser.ch \ -# This lib needs xhb headers to compile, and this is +# This lib needs xhb headers to compile, and this is # the hack to help Harbour find them. PRG_USR += -I../../../xhb diff --git a/harbour/contrib/hbwin/Makefile b/harbour/contrib/hbwin/Makefile index c3bf5f2ebb..6941b6fb3e 100644 --- a/harbour/contrib/hbwin/Makefile +++ b/harbour/contrib/hbwin/Makefile @@ -6,7 +6,7 @@ ROOT = ../../ LIBNAME=hbwin -ifeq ($(HB_ARCHITECTURE),w32) +ifeq ($(HB_ARCHITECTURE),win) C_SOURCES=\ win_dll.c \ diff --git a/harbour/contrib/make_gcc_all.sh b/harbour/contrib/make_gcc_all.sh index 5cfdd45dc2..f5f0d64ae3 100755 --- a/harbour/contrib/make_gcc_all.sh +++ b/harbour/contrib/make_gcc_all.sh @@ -16,7 +16,7 @@ if [ -z "$HB_ARCHITECTURE" ]; then else hb_arch=`uname -s | tr -d "[-]" | tr '[A-Z]' '[a-z]' 2>/dev/null` case "$hb_arch" in - *windows*|*mingw32*|msys*) hb_arch="w32" ;; + *windows*|*mingw32*|msys*) hb_arch="win" ;; *cygwin*) hb_arch="cyg" ;; *dos) hb_arch="dos" ;; *bsd) hb_arch="bsd" ;; @@ -29,7 +29,7 @@ fi if [ -z "$HB_CC_NAME" ]; then case "$HB_ARCHITECTURE" in - w32) HB_CC_NAME="mingw" ;; + win) HB_CC_NAME="mingw" ;; dos) HB_CC_NAME="djgpp" ;; *) HB_CC_NAME="gcc" ;; esac @@ -44,7 +44,7 @@ else _HB_DIRS="hbbmcdx hbbtree hbclipsm hbcrypt hbct hbgt hbmisc hbmsql hbmzip hbnf hbtip hbsqlit3 hbtpathy hbvpdf hbziparc xhb" case "$HB_ARCHITECTURE" in - w32|cyg|os2) + win|cyg|os2) _HB_DIRS="${_HB_DIRS} gtwvg hbole hbodbc hbwin hbwhat rddado" ;; *) @@ -64,11 +64,11 @@ else if [ "${HB_INC_MYSQL}" != "" ]; then _HB_DIRS="${_HB_DIRS} rddsql" ; fi; fi -# Revert Cygwin architecture to w32. +# Revert Cygwin architecture to 'win'. # After all it's under Windows OS. if [ "$HB_ARCHITECTURE" == "cyg" ] then - export HB_ARCHITECTURE=w32 + export HB_ARCHITECTURE=win fi _HB_DIRS="${_HB_DIRS} ${HB_CONTRIB_ADDONS}" diff --git a/harbour/contrib/mtpl_b32.mak b/harbour/contrib/mtpl_b32.mak index fada62a7e1..7fab2a11df 100644 --- a/harbour/contrib/mtpl_b32.mak +++ b/harbour/contrib/mtpl_b32.mak @@ -23,7 +23,7 @@ #********************************************************** -HB_ARCHITECTURE = w32 +HB_ARCHITECTURE = win #********************************************************** diff --git a/harbour/contrib/mtpl_gcc.mak b/harbour/contrib/mtpl_gcc.mak index 13dea7a035..c5f738d301 100644 --- a/harbour/contrib/mtpl_gcc.mak +++ b/harbour/contrib/mtpl_gcc.mak @@ -115,7 +115,7 @@ endif # C Compiler Flags ifneq ($(HB_BUILD_OPTIM),no) -ifeq ($(HB_ARCHITECTURE),w32) +ifeq ($(HB_ARCHITECTURE),win) CFLAGS := -march=i586 $(CFLAGS) endif CFLAGS := -O3 $(CFLAGS) diff --git a/harbour/contrib/mtpl_gcc.sh b/harbour/contrib/mtpl_gcc.sh index d51f60967d..30b36896c8 100755 --- a/harbour/contrib/mtpl_gcc.sh +++ b/harbour/contrib/mtpl_gcc.sh @@ -30,7 +30,7 @@ if [ -z "$HB_ARCHITECTURE" ]; then else hb_arch=`uname -s | tr -d "[-]" | tr '[A-Z]' '[a-z]' 2>/dev/null` case "$hb_arch" in - *windows*|*mingw32*|msys*) hb_arch="w32" ;; + *windows*|*mingw32*|msys*) hb_arch="win" ;; *dos) hb_arch="dos" ;; *bsd) hb_arch="bsd" ;; esac @@ -46,7 +46,7 @@ export _HB_MAKEFILE=${HB_MAKEFILE} if [ -z "$_HB_CC_NAME" ]; then case "$HB_ARCHITECTURE" in - w32) _HB_CC_NAME="mingw" ;; + win) _HB_CC_NAME="mingw" ;; dos) _HB_CC_NAME="djgpp" ;; *) _HB_CC_NAME="gcc" ;; esac diff --git a/harbour/contrib/mtpl_vc.mak b/harbour/contrib/mtpl_vc.mak index 86d733dfa3..197dddd2cf 100644 --- a/harbour/contrib/mtpl_vc.mak +++ b/harbour/contrib/mtpl_vc.mak @@ -20,7 +20,7 @@ #********************************************************** -HB_ARCHITECTURE = w32 +HB_ARCHITECTURE = win #********************************************************** diff --git a/harbour/doc/dirstruc.txt b/harbour/doc/dirstruc.txt index 4fb2c3415f..dd9c4bb7bd 100644 --- a/harbour/doc/dirstruc.txt +++ b/harbour/doc/dirstruc.txt @@ -33,7 +33,7 @@ track of all files (read the FAQ if you don't know what SVN is). | | | +---sunos - Configutation files specific to SunOS. | | -| +---w32 - Configutation files specific to MS Windows. +| +---win - Configutation files specific to MS Windows. | +---contrib - Miscellaneous contribution files. Those are not | | part of the official Harbour project. diff --git a/harbour/doc/es/dirstruc.txt b/harbour/doc/es/dirstruc.txt index fb70d5439d..80dd481f6e 100644 --- a/harbour/doc/es/dirstruc.txt +++ b/harbour/doc/es/dirstruc.txt @@ -6,7 +6,7 @@ * Las siguientes partes son derechos adquiridos de sus autores individuales. * www - http://www.harbour-project.org * - * Copyright 2002 Chen Kedem + * Copyright 2002 Chen Kedem * Documentaci˘n en Ingl‚s de: dirstruc.txt * * Copyright 2002 Alejandro de G rate @@ -20,13 +20,13 @@ Estructura de directorios de Harbour ==================================== -Siguiendo estan los directorios que existen bajo el arbol de +Siguiendo estan los directorios que existen bajo el arbol de Harbour. -Bajo cada directorio existente en esta lista hay tambi‚n un +Bajo cada directorio existente en esta lista hay tambi'n un directorio especial, llamado CVS, el que deberˇa normalmente ser ignorado dado que ‚ste es usado por el CVS para mantener la pista de todos los archivos (lea las FAQ, si Ud. no sabe -qu‚ es el CVS). Note que el  rbol puede contener otros +qu' es el CVS). Note que el  rbol puede contener otros directorios vacˇos. Ellos podrˇan ser obsoletos pero no hay una forma sencilla de removerlos completamente (Ud. puede usar cvs update -d en @@ -34,7 +34,7 @@ busca de remover directorios vac - Directorio principal de Harbour -| Contiene todos los archivos make y Changelog +| Contiene todos los archivos make y Changelog | (cambios hist˘ricos) | +---bin - Ejecutables y batch de construcci˘n @@ -48,20 +48,20 @@ busca de remover directorios vac | | | +---bsd - Archivos de Configuraci˘n especˇficos para FreeBSD | | -| +---dos - Archivos de Configuraci˘n especˇficos +| +---dos - Archivos de Configuraci˘n especˇficos | | para DOS. | +---linux - Archivos de Config. especˇficos para GNU/Linux. | | | +---os2 - Archivos de Configuraci˘n especˇficos para OS/2. | | -| +---w32 - Archivos de Config. especˇficos para MS-Win32. +| +---win - Archivos de Config. especˇficos para MS-Win32. | | -+---contrib - Archivos Miscelaneos de contribuci˘n. -| | No son parte del proyecto oficial Harbour ++---contrib - Archivos Miscelaneos de contribuci˘n. +| | No son parte del proyecto oficial Harbour | | -| +---apollo - funciones para driver de base de datos Apollo -| | | +| +---apollo - funciones para driver de base de datos Apollo +| | | | | | | | +---test - Programas de Testeo | | @@ -82,17 +82,17 @@ busca de remover directorios vac | +---hbzlib - Interface para 'zlib' libreria de compresion | | | para trabajar con archivos ZIP | | | -| | +---doc - Documentos para las funciones ZIP +| | +---doc - Documentos para las funciones ZIP | | | +---hb_struc - Clase Base Class para manejo interno de creaci˘n | | de clases como estructuras | | -| +---hgf - Entorno gr fico (GUI) de Harbour +| +---hgf - Entorno gr fico (GUI) de Harbour | | | -| | +---gtk - Implementaci˘n para entorno GTK+ +| | +---gtk - Implementaci˘n para entorno GTK+ | | | | | +---os2pm - Implementaci˘n para OS/2 Presentation Manager -| | | +| | | | | | | | +---tests - Programas de Testeo | | | @@ -112,9 +112,9 @@ busca de remover directorios vac | | | | | +---en - Documentaci˘n en Ingl‚s. | | -| +---libmisc - Contribuci˘n Miscel nea +| +---libmisc - Contribuci˘n Miscel nea | | | -| | +---doc - Documentos de contribuci˘n +| | +---doc - Documentos de contribuci˘n | | | | | | | +---en - Documentaci˘n en Ingl‚s. | | | @@ -122,7 +122,7 @@ busca de remover directorios vac | | | +---libnf - Libreria Nanforum para Harbour. | | -| +---msql - clases Harbour de acceso a mSQL +| +---msql - clases Harbour de acceso a mSQL | | | +---mysql - clases Harbour de acceso a MySQL | | @@ -178,13 +178,13 @@ busca de remover directorios vac | | | +---pe - Editor | -| -+---source - Todos los archivos fuentes residen bajo este +| ++---source - Todos los archivos fuentes residen bajo este | | directorio -| | +| | | +---common - Funciones Comunes y Optimizador de Expresiones | | -| +---compiler - M˘dulo del Compilador de Harbour +| +---compiler - M˘dulo del Compilador de Harbour | | | +---debug - Depurador. | | @@ -204,17 +204,17 @@ busca de remover directorios vac | | +---nulsys - NULL RDD. | | | +---rtl - Funciones de la librerˇa de ejecuci˘n (RTL) -| | | y varias implementaciones de Terminales (GT) +| | | y varias implementaciones de Terminales (GT) | | | | | +---gtcgi - GT subsistema para aplicaciones cgi | | | | | +---gtcrs - Subsistema GT basado en ncurses (unix) (#1) | | | -| | +---gtdos - Subsistema GT para compiladores de DOS +| | +---gtdos - Subsistema GT para compiladores de DOS | | | -| | +---gtos2 - Subsistema GT para compiladores de OS/2 +| | +---gtos2 - Subsistema GT para compiladores de OS/2 | | | -| | +---gtpca - Subsistema GT para terminales ANSI +| | +---gtpca - Subsistema GT para terminales ANSI | | | | | +---gtsln - Subsistema GT basado en slang (unix) (#1) | | | @@ -224,39 +224,39 @@ busca de remover directorios vac | | | | | +---gt_tpl - Subsistema GT modelo base | | -| +---vm - Funciones de la Maquina Virtual (VM) e +| +---vm - Funciones de la Maquina Virtual (VM) e | internas de la librerˇa de ejecuci˘n (RTL) | +---tests - Programas de Testeo de Harbour | +---utils - Utilidades y herramientas que son parte de Harbour | - +---hbdoc - Herramienta generadora de Documentaci˘n + +---hbdoc - Herramienta generadora de Documentaci˘n | +---hbextern - generador de hbextern.ch | - +---hbmake - Utilidad Make de Harbour + +---hbmake - Utilidad Make de Harbour | +---hbpp - Preprocesador de Harbour como m˘dulo aislado | - +---hbrun - Ejecutor de archivos de Objetos Portables de + +---hbrun - Ejecutor de archivos de Objetos Portables de | Harbour (#3) +---hbtest - Test de Regresi˘n para la libreria RTL Leyenda: ======= -(*) Deberˇa existir en una construcci˘n final si lo +(*) Deberˇa existir en una construcci˘n final si lo construye Ud. mismo, en una distribuci˘n normal de CVS este directorio est  vacˇo ˘ no contiene todos los archivos. (#1) Aunque hoy en dˇa existen ports a otros sistemas operativos - sus raˇces estan en unix. + sus raˇces estan en unix. (#2) Directorio temporal donde se ponen los archivos objeto .obj u otro (dependiendo de la plataforma) a medida que se construyen los ejecutables y las librerˇas. si Ud. construye el compilador Harbour. -(#3) (.hrb), Archivos de formato Harbour Portable Object - \ No newline at end of file +(#3) (.hrb), Archivos de formato Harbour Portable Object + diff --git a/harbour/doc/funclist.txt b/harbour/doc/funclist.txt index 2a891cc8f4..d3ac3b0d7f 100644 --- a/harbour/doc/funclist.txt +++ b/harbour/doc/funclist.txt @@ -12,17 +12,17 @@ ; - dos[-bcc16] ; dos[-djgpp] ; dos[-watcom] -; w32[-bcc32][+T] -; w32[-gcc][+T] -; w32[-icc][+T] -; w32[-mingw32][+T] -; w32[-msvc][+T] +; win[-bcc32][+T] +; win[-gcc][+T] +; win[-icc][+T] +; win[-mingw][+T] +; win[-msvc][+T] ; os2[-gcc][+T] ; os2[-icc][+T] ; lin[-gcc][+T] ; mac[-mpw][+T] ; -; Examples: w32-gcc+T, w32, w32-icc +; Examples: win-gcc+T, win, win-icc ; (+T means multithreading ready) ; ; Use ';' for comments diff --git a/harbour/doc/gmake.txt b/harbour/doc/gmake.txt index 5af7b8c067..3ab566fa07 100644 --- a/harbour/doc/gmake.txt +++ b/harbour/doc/gmake.txt @@ -110,11 +110,11 @@ Now. let's take a look at the rules themselves. They all live in the config/ directory, with the following structure: config/: The generic configuration files. - config/w32: Configuration files for Windows platforms. + config/win: Configuration files for Windows platforms. Finally, you will notice one thing: the build system compiles -everything into a subdirectory (for example, w32/gcc for Windows +everything into a subdirectory (for example, win/gcc for Windows files compiled with gcc). This has two advantages: 1. It allows you to compile for multiple platforms/compilers at the @@ -139,7 +139,7 @@ For gcc on Win95/WinNT with the Cygwin library: Notes: The CYGWIN environment variable must include "noglob" in order to avoid having Harbour or programs created with Harbour expand wildcard command line arguments (this is checked at run-time!) - HB_ARCHITECTURE w32 + HB_ARCHITECTURE win HB_COMPILER gcc HB_GT_LIB gtwin CYGWIN noglob @@ -147,7 +147,7 @@ For gcc on Win95/WinNT with the Cygwin library: L_USR -mwin32 For gcc on Win95/WinNT with the MinGW library: - HB_ARCHITECTURE w32 + HB_ARCHITECTURE win HB_COMPILER mingw HB_GT_LIB gtwin @@ -159,7 +159,7 @@ For MSVC on Win95/WinNT: not set to unix For best results, in your copy of make_gnu.bat, also set: - HB_ARCHITECTURE w32 + HB_ARCHITECTURE win HB_COMPILER msvc HB_GT_LIB gtwin @@ -218,7 +218,7 @@ For IBM Visual Age C++ on OS/2 for PM mode: HB_GT_LIB os2pm For Borland C++ 5.5 - HB_ARCHITECTURE w32 + HB_ARCHITECTURE win HB_COMPILER bcc32 HB_GT_LIB gtwin @@ -294,4 +294,3 @@ can also be used for modules that aren't in the Makefile. You can also pass parameters to the program. For example, 'build readfile harbour.ini' will rebuild the readfile.prg program and run it with 'harbour.ini' as a command line parameter. - diff --git a/harbour/harbour-wce-spec b/harbour/harbour-wce-spec index d2713dfdc0..ec4191a67e 100644 --- a/harbour/harbour-wce-spec +++ b/harbour/harbour-wce-spec @@ -12,8 +12,8 @@ ###################################################################### # Conditional build: # --with mysql - build mysql lib -# --with pgsql - build pgsql lib -# --with gd - build gd lib +# --with pgsql - build pgsql lib +# --with gd - build gd lib # --with allegro - build GTALLEG - Allegro based GT driver # --with ads - build ADS RDD # --with odbc - build odbc lib @@ -93,7 +93,7 @@ export C_USR="-O2 -DHB_FM_STATISTICS_OFF" make -r export HB_HOST_BUILD=lib -export HB_ARCHITECTURE=w32 +export HB_ARCHITECTURE=win export HB_COMPILER=mingwce mkdir -p source/pp/${HB_ARCHITECTURE}/${HB_COMPILER} @@ -138,7 +138,7 @@ export CCPREFIX="%{hb_ccpref}" export PATH="$CCPATH$PATH" export HB_HOST_BUILD=lib -export HB_ARCHITECTURE=w32 +export HB_ARCHITECTURE=win export HB_COMPILER=mingwce export HB_XBUILD=wce export HB_BIN_INSTALL=%{_bindir} diff --git a/harbour/harbour-win-spec b/harbour/harbour-win-spec index cf9ae0df21..49eaaf34f2 100644 --- a/harbour/harbour-win-spec +++ b/harbour/harbour-win-spec @@ -1,360 +1,360 @@ -# -# $Id$ -# - -# --------------------------------------------------------------- -# Copyright 2007 Przemyslaw Czerpak (druzus/at/priv.onet.pl), -# Harbour-MinGW cross build RPM spec file -# -# See doc/license.txt for licensing terms. -# --------------------------------------------------------------- - -###################################################################### -# Conditional build: -# --with mysql - build mysql lib -# --with pgsql - build pgsql lib -# --with gd - build gd lib -# --with allegro - build GTALLEG - Allegro based GT driver -# --with ads - build ADS RDD -# --with odbc - build odbc lib -# --without nf - do not build nanforum lib -###################################################################### - -###################################################################### -## Definitions. -###################################################################### - -%define name harbour-win -%define version 1.1.0 -%define releasen dev -%define hb_pref hbw -%define hb_ccpath /opt/xmingw/bin -%define hb_ccpref i386-mingw- -%define hb_host www.harbour-project.org -%define readme README.RPM - -# Workaround for the problem of /usr/bin/strip not handling PE binaries. -%define __strip %{hb_ccpath}/%{hb_ccpref}strip -%define __objdump %{hb_ccpath}/%{hb_ccpref}objdump - -###################################################################### -## Preamble. -###################################################################### - -Summary: Free software Clipper compatible compiler -Summary(pl): Darmowy kompilator kompatybilny z językiem Clipper. -Name: %{name} -Version: %{version} -Release: %{releasen} -License: GPL (plus exception) -Group: Development/Languages -Vendor: %{hb_host} -URL: http://%{hb_host}/ -Source: harbour-%{version}.src.tar.gz -Packager: Przemysław Czerpak (druzus/at/priv.onet.pl) -BuildPrereq: gcc binutils bash -Requires: gcc binutils bash sh-utils harbour = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: %{name} -BuildRoot: /tmp/%{name}-%{version}-root - -%define _noautoreq 'libharbour.*' - -%description -Harbour is a CA-Cl*pper compatible compiler for multiple platforms. This -package includes a compiler, pre-processor, header files, virtual machine -and libraries for creating MS-Windows application in Linux box using MinGW -GCC port. - -%description -l pl -Harbour to kompatybilny z językiem CA-Cl*pper kompilator rozwijany na -wielu różnych platformach. Ten pakiet zawiera kompilator, preprocesor, -zbiory nagłówkowe, wirtualn± maszynę oraz biblioteki pozwalaj±ce na -tworzenie aplikacji dla MS-Windows przy użyciu MinGW GCC. - - -###################################################################### -## Preperation. -###################################################################### - -%prep -%setup -c harbour -rm -fR $RPM_BUILD_ROOT - -###################################################################### -## Build. -###################################################################### - -%build - -export HB_HOST_BUILD=yes -export HB_ARCHITECTURE=linux -export HB_COMPILER=gcc -export C_USR="-O2 -DHB_FM_STATISTICS_OFF" -make -r - -export HB_HOST_BUILD=lib -export HB_ARCHITECTURE=w32 -export HB_COMPILER=mingw - -mkdir -p source/pp/${HB_ARCHITECTURE}/${HB_COMPILER} -ln -s ../../linux/gcc/hbpp source/pp/${HB_ARCHITECTURE}/${HB_COMPILER}/hbpp.exe -mkdir -p source/main/${HB_ARCHITECTURE}/${HB_COMPILER} -ln -s ../../linux/gcc/harbour source/main/${HB_ARCHITECTURE}/${HB_COMPILER}/harbour.exe - -export CC_C_USR="" -export C_USR="$CC_C_USR -O2 -DHB_FM_STATISTICS_OFF" -export CC_PRG_USR="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX" -export PRG_USR="$CC_PRG_USR" -export L_USR="${CC_L_USR}" - -export CCPATH="%{hb_ccpath}:" -export CCPREFIX="%{hb_ccpref}" -export PATH="$CCPATH$PATH" - -export HB_XBUILD=w32 -export HB_BIN_INSTALL=%{_bindir} -export HB_INC_INSTALL=%{_includedir}/%{name} -export HB_LIB_INSTALL=%{_libdir}/%{name} -export HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbwin hbziparc rddado xhb %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" - -make -r - -###################################################################### -## Install. -###################################################################### - -%install - -# Install harbour itself. - -export CC_C_USR="" -export C_USR="$CC_C_USR -O2 -DHB_FM_STATISTICS_OFF" -export CC_PRG_USR="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX" -export PRG_USR="$CC_PRG_USR" -export L_USR="${CC_L_USR}" - -export CCPATH="%{hb_ccpath}:" -export CCPREFIX="%{hb_ccpref}" -export PATH="$CCPATH$PATH" - -export HB_HOST_BUILD=lib -export HB_ARCHITECTURE=w32 -export HB_COMPILER=mingw -export HB_XBUILD=w32 -export HB_BIN_INSTALL=%{_bindir} -export HB_INC_INSTALL=%{_includedir}/%{name} -export HB_LIB_INSTALL=%{_libdir}/%{name} -export HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbwin hbziparc rddado xhb %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" - -export _DEFAULT_BIN_DIR=$HB_BIN_INSTALL -export _DEFAULT_INC_DIR=$HB_INC_INSTALL -export _DEFAULT_LIB_DIR=$HB_LIB_INSTALL -export HB_BIN_INSTALL=$RPM_BUILD_ROOT/$HB_BIN_INSTALL -export HB_INC_INSTALL=$RPM_BUILD_ROOT/$HB_INC_INSTALL -export HB_LIB_INSTALL=$RPM_BUILD_ROOT/$HB_LIB_INSTALL -export HB_TOOLS_PREF=%{hb_pref} - -mkdir -p $HB_BIN_INSTALL -mkdir -p $HB_INC_INSTALL -mkdir -p $HB_LIB_INSTALL - -make -r -i install - -[ "%{?_with_odbc:1}" ] || rm -f $HB_LIB_INSTALL/libhbodbc.a -[ "%{?_with_allegro:1}" ] || rm -f $HB_LIB_INSTALL/libgtalleg.a -[ "%{?_with_ads:1}" ] || rm -f $HB_LIB_INSTALL/librddads.a -[ "%{?_without_nf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a - -# Keep the size of the libraries to a minimim. -${CCPREFIX}strip --strip-debug $HB_LIB_INSTALL/* - -# remove unused files -rm -fR ${HB_BIN_INSTALL}/{harbour,hbpp,hbdoc,hbmake,hbrun,hbi18n,hbtest}.exe - -# Create a README file for people using this RPM. -cat > doc/%{readme} < # output file name --static # link with static Harbour libs --fullstatic # link with all static libs --shared # link with shared libs (default) --mt # link with multi-thread libs --gt # link with GT driver, can be repeated to - # link with more GTs. The first one will be - # the default at runtime --xbgtk # link with xbgtk library (xBase GTK+ interface) --hwgui # link with HWGUI library (GTK+ interface) --l # link with library --L # additional path to search for libraries --fmstat # link with the memory statistics lib --nofmstat # do not link with the memory statistics lib (default) --[no]strip # strip (no strip) binaries --main= # set the name of main program function/procedure. - # if not set then 'MAIN' is used or if it doesn't - # exist the name of first public function/procedure - # in first linked object module (link) - -Link options work only with "%{hb_pref}lnk" and "%{hb_pref}mk" and have no effect -in "%{hb_pref}cc" and "%{hb_pref}cmp". -Other options are passed to Harbour/C compiler/linker. - -An example compile/link session looks like: ----------------------------------------------------------------------- -druzus@uran:~/tmp$ cat foo.prg -function main() -? "Hello, World!" -return nil - -druzus@uran:~/tmp$ %{hb_pref}cmp foo -Harbour 1.0.0 Intl. (Rev. 9099) -Copyright (c) 1999-2008, http://www.harbour-project.org/ -Compiling 'foo.prg'... -Lines 5, Functions/Procedures 2 -Generating C source output to 'foo.c'... Done. - -druzus@uran:~/tmp$ %{hb_pref}lnk foo.o - -druzus@uran:~/tmp$ ls -l foo --rwxrwxr-x 1 druzus druzus 3824 maj 17 02:46 foo.exe ----------------------------------------------------------------------- - -or using %{hb_pref}mk only: ----------------------------------------------------------------------- -druzus@uran:~/tmp$ cat foo.prg -function main() -? "Hello, World!" -return nil - -druzus@uran:~/tmp$ %{hb_pref}mk foo -Harbour 1.0.0 Intl. (Rev. 9099) -Copyright (c) 1999-2008, http://www.harbour-project.org/ -Compiling 'foo.prg'... -Lines 5, Functions/Procedures 2 -Generating C source output to 'foo.c'... Done. - -druzus@uran:~/tmp$ ls -l foo --rwxrwxr-x 1 druzus druzus 3824 maj 17 02:46 foo.exe ----------------------------------------------------------------------- - -I hope this RPM is useful. Have fun with Harbour. - -Przemyslaw Czerpak (druzus/at/priv.onet.pl) -EOF - -###################################################################### -## Post install -###################################################################### -#%post lib -#/sbin/ldconfig - -###################################################################### -## Post uninstall -###################################################################### -#%postun lib -#/sbin/ldconfig - -###################################################################### -## Clean. -###################################################################### - -%clean -rm -fR $RPM_BUILD_ROOT - -###################################################################### -## File list. -###################################################################### - -%files -%defattr(-,root,root,755) -%doc doc/%{readme} - -%{_bindir}/%{hb_pref}-mkslib -%{_bindir}/%{hb_pref}-build -%{_bindir}/%{hb_pref}cc -%{_bindir}/%{hb_pref}cmp -%{_bindir}/%{hb_pref}lnk -%{_bindir}/%{hb_pref}mk - -%defattr(644,root,root,755) -%dir %{_includedir}/%{name} -%{_includedir}/%{name}/* -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/libhbcpage.a -%{_libdir}/%{name}/libhbcommon.a -%{_libdir}/%{name}/libhbcplr.a -%{_libdir}/%{name}/libhbdebug.a -%{_libdir}/%{name}/libhbfm.a -%{_libdir}/%{name}/libhbfmmt.a -%{_libdir}/%{name}/librddfpt.a -%{_libdir}/%{name}/librddcdx.a -%{_libdir}/%{name}/librddntx.a -%{_libdir}/%{name}/librddnsx.a -%{_libdir}/%{name}/libgt*.a -%{_libdir}/%{name}/libhblang.a -%{_libdir}/%{name}/libhbmacro.a -%{_libdir}/%{name}/libhbpcre.a -%{_libdir}/%{name}/libhbzlib.a -%{_libdir}/%{name}/libhbextern.a -%{_libdir}/%{name}/libhbnulrdd.a -%{_libdir}/%{name}/libhbpp.a -%{_libdir}/%{name}/libhbrdd.a -%{_libdir}/%{name}/libhbhsx.a -%{_libdir}/%{name}/libhbsix.a -%{_libdir}/%{name}/libhbrtl.a -%{_libdir}/%{name}/libhbvm.a -%{_libdir}/%{name}/libhbvmmt.a -%{_libdir}/%{name}/libhbmainstd.a -%{_libdir}/%{name}/libhbusrrdd.a -%{_libdir}/%{name}/libhbuddall.a - -%{!?_without_nf: %{_libdir}/%{name}/libhbnf.a} -%{?_with_ads: %{_libdir}/%{name}/librddads.a} -%{?_with_odbc: %{_libdir}/%{name}/libhbodbc.a} -%{?_with_mysql: %{_libdir}/%{name}/libhbmysql.a} -%{?_with_pgsql: %{_libdir}/%{name}/libhbpgsql.a} -%{?_with_gd: %{_libdir}/%{name}/libhbgd.a} -%{_libdir}/%{name}/libhbbtree.a -%{_libdir}/%{name}/libhbmisc.a -%{_libdir}/%{name}/libhbmzip.a -%{_libdir}/%{name}/libhbct.a -%{_libdir}/%{name}/libhbtip.a -%{_libdir}/%{name}/libxhb.a -%{_libdir}/%{name}/librddado.a -%{_libdir}/%{name}/libhbwin.a -%{_libdir}/%{name}/libhbvpdf.a -%{_libdir}/%{name}/libhbgt.a -%{_libdir}/%{name}/libhbbmcdx.a -%{_libdir}/%{name}/libhbclipsm.a -%{_libdir}/%{name}/libhbziparc.a - -%defattr(755,root,root,755) -%{_libdir}/%{name}/*.dll - -###################################################################### -## Spec file Changelog. -###################################################################### - -%changelog -* Thu Oct 23 2007 Przemyslaw Czerpak (druzus/at/priv.onet.pl) -- initial release +# +# $Id$ +# + +# --------------------------------------------------------------- +# Copyright 2007 Przemyslaw Czerpak (druzus/at/priv.onet.pl), +# Harbour-MinGW cross build RPM spec file +# +# See doc/license.txt for licensing terms. +# --------------------------------------------------------------- + +###################################################################### +# Conditional build: +# --with mysql - build mysql lib +# --with pgsql - build pgsql lib +# --with gd - build gd lib +# --with allegro - build GTALLEG - Allegro based GT driver +# --with ads - build ADS RDD +# --with odbc - build odbc lib +# --without nf - do not build nanforum lib +###################################################################### + +###################################################################### +## Definitions. +###################################################################### + +%define name harbour-win +%define version 1.1.0 +%define releasen dev +%define hb_pref hbw +%define hb_ccpath /opt/xmingw/bin +%define hb_ccpref i386-mingw- +%define hb_host www.harbour-project.org +%define readme README.RPM + +# Workaround for the problem of /usr/bin/strip not handling PE binaries. +%define __strip %{hb_ccpath}/%{hb_ccpref}strip +%define __objdump %{hb_ccpath}/%{hb_ccpref}objdump + +###################################################################### +## Preamble. +###################################################################### + +Summary: Free software Clipper compatible compiler +Summary(pl): Darmowy kompilator kompatybilny z językiem Clipper. +Name: %{name} +Version: %{version} +Release: %{releasen} +License: GPL (plus exception) +Group: Development/Languages +Vendor: %{hb_host} +URL: http://%{hb_host}/ +Source: harbour-%{version}.src.tar.gz +Packager: Przemysław Czerpak (druzus/at/priv.onet.pl) +BuildPrereq: gcc binutils bash +Requires: gcc binutils bash sh-utils harbour = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: %{name} +BuildRoot: /tmp/%{name}-%{version}-root + +%define _noautoreq 'libharbour.*' + +%description +Harbour is a CA-Cl*pper compatible compiler for multiple platforms. This +package includes a compiler, pre-processor, header files, virtual machine +and libraries for creating MS-Windows application in Linux box using MinGW +GCC port. + +%description -l pl +Harbour to kompatybilny z językiem CA-Cl*pper kompilator rozwijany na +wielu różnych platformach. Ten pakiet zawiera kompilator, preprocesor, +zbiory nagłówkowe, wirtualn+ maszynę oraz biblioteki pozwalaj+ce na +tworzenie aplikacji dla MS-Windows przy użyciu MinGW GCC. + + +###################################################################### +## Preperation. +###################################################################### + +%prep +%setup -c harbour +rm -fR $RPM_BUILD_ROOT + +###################################################################### +## Build. +###################################################################### + +%build + +export HB_HOST_BUILD=yes +export HB_ARCHITECTURE=linux +export HB_COMPILER=gcc +export C_USR="-O2 -DHB_FM_STATISTICS_OFF" +make -r + +export HB_HOST_BUILD=lib +export HB_ARCHITECTURE=win +export HB_COMPILER=mingw + +mkdir -p source/pp/${HB_ARCHITECTURE}/${HB_COMPILER} +ln -s ../../linux/gcc/hbpp source/pp/${HB_ARCHITECTURE}/${HB_COMPILER}/hbpp.exe +mkdir -p source/main/${HB_ARCHITECTURE}/${HB_COMPILER} +ln -s ../../linux/gcc/harbour source/main/${HB_ARCHITECTURE}/${HB_COMPILER}/harbour.exe + +export CC_C_USR="" +export C_USR="$CC_C_USR -O2 -DHB_FM_STATISTICS_OFF" +export CC_PRG_USR="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX" +export PRG_USR="$CC_PRG_USR" +export L_USR="${CC_L_USR}" + +export CCPATH="%{hb_ccpath}:" +export CCPREFIX="%{hb_ccpref}" +export PATH="$CCPATH$PATH" + +export HB_XBUILD=win +export HB_BIN_INSTALL=%{_bindir} +export HB_INC_INSTALL=%{_includedir}/%{name} +export HB_LIB_INSTALL=%{_libdir}/%{name} +export HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbwin hbziparc rddado xhb %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" + +make -r + +###################################################################### +## Install. +###################################################################### + +%install + +# Install harbour itself. + +export CC_C_USR="" +export C_USR="$CC_C_USR -O2 -DHB_FM_STATISTICS_OFF" +export CC_PRG_USR="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX" +export PRG_USR="$CC_PRG_USR" +export L_USR="${CC_L_USR}" + +export CCPATH="%{hb_ccpath}:" +export CCPREFIX="%{hb_ccpref}" +export PATH="$CCPATH$PATH" + +export HB_HOST_BUILD=lib +export HB_ARCHITECTURE=win +export HB_COMPILER=mingw +export HB_XBUILD=win +export HB_BIN_INSTALL=%{_bindir} +export HB_INC_INSTALL=%{_includedir}/%{name} +export HB_LIB_INSTALL=%{_libdir}/%{name} +export HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbwin hbziparc rddado xhb %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" + +export _DEFAULT_BIN_DIR=$HB_BIN_INSTALL +export _DEFAULT_INC_DIR=$HB_INC_INSTALL +export _DEFAULT_LIB_DIR=$HB_LIB_INSTALL +export HB_BIN_INSTALL=$RPM_BUILD_ROOT/$HB_BIN_INSTALL +export HB_INC_INSTALL=$RPM_BUILD_ROOT/$HB_INC_INSTALL +export HB_LIB_INSTALL=$RPM_BUILD_ROOT/$HB_LIB_INSTALL +export HB_TOOLS_PREF=%{hb_pref} + +mkdir -p $HB_BIN_INSTALL +mkdir -p $HB_INC_INSTALL +mkdir -p $HB_LIB_INSTALL + +make -r -i install + +[ "%{?_with_odbc:1}" ] || rm -f $HB_LIB_INSTALL/libhbodbc.a +[ "%{?_with_allegro:1}" ] || rm -f $HB_LIB_INSTALL/libgtalleg.a +[ "%{?_with_ads:1}" ] || rm -f $HB_LIB_INSTALL/librddads.a +[ "%{?_without_nf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a + +# Keep the size of the libraries to a minimim. +${CCPREFIX}strip --strip-debug $HB_LIB_INSTALL/* + +# remove unused files +rm -fR ${HB_BIN_INSTALL}/{harbour,hbpp,hbdoc,hbmake,hbrun,hbi18n,hbtest}.exe + +# Create a README file for people using this RPM. +cat > doc/%{readme} < # output file name +-static # link with static Harbour libs +-fullstatic # link with all static libs +-shared # link with shared libs (default) +-mt # link with multi-thread libs +-gt # link with GT driver, can be repeated to + # link with more GTs. The first one will be + # the default at runtime +-xbgtk # link with xbgtk library (xBase GTK+ interface) +-hwgui # link with HWGUI library (GTK+ interface) +-l # link with library +-L # additional path to search for libraries +-fmstat # link with the memory statistics lib +-nofmstat # do not link with the memory statistics lib (default) +-[no]strip # strip (no strip) binaries +-main= # set the name of main program function/procedure. + # if not set then 'MAIN' is used or if it doesn't + # exist the name of first public function/procedure + # in first linked object module (link) + +Link options work only with "%{hb_pref}lnk" and "%{hb_pref}mk" and have no effect +in "%{hb_pref}cc" and "%{hb_pref}cmp". +Other options are passed to Harbour/C compiler/linker. + +An example compile/link session looks like: +---------------------------------------------------------------------- +druzus@uran:~/tmp$ cat foo.prg +function main() +? "Hello, World!" +return nil + +druzus@uran:~/tmp$ %{hb_pref}cmp foo +Harbour 1.0.0 Intl. (Rev. 9099) +Copyright (c) 1999-2008, http://www.harbour-project.org/ +Compiling 'foo.prg'... +Lines 5, Functions/Procedures 2 +Generating C source output to 'foo.c'... Done. + +druzus@uran:~/tmp$ %{hb_pref}lnk foo.o + +druzus@uran:~/tmp$ ls -l foo +-rwxrwxr-x 1 druzus druzus 3824 maj 17 02:46 foo.exe +---------------------------------------------------------------------- + +or using %{hb_pref}mk only: +---------------------------------------------------------------------- +druzus@uran:~/tmp$ cat foo.prg +function main() +? "Hello, World!" +return nil + +druzus@uran:~/tmp$ %{hb_pref}mk foo +Harbour 1.0.0 Intl. (Rev. 9099) +Copyright (c) 1999-2008, http://www.harbour-project.org/ +Compiling 'foo.prg'... +Lines 5, Functions/Procedures 2 +Generating C source output to 'foo.c'... Done. + +druzus@uran:~/tmp$ ls -l foo +-rwxrwxr-x 1 druzus druzus 3824 maj 17 02:46 foo.exe +---------------------------------------------------------------------- + +I hope this RPM is useful. Have fun with Harbour. + +Przemyslaw Czerpak (druzus/at/priv.onet.pl) +EOF + +###################################################################### +## Post install +###################################################################### +#%post lib +#/sbin/ldconfig + +###################################################################### +## Post uninstall +###################################################################### +#%postun lib +#/sbin/ldconfig + +###################################################################### +## Clean. +###################################################################### + +%clean +rm -fR $RPM_BUILD_ROOT + +###################################################################### +## File list. +###################################################################### + +%files +%defattr(-,root,root,755) +%doc doc/%{readme} + +%{_bindir}/%{hb_pref}-mkslib +%{_bindir}/%{hb_pref}-build +%{_bindir}/%{hb_pref}cc +%{_bindir}/%{hb_pref}cmp +%{_bindir}/%{hb_pref}lnk +%{_bindir}/%{hb_pref}mk + +%defattr(644,root,root,755) +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/* +%dir %{_libdir}/%{name} +%{_libdir}/%{name}/libhbcpage.a +%{_libdir}/%{name}/libhbcommon.a +%{_libdir}/%{name}/libhbcplr.a +%{_libdir}/%{name}/libhbdebug.a +%{_libdir}/%{name}/libhbfm.a +%{_libdir}/%{name}/libhbfmmt.a +%{_libdir}/%{name}/librddfpt.a +%{_libdir}/%{name}/librddcdx.a +%{_libdir}/%{name}/librddntx.a +%{_libdir}/%{name}/librddnsx.a +%{_libdir}/%{name}/libgt*.a +%{_libdir}/%{name}/libhblang.a +%{_libdir}/%{name}/libhbmacro.a +%{_libdir}/%{name}/libhbpcre.a +%{_libdir}/%{name}/libhbzlib.a +%{_libdir}/%{name}/libhbextern.a +%{_libdir}/%{name}/libhbnulrdd.a +%{_libdir}/%{name}/libhbpp.a +%{_libdir}/%{name}/libhbrdd.a +%{_libdir}/%{name}/libhbhsx.a +%{_libdir}/%{name}/libhbsix.a +%{_libdir}/%{name}/libhbrtl.a +%{_libdir}/%{name}/libhbvm.a +%{_libdir}/%{name}/libhbvmmt.a +%{_libdir}/%{name}/libhbmainstd.a +%{_libdir}/%{name}/libhbusrrdd.a +%{_libdir}/%{name}/libhbuddall.a + +%{!?_without_nf: %{_libdir}/%{name}/libhbnf.a} +%{?_with_ads: %{_libdir}/%{name}/librddads.a} +%{?_with_odbc: %{_libdir}/%{name}/libhbodbc.a} +%{?_with_mysql: %{_libdir}/%{name}/libhbmysql.a} +%{?_with_pgsql: %{_libdir}/%{name}/libhbpgsql.a} +%{?_with_gd: %{_libdir}/%{name}/libhbgd.a} +%{_libdir}/%{name}/libhbbtree.a +%{_libdir}/%{name}/libhbmisc.a +%{_libdir}/%{name}/libhbmzip.a +%{_libdir}/%{name}/libhbct.a +%{_libdir}/%{name}/libhbtip.a +%{_libdir}/%{name}/libxhb.a +%{_libdir}/%{name}/librddado.a +%{_libdir}/%{name}/libhbwin.a +%{_libdir}/%{name}/libhbvpdf.a +%{_libdir}/%{name}/libhbgt.a +%{_libdir}/%{name}/libhbbmcdx.a +%{_libdir}/%{name}/libhbclipsm.a +%{_libdir}/%{name}/libhbziparc.a + +%defattr(755,root,root,755) +%{_libdir}/%{name}/*.dll + +###################################################################### +## Spec file Changelog. +###################################################################### + +%changelog +* Thu Oct 23 2007 Przemyslaw Czerpak (druzus/at/priv.onet.pl) +- initial release diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak index 45af3970a4..926daf1784 100644 --- a/harbour/make_b32.mak +++ b/harbour/make_b32.mak @@ -47,7 +47,7 @@ #********************************************************** -HB_ARCHITECTURE = w32 +HB_ARCHITECTURE = win #********************************************************** diff --git a/harbour/make_gcc.mak b/harbour/make_gcc.mak index 059c5ec102..60bf9eb0d6 100644 --- a/harbour/make_gcc.mak +++ b/harbour/make_gcc.mak @@ -81,8 +81,8 @@ endif # *before* common.cf is included OBJEXT=.o -EXEEXT=$(if $(findstring $(HB_ARCHITECTURE),w32 dos os2),.exe) -DLLEXT=$(if $(findstring $(HB_ARCHITECTURE),w32 dos os2),.dll,.so) +EXEEXT=$(if $(findstring $(HB_ARCHITECTURE),win dos os2),.exe) +DLLEXT=$(if $(findstring $(HB_ARCHITECTURE),win dos os2),.dll,.so) LIBEXT=.a LIBPREF=lib @@ -103,7 +103,7 @@ include common.cf # building CONSOLE programs. Otherwise we're building # GUI programs without console. Please note IT IS A # DIRTY HACK and any better solution is HIGHLY WELCOME -ifneq ($(findstring $(HB_ARCHITECTURE),w32 os2),) +ifneq ($(findstring $(HB_ARCHITECTURE),win os2),) MAIN_LIB = $(LIB_DIR)/$(LIBPREF)hbmainstd$(LIBEXT) MAIN_LIB_OBJS = $(OBJ_DIR)/mainstd$(OBJEXT) @@ -141,7 +141,7 @@ endif # DLLs on Windows require IMPORT lib # and an additional compiler phase -ifneq ($(findstring $(HB_ARCHITECTURE),w32),) +ifneq ($(findstring $(HB_ARCHITECTURE),win),) HB_DLL_IMPLIB := $(HARBOUR_DLL:%$(DLLEXT)=%$(LIBEXT)) HB_IMPLIB_PART := -Wl,--out-implib,$(HB_DLL_IMPLIB) HB_DLL_IMPLIBMT := $(HARBOURMT_DLL:%$(DLLEXT)=%$(LIBEXT)) @@ -156,7 +156,7 @@ CFLAGS := -W -Wall -I$(INCLUDE_DIR) $(C_USR) -I$(OBJ_DIR) CFLAGSMT := -DHB_MT_VM #----------- ifneq ($(HB_BUILD_OPTIM),no) -ifeq ($(HB_ARCHITECTURE),w32) +ifeq ($(HB_ARCHITECTURE),win) CFLAGS := -march=i586 $(CFLAGS) endif CFLAGS := -O3 $(CFLAGS) @@ -172,7 +172,7 @@ CEXEFLAGSDLL := $(CFLAGS) # Under architectures other than "DOS based" add -fPIC # to gcc compiler flags for compiling shared libraries -ifeq ($(findstring $(HB_ARCHITECTURE),w32 os2),) +ifeq ($(findstring $(HB_ARCHITECTURE),win os2),) ifeq ($(findstring -fPIC,$(CLIBFLAGSDLL)),) CLIBFLAGSDLL := -fPIC $(CLIBFLAGSDLL) endif @@ -326,7 +326,7 @@ $(VM_LIB) : $(VM_LIB_OBJS) $(VMMT_LIB) : $(VMMT_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -ifneq ($(findstring $(HB_ARCHITECTURE),w32 os2),) +ifneq ($(findstring $(HB_ARCHITECTURE),win os2),) $(MAIN_LIB) : $(MAIN_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ endif diff --git a/harbour/make_gcc.sh b/harbour/make_gcc.sh index a13e9c53d6..4aa022b6f3 100755 --- a/harbour/make_gcc.sh +++ b/harbour/make_gcc.sh @@ -9,9 +9,9 @@ # --------------------------------------------------------------- # Compatibility. Please use 'win'. -if [ "$HB_ARCHITECTURE" == "win" ] +if [ "$HB_ARCHITECTURE" == "w32" ] then - export HB_ARCHITECTURE=w32 + export HB_ARCHITECTURE=win fi if [ -z "$HB_ARCHITECTURE" ]; then @@ -20,7 +20,7 @@ if [ -z "$HB_ARCHITECTURE" ]; then else hb_arch=`uname -s | tr -d "[-]" | tr '[A-Z]' '[a-z]' 2>/dev/null` case "$hb_arch" in - *windows*|*mingw32*|msys*) hb_arch="w32" ;; + *windows*|*mingw32*|msys*) hb_arch="win" ;; *cygwin*) hb_arch="cyg" ;; *os/2*) hb_arch="os2" ;; *dos) hb_arch="dos" ;; @@ -32,7 +32,7 @@ fi if [ -z "$HB_CC_NAME" ]; then case "$HB_ARCHITECTURE" in - w32) HB_CC_NAME="mingw" ;; + win) HB_CC_NAME="mingw" ;; dos) HB_CC_NAME="djgpp" ;; *) HB_CC_NAME="gcc" ;; esac @@ -74,7 +74,7 @@ OS_LIBS="-lm" GT_LIST="TRM" case "$HB_ARCHITECTURE" in - w32) GT_LIST="WIN WVT GUI" + win) GT_LIST="WIN WVT GUI" OS_LIBS="-luser32 -lwinspool -lwsock32 -lgdi32" ;; cyg) GT_LIST="${GT_LIST} WIN WVT GUI" @@ -174,11 +174,11 @@ mkdir -p obj/$HB_CC_NAME/mt obj/$HB_CC_NAME/mt_dll obj/$HB_CC_NAME/dll \ # Convert common.mak (for BCC/VC) to common.cf (GCC) -# Revert Cygwin architecture to w32. +# Revert Cygwin architecture to 'win'. # After all it's under Windows OS. if [ "$HB_ARCHITECTURE" == "cyg" ] then - export HB_ARCHITECTURE=w32 + export HB_ARCHITECTURE=win fi sed -e 's/;/ /g' \ diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat index 569a8437ea..9c6dbde61b 100644 --- a/harbour/make_gnu.bat +++ b/harbour/make_gnu.bat @@ -1,13 +1,13 @@ @echo off -rem +rem rem $Id$ -rem +rem rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs +rem This is a generic template file, if it doesn't fit your own needs rem please DON'T MODIFY IT. rem -rem Instead, make a local copy and modify that one, or make a call to +rem Instead, make a local copy and modify that one, or make a call to rem this batch file from your customized one. [vszakats] rem --------------------------------------------------------------- @@ -22,11 +22,11 @@ rem Copyright 1999-2001 Viktor Szakats (viktor.szakats@syenar.hu) rem See doc/license.txt for licensing terms. rem --------------------------------------------------------------- -if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=w32 +if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=win if "%HB_COMPILER%" == "" set HB_COMPILER=mingw -rem set PRG_USR= -rem set C_USR= +rem set PRG_USR= +rem set C_USR= rem set L_USR= rem Set to constant value to be consistent with the non-GNU make files. @@ -58,23 +58,23 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%/include echo The following values are currently supported: echo. echo HB_ARCHITECTURE: - echo - dos - echo - w32 + echo - dos + echo - win echo - linux - echo - os2 - echo. - pause + echo - os2 + echo. + pause echo HB_COMPILER: echo - When HB_ARCHITECTURE=dos echo - bcc16 (Borland C++ 3.x, 4.x, 5.0x, DOS 16-bit) echo - djgpp (Delorie GNU C, DOS 32-bit) echo - rxs32 (EMX/RSXNT/DOS GNU C, DOS 32-bit) echo - watcom (Watcom C++ 9.x, 10.x, 11.x, DOS 32-bit) - echo - When HB_ARCHITECTURE=w32 + echo - When HB_ARCHITECTURE=win echo - bcc32 (Borland C++ 4.x, 5.x, Windows 32-bit) echo - gcc (Cygnus/Cygwin GNU C, Windows 32-bit) echo - mingw (MinGW GNU C, Windows 32-bit) - echo - rxsnt (EMX/RSXNT/Win32 GNU C, Windows 32-bit) + echo - rxsnt (EMX/RSXNT/Windows GNU C, Windows 32-bit) echo - icc (IBM Visual Age C++, Windows 32-bit) echo - msvc (Microsoft Visual C++, Windows 32-bit) echo - When HB_ARCHITECTURE=linux @@ -82,7 +82,7 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%/include echo - When HB_ARCHITECTURE=os2 echo - gcc (EMX GNU C, OS/2 32-bit) echo - icc (IBM Visual Age C++ 3.0, OS/2 32-bit) - echo. + echo. echo - Use these optional envvars to configure the make process echo when using the 'all' command: echo. diff --git a/harbour/make_gnu.sh b/harbour/make_gnu.sh index 41380b7aaa..895a282c88 100755 --- a/harbour/make_gnu.sh +++ b/harbour/make_gnu.sh @@ -16,9 +16,9 @@ # --------------------------------------------------------------- # Compatibility. Please use 'win'. -if [ "$HB_ARCHITECTURE" == "win" ] +if [ "$HB_ARCHITECTURE" == "w32" ] then - export HB_ARCHITECTURE=w32 + export HB_ARCHITECTURE=win fi if [ -z "$HB_ARCHITECTURE" ]; then @@ -27,7 +27,7 @@ if [ -z "$HB_ARCHITECTURE" ]; then else hb_arch=`uname -s | tr -d "[-]" | tr '[A-Z]' '[a-z]' 2>/dev/null` case "$hb_arch" in - *windows*|*mingw32*|msys*) hb_arch="w32" ;; + *windows*|*mingw32*|msys*) hb_arch="win" ;; *os/2*) hb_arch="os2" ;; *dos) hb_arch="dos" ;; *bsd) hb_arch="bsd" ;; @@ -38,7 +38,7 @@ fi if [ -z "$HB_COMPILER" ]; then case "$HB_ARCHITECTURE" in - w32) HB_COMPILER="mingw" ;; + win) HB_COMPILER="mingw" ;; dos) HB_COMPILER="djgpp" ;; *) HB_COMPILER="gcc" ;; esac @@ -162,7 +162,7 @@ if [ -z "$HB_ARCHITECTURE" ] || [ -z "$HB_COMPILER" ]; then echo echo " HB_ARCHITECTURE:" echo " - dos" - echo " - w32" + echo " - win" echo " - os2" echo " - linux" echo " - bsd" @@ -177,7 +177,7 @@ if [ -z "$HB_ARCHITECTURE" ] || [ -z "$HB_COMPILER" ]; then echo " - djgpp (Delorie GNU C, DOS 32-bit)" echo " - rsx32 (EMX/RSXNT/DOS GNU C, DOS 32-bit)" echo " - owatcom (Watcom C++ 9.x, 10.x, 11.x, DOS 32-bit)" - echo " - When HB_ARCHITECTURE=w32" + echo " - When HB_ARCHITECTURE=win" echo " - bcc32 (Borland C++ 4.x, 5.x, Windows 32-bit)" echo " - gcc (Cygnus/Cygwin GNU C, Windows 32-bit)" echo " - mingw (MinGW GNU C, Windows 32-bit)" diff --git a/harbour/make_gnu_xmingw.sh b/harbour/make_gnu_xmingw.sh index b433d973d0..d215eea6dd 100755 --- a/harbour/make_gnu_xmingw.sh +++ b/harbour/make_gnu_xmingw.sh @@ -17,7 +17,7 @@ UNAME=`uname` UNAMEL=`echo "$UNAME"|tr A-Z a-z` UNAMEU=`echo "$UNAME"|tr a-z A-Z` -export HB_ARCHITECTURE=w32 +export HB_ARCHITECTURE=win export HB_COMPILER=mingw if [ "$OSTYPE" = "msdosdjgpp" ]; then @@ -27,14 +27,14 @@ else HB_HOST_ARCH="${UNAMEL}" HB_HOST_CC="gcc" case "$HB_HOST_ARCH" in - *windows*|*mingw32*|msys*) HB_HOST_ARCH="w32"; HB_HOST_CC="mingw" ;; + *windows*|*mingw32*|msys*) HB_HOST_ARCH="win"; HB_HOST_CC="mingw" ;; *dos) HB_HOST_ARCH="dos" ;; *bsd) HB_HOST_ARCH="bsd" ;; esac fi CC_PRG_USR="" -if [ "$HB_HOST_ARCH" != "w32" ]; then +if [ "$HB_HOST_ARCH" != "win" ]; then CC_PRG_USR="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__$UNAMEU" fi @@ -108,7 +108,7 @@ PATH="$CCPATH$PATH" export PATH CCPATH CCPREFIX export HB_TOOLS_PREF="hbw" -export HB_XBUILD="w32" +export HB_XBUILD="win" [ "${HB_HOST_BUILD}" = "all" ] || export HB_HOST_BUILD="lib" export HB_BIN_COMPILE="/tmp/hb-xmingw-$$" diff --git a/harbour/make_gnu_xmingwce.sh b/harbour/make_gnu_xmingwce.sh index 730ae87ec3..04e22de796 100755 --- a/harbour/make_gnu_xmingwce.sh +++ b/harbour/make_gnu_xmingwce.sh @@ -17,7 +17,7 @@ UNAME=`uname` UNAMEL=`echo "$UNAME"|tr A-Z a-z` UNAMEU=`echo "$UNAME"|tr a-z A-Z` -export HB_ARCHITECTURE=w32 +export HB_ARCHITECTURE=win export HB_COMPILER=mingwce if [ "$OSTYPE" = "msdosdjgpp" ]; then @@ -27,14 +27,14 @@ else HB_HOST_ARCH="${UNAMEL}" HB_HOST_CC="gcc" case "$HB_HOST_ARCH" in - *windows*|*mingw32*|msys*) HB_HOST_ARCH="w32"; HB_HOST_CC="mingw" ;; + *windows*|*mingw32*|msys*) HB_HOST_ARCH="win"; HB_HOST_CC="mingw" ;; *dos) HB_HOST_ARCH="dos" ;; *bsd) HB_HOST_ARCH="bsd" ;; esac fi CC_PRG_USR="-D__PLATFORM__WINCE" -if [ "$HB_HOST_ARCH" != "w32" ]; then +if [ "$HB_HOST_ARCH" != "win" ]; then CC_PRG_USR="$CC_PRG_USR -D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__$UNAMEU" fi diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak index c00c9107c1..768f84af6e 100644 --- a/harbour/make_vc.mak +++ b/harbour/make_vc.mak @@ -46,7 +46,7 @@ #********************************************************** -HB_ARCHITECTURE = w32 +HB_ARCHITECTURE = win #********************************************************** diff --git a/harbour/mpkg_tgz.sh b/harbour/mpkg_tgz.sh index d567c5c561..8b84f1bae6 100755 --- a/harbour/mpkg_tgz.sh +++ b/harbour/mpkg_tgz.sh @@ -42,7 +42,7 @@ if [ -z "$HB_ARCHITECTURE" ]; then else hb_arch=`uname -s | tr -d "[-]" | tr '[A-Z]' '[a-z]' 2>/dev/null` case "$hb_arch" in - *windows*|*mingw32*|msys*) hb_arch="w32" ;; + *windows*|*mingw32*|msys*) hb_arch="win" ;; *os/2*) hb_arch="os2" ;; *dos) hb_arch="dos" ;; *bsd) hb_arch="bsd" ;; @@ -53,7 +53,7 @@ fi if [ -z "$HB_COMPILER" ]; then case "$HB_ARCHITECTURE" in - w32) HB_COMPILER="mingw" ;; + win) HB_COMPILER="mingw" ;; dos) HB_COMPILER="djgpp" ;; *) HB_COMPILER="gcc" ;; esac @@ -103,7 +103,7 @@ case "$HB_ARCHITECTURE" in [ -d "$HB_INSTALL_PREFIX/lib64" ] && [ "${HB_ARCH64}" = yes ] && HB_LIBDIRNAME="lib64" HB_INSTALL_GROUP=root ;; - w32) + win) [ -z "$HB_INSTALL_PREFIX" ] && HB_INSTALL_PREFIX="/usr/local" HB_INSTALL_GROUP=0 hb_sysdir="no" @@ -179,7 +179,7 @@ case "$HB_ARCHITECTURE" in fi [ -z "$HB_WITHOUT_X11" ] && export HB_WITHOUT_X11=yes ;; - dos|w32) + dos|win) [ -z "$HB_WITHOUT_X11" ] && export HB_WITHOUT_X11=yes ;; *) @@ -263,10 +263,10 @@ if [ "${hb_lnkso}" = yes ] then case $HB_ARCHITECTURE in darwin) ADD_LIBS="$ADD_LIBS -lncurses -L/opt/local/lib -L/sw/lib" ;; - dos|w32) ADD_LIBS="" ;; + dos|win) ADD_LIBS="" ;; sunos) ADD_LIBS="$ADD_LIBS -lcurses" ;; *) ADD_LIBS="$ADD_LIBS -lncurses" ;; - esac + esac [ "${HB_GPM_MOUSE}" = yes ] && ADD_LIBS="$ADD_LIBS -lgpm" [ "${HB_WITHOUT_GTSLN}" != yes ] && ADD_LIBS="$ADD_LIBS -lslang" [ "${HB_WITHOUT_X11}" != yes ] && ADD_LIBS="$ADD_LIBS -L/usr/X11R6/$HB_LIBDIRNAME -lX11" diff --git a/harbour/source/vm/Makefile b/harbour/source/vm/Makefile index 0f08002d5f..07b662dac9 100644 --- a/harbour/source/vm/Makefile +++ b/harbour/source/vm/Makefile @@ -4,7 +4,7 @@ ROOT = ../../ -ifeq ($(HB_ARCHITECTURE),w32) +ifeq ($(HB_ARCHITECTURE),win) ifeq ($(HB_COMPILER),mingw) C_MAIN = mainwin.c DIRS = mainstd diff --git a/harbour/source/vm/vmmt/Makefile b/harbour/source/vm/vmmt/Makefile index 9c5df2b02d..d9ac71a5c1 100644 --- a/harbour/source/vm/vmmt/Makefile +++ b/harbour/source/vm/vmmt/Makefile @@ -7,7 +7,7 @@ vpath %.prg ../ ROOT = ../../../ -ifeq ($(HB_ARCHITECTURE),w32) +ifeq ($(HB_ARCHITECTURE),win) ifeq ($(HB_COMPILER),mingw) C_MAIN = mainwin.c else