fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-07-04 20:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* INSTALL
  * external/Makefile
  * contrib/Makefile
  * utils/Makefile
    - Deleted HB_CONTRIB_ADDONS, HB_EXTERNAL_ADDONS,
      HB_UTIL_ADDONS.
    + Documented HB_ADDONS_LIB, HB_ADDONS_BIN (still not
      necessarily the final names)

  * package/winuni/mpkg_win_uni_extra_copy.bat
  * package/winuni/mpkg_win_uni.bat
  * package/winuni/mpkg_win_uni.nsi
    + Included hbnetio in Windows based installers.
      (.zip already had it after previous changes)

  * package/winuni/mpkg_win_uni_extra_copy.bat
  * package/winuni/mpkg_win_uni.bat
  * package/winuni/mpkg_win_uni.nsi
  * config/postinst.hbs
    - Deleted building hbrun-dll. It makes simpler,
      won't be missed by too many users. Users needing
      fully shared binaries can use HB_BUILD_SHARED=yes.
This commit is contained in:
Viktor Szakats
2010-07-04 18:48:39 +00:00
parent 86ef92953f
commit abba1977a2
9 changed files with 33 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
harbour/ChangeLog
View File

@@ -16,6 +16,30 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-07-04 20:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
* external/Makefile
* contrib/Makefile
* utils/Makefile
- Deleted HB_CONTRIB_ADDONS, HB_EXTERNAL_ADDONS,
HB_UTIL_ADDONS.
+ Documented HB_ADDONS_LIB, HB_ADDONS_BIN (still not
necessarily the final names)
* package/winuni/mpkg_win_uni_extra_copy.bat
* package/winuni/mpkg_win_uni.bat
* package/winuni/mpkg_win_uni.nsi
+ Included hbnetio in Windows based installers.
(.zip already had it after previous changes)
* package/winuni/mpkg_win_uni_extra_copy.bat
* package/winuni/mpkg_win_uni.bat
* package/winuni/mpkg_win_uni.nsi
* config/postinst.hbs
- Deleted building hbrun-dll. It makes simpler,
won't be missed by too many users. Users needing
fully shared binaries can use HB_BUILD_SHARED=yes.
2010-07-04 19:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/makefile.hbs
! Fixed to pass -inc option in install phase.

10
harbour/INSTALL
View File

@@ -650,16 +650,14 @@ HARBOUR
contrib libraries.
- HB_CONTRIBLIBS=[<list>] Build space separated <list> of contrib
libraries. Build all if left empty (default).
- HB_CONTRIB_ADDONS=<list> Build space separated <list> of additional
libraries stored in the contrib directory.
- HB_EXTERNALLIBS=no <list> Don't build space separated <list> of
external libraries.
- HB_EXTERNALLIBS=[<list>] Build space separated <list> of external
libraries. Build all if left empty (default).
- HB_EXTERNAL_ADDONS=<list> Build space separated <list> of additional
libraries stored in the external directory.
- HB_UTIL_ADDONS=<list> Build space separated <list> of additional
utilities stored in the utils directory.
- HB_ADDONS_LIB=<list> Build space separated <list> of additional
library .hbp projects.
- HB_ADDONS_BIN=<list> Build space separated <list> of additional
executable .hbp projects.
- HB_COMPILER_VER=[<ver>] Set C compiler version. This is used with msvc
and mingw/cygwin targets currently.
<ver> format:

38
harbour/config/postinst.hbs
View File

@@ -24,7 +24,6 @@ PROCEDURE Main()
LOCAL aFile
LOCAL tmp
LOCAL cOptions
LOCAL cOldDir
LOCAL lContent
@@ -91,43 +90,6 @@ PROCEDURE Main()
NEXT
ENDIF
/* Converting build options to hbmk2 options */
cOptions := ""
IF GetEnv( "HB_BUILD_MODE" ) == "cpp"
cOptions += " -cpp=yes"
ELSEIF GetEnv( "HB_BUILD_MODE" ) == "c"
cOptions += " -cpp=no"
ENDIF
IF GetEnv( "HB_BUILD_DEBUG" ) == "yes"
cOptions += " -debug"
ENDIF
/* Creating shared version of Harbour binaries
(except one which have shared versions build by default and hbmk2) */
IF GetEnv( "HB_PLATFORM" ) $ "win|wce|os2" .AND. ;
!( GetEnv( "HB_BUILD_DLL" ) == "no" ) .AND. ;
!( GetEnv( "HB_BUILD_SHARED" ) == "yes" ) .AND. ;
! Empty( GetEnv( "HB_HOST_BIN_DIR" ) )
OutStd( "! Making shared version of Harbour binaries..." + hb_osNewLine() )
FOR EACH tmp IN Directory( "utils" + _PS_ + hb_osFileMask(), "D" )
IF "D" $ tmp[ F_ATTR ] .AND. ;
!( tmp[ F_NAME ] == "." ) .AND. ;
!( tmp[ F_NAME ] == ".." ) .AND. ;
!( tmp[ F_NAME ] $ "hbformat|hbi18n|hbtest|hbmk2" ) .AND. ;
hb_FileExists( "utils" + _PS_ + tmp[ F_NAME ] + _PS_ + tmp[ F_NAME ] + ".hbp" )
mk_hb_processRun( PathSepToSelf( GetEnv( "HB_HOST_BIN_DIR" ) ) + _PS_ + "hbmk2" +;
" -quiet -lang=en -q0 -shared" + cOptions +;
" utils/" + tmp[ F_NAME ] + "/" + tmp[ F_NAME ] + ".hbp" +;
" -o${HB_BIN_INSTALL}/" + tmp[ F_NAME ] + "-dll" )
ENDIF
NEXT
ENDIF
/* Creating install packages */
IF GetEnv( "HB_PLATFORM" ) $ "win|wce|os2|dos" .AND. ;

2
harbour/contrib/Makefile
View File

@@ -73,8 +73,6 @@ endif
endif
endif
DIRS += $(HB_CONTRIB_ADDONS)
ifneq ($(DIRS),)
include $(TOP)$(ROOT)config/dir.mk
else

3
harbour/external/Makefile vendored
View File

@@ -4,7 +4,6 @@
ROOT := ../
# standalone contribs
DIRS := \
sqlite3 \
bzip2 \
@@ -23,8 +22,6 @@ ifneq ($(HB_EXTERNALLIBS),)
endif
endif
DIRS += $(HB_EXTERNAL_ADDONS)
ifneq ($(DIRS),)
include $(TOP)$(ROOT)config/dir.mk
else

4
harbour/package/winuni/mpkg_win_uni.bat
View File

@@ -27,9 +27,9 @@ echo "hb21\bin\hbmk2.exe" >> _hbfiles
echo "hb21\bin\hbmk2.*.hbl" >> _hbfiles
echo "hb21\bin\hbpp.exe" >> _hbfiles
echo "hb21\bin\hbrun.exe" >> _hbfiles
echo "hb21\bin\hbrun-dll.exe" >> _hbfiles
echo "hb21\bin\hbtest.exe" >> _hbfiles
echo "hb21\bin\hbformat.exe" >> _hbfiles
echo "hb21\bin\hbnetio.exe" >> _hbfiles
if exist "hb21\bin\hbmk.hbc" echo "hb21\bin\hbmk.hbc" >> _hbfiles
echo "hb21\bin\upx*.*" >> _hbfiles
echo "hb21\include\*.*" >> _hbfiles
@@ -38,9 +38,9 @@ echo "hb21\bin\hbi18n-x64.exe" >> _hbfiles
echo "hb21\bin\hbmk2-x64.exe" >> _hbfiles
echo "hb21\bin\hbpp-x64.exe" >> _hbfiles
echo "hb21\bin\hbrun-x64.exe" >> _hbfiles
echo "hb21\bin\hbrun-dll-x64.exe" >> _hbfiles
echo "hb21\bin\hbtest-x64.exe" >> _hbfiles
echo "hb21\bin\hbformat-x64.exe" >> _hbfiles
echo "hb21\bin\hbnetio-x64.exe" >> _hbfiles
echo "hb21\lib\win\mingw\*.*" >> _hbfiles
echo "hb21\lib\win\mingw64\*.*" >> _hbfiles
echo "hb21\lib\wce\mingwarm\*.*" >> _hbfiles

4
harbour/package/winuni/mpkg_win_uni.nsi
View File

@@ -104,9 +104,9 @@ Section "Main components" hb_main
File "$%HB_ROOT%hb21\bin\hbmk2.*.hbl"
File "$%HB_ROOT%hb21\bin\hbpp.exe"
File "$%HB_ROOT%hb21\bin\hbrun.exe"
File "$%HB_ROOT%hb21\bin\hbrun-dll.exe"
File "$%HB_ROOT%hb21\bin\hbtest.exe"
File "$%HB_ROOT%hb21\bin\hbformat.exe"
File "$%HB_ROOT%hb21\bin\hbnetio.exe"
File /nonfatal "$%HB_ROOT%hb21\bin\hbmk.hbc"
File "$%HB_ROOT%hb21\bin\upx*.*"
@@ -139,9 +139,9 @@ Section /o "x64 tools" hb_main_x64
File "$%HB_ROOT%hb21\bin\hbmk2-x64.exe"
File "$%HB_ROOT%hb21\bin\hbpp-x64.exe"
File "$%HB_ROOT%hb21\bin\hbrun-x64.exe"
File "$%HB_ROOT%hb21\bin\hbrun-dll-x64.exe"
File "$%HB_ROOT%hb21\bin\hbtest-x64.exe"
File "$%HB_ROOT%hb21\bin\hbformat-x64.exe"
File "$%HB_ROOT%hb21\bin\hbnetio-x64.exe"
SectionEnd
!ifndef PKG_NO_MINGW

2
harbour/package/winuni/mpkg_win_uni_extra_copy.bat
View File

@@ -44,8 +44,8 @@ rem ; Using msvc64 because mingw64 .dll handling is broken.
copy /y ..\..\pkg\win\msvc64\harbour-2.1.0-win-msvc64\bin\hbi18n.exe F:\hb\hb21\bin\hbi18n-x64.exe
copy /y ..\..\pkg\win\msvc64\harbour-2.1.0-win-msvc64\bin\hbmk2.exe F:\hb\hb21\bin\hbmk2-x64.exe
copy /y ..\..\pkg\win\msvc64\harbour-2.1.0-win-msvc64\bin\hbrun.exe F:\hb\hb21\bin\hbrun-x64.exe
copy /y ..\..\pkg\win\msvc64\harbour-2.1.0-win-msvc64\bin\hbrun-dll.exe F:\hb\hb21\bin\hbrun-dll-x64.exe
copy /y ..\..\pkg\win\msvc64\harbour-2.1.0-win-msvc64\bin\hbtest.exe F:\hb\hb21\bin\hbtest-x64.exe
copy /y ..\..\pkg\win\msvc64\harbour-2.1.0-win-msvc64\bin\hbnetio.exe F:\hb\hb21\bin\hbnetio-x64.exe
xcopy /y "%HB_DIR_UPX%upx.exe" F:\hb\hb21\bin\
copy /y "%HB_DIR_UPX%LICENSE" F:\hb\hb21\bin\upx_LICENSE.txt

2
harbour/utils/Makefile
View File

@@ -17,6 +17,4 @@ ifneq ($(HB_BUILD_PARTS),compiler)
endif
DIRS += $(HB_UTIL_ADDONS)
include $(ROOT)config/dir.mk