From aad34fe7e20ee261a4f0a4f53a5b0c38cae2d099 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 30 Jun 2010 08:43:00 +0000 Subject: [PATCH] 2010-06-30 10:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * external/bzip2/Makefile - Deleted now not needed old URL tag. * external/patchup.prg + Added option to create temp dir in cwd. + Using --force-local tar option to make broken Windows tar build (gnuwin32 latest 1.13 release from 2003) happy. + Changing to target dir on our own instead of using -C tar option. This option is broken on Windows tar build (gnuwin32 latest 1.13 release from 2003) * package/winuni/RELNOTES + libcurl updated. --- harbour/ChangeLog | 31 +++++++++++++++++++++++-------- harbour/external/bzip2/Makefile | 10 ++++------ harbour/external/patchup.prg | 23 ++++++++++++++++------- harbour/package/winuni/RELNOTES | 2 +- 4 files changed, 44 insertions(+), 22 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8f7c940550..bd4fbcb9af 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,9 +16,24 @@ The license applies to all entries newer than 2009-04-28. */ +2010-06-30 10:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * external/bzip2/Makefile + - Deleted now not needed old URL tag. + + * external/patchup.prg + + Added option to create temp dir in cwd. + + Using --force-local tar option to make broken Windows + tar build (gnuwin32 latest 1.13 release from 2003) happy. + + Changing to target dir on our own instead of using -C + tar option. This option is broken on Windows tar build + (gnuwin32 latest 1.13 release from 2003) + + * package/winuni/RELNOTES + + libcurl updated. + 2010-06-30 01:30 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/ideedit.prg - % Changed: context-menu options for "Split..." are now + % Changed: context-menu options for "Split..." are now edit instance's state dependent. ! Thumbnail window is not closed while split is closed. @@ -33,7 +48,7 @@ + Added: more icons to ideDBU toolbar, close and toggle form view. + Implemented: to save and restore table informations per panel. Now ideDBU is presented with opened tables as was closed previously. - + Implemented: "Panels" concept where each panel can hold + + Implemented: "Panels" concept where each panel can hold different tables. TODO: interface to add panels. @@ -46,24 +61,24 @@ % Minor fix in "buttonBrowse_clicked" event which was causing RTE when there was no other Tool defined. - ! Fix to Ctrl+G which stopped working after keyboard macros + ! Fix to Ctrl+G which stopped working after keyboard macros synchronization few days back. - ! Thumbnail window is closed if a source is closed. To + ! Thumbnail window is closed if a source is closed. To activate it for another source you need to activate it again. However, switching over to another source, it stays as is. + Reimplemented: split behavior of current editing instance. - Before it was done in fixed halved window plus split + Before it was done in fixed halved window plus split was available verically and horintally any level deep. This was neither appropriate nor desired behavior. Now split is presented in resizable window either horizontally - or vertically. The behavior can be changed if all splitted + or vertically. The behavior can be changed if all splitted windows are closed first and then again split is initiated. - - Above anomalies reported by Viktor, thanks. + + Above anomalies reported by Viktor, thanks. Please test and report back any fix is not upto mark. 2010-06-29 21:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) diff --git a/harbour/external/bzip2/Makefile b/harbour/external/bzip2/Makefile index 3e25b4558e..8b8bd2bc60 100644 --- a/harbour/external/bzip2/Makefile +++ b/harbour/external/bzip2/Makefile @@ -8,8 +8,6 @@ include $(TOP)$(ROOT)config/global.mk LIBNAME := bz2 -# URL: http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz - HB_BUILD_WARN := no HB_BUILD_MODE := c @@ -48,12 +46,12 @@ endif # DIFF # # MAP LICENSE -# MAP blocksort.c blocksor.c +# MAP blocksort.c blocksor.c # MAP bzlib.c # MAP bzlib.h -# MAP bzlib_private.h bzlib_pr.h +# MAP bzlib_private.h bzlib_pr.h # MAP compress.c # MAP crctable.c -# MAP decompress.c decompre.c +# MAP decompress.c decompre.c # MAP huffman.c -# MAP randtable.c randtabl.c +# MAP randtable.c randtabl.c diff --git a/harbour/external/patchup.prg b/harbour/external/patchup.prg index 85c6bd205f..794fc54f64 100644 --- a/harbour/external/patchup.prg +++ b/harbour/external/patchup.prg @@ -265,6 +265,7 @@ PROCEDURE Main( ... ) LOCAL cStdErr LOCAL lRediff := .F. /* whether or not operating as rediff */ LOCAL aArgv + LOCAL cRoot := NIL LOCAL hRegexTake1Line := hb_regexComp( "^#[[:blank:]]*(ORIGIN|VER|URL|DIFF)[[:blank:]]+(.+?)[[:blank:]]*$" ) LOCAL hRegexTake2Line := hb_regexComp( "^#[[:blank:]]*(MAP)[[:blank:]]+(.+?)[[:blank:]]+(.+?)[[:blank:]]*$" ) @@ -382,11 +383,16 @@ PROCEDURE Main( ... ) QUIT ENDIF - FClose( hb_FTempCreateEx( @s_cTempDir, NIL, FN_NameGet( hb_ProgName() ) + "_" ) ) + cCWD := hb_CurDrive() + hb_osDriveSeparator() + OSPS + CurDir() + + #if defined( _CURDIR ) + cRoot := cCWD + OSPS + #endif + + FClose( hb_FTempCreateEx( @s_cTempDir, cRoot, FN_NameGet( hb_ProgName() ) + "_" ) ) FErase( s_cTempDir ) MakeDir( s_cTempDir ) - cCWD := hb_CurDrive() + hb_osDriveSeparator() + OSPS + CurDir() cThisComponent := FN_NameGet( cCWD ) MakeDir( CombinePath( s_cTempDir, cThisComponent ) ) @@ -617,6 +623,7 @@ STATIC FUNCTION FetchAndExtract( cArchiveURL ) LOCAL cMatchedPattern LOCAL cFileName LOCAL cFrag + LOCAL cCWD /* Any given package is surely available in at least one of these formats, * pick one of these, refrain from the more exotic ones. */ @@ -627,21 +634,21 @@ STATIC FUNCTION FetchAndExtract( cArchiveURL ) 'ExtractorArgs' => '-d', ; 'ExtractedFile' => '.tar', ; 'Archiver' => 'tar', ; - 'ArchiverArgs' => '-C %s -xvf' ; + 'ArchiverArgs' => '--force-local -xvf' ; }, ; '.tar.bz2|.tbz|.tbz2' => { ; 'Extractor' => 'bzip2', ; 'ExtractorArgs' => '-d', ; 'ExtractedFile' => '.tar', ; 'Archiver' => 'tar', ; - 'ArchiverArgs' => '-C %s -xvf' ; + 'ArchiverArgs' => '--force-local -xvf' ; }, ; '.zip' => { ; 'Extractor' => NIL, ; 'ExtractorArgs' => NIL, ; 'ExtractedFile' => NIL, ; 'Archiver' => 'unzip', ; - 'ArchiverArgs' => '-d %s' ; + 'ArchiverArgs' => '' ; } ; } @@ -700,10 +707,12 @@ STATIC FUNCTION FetchAndExtract( cArchiveURL ) /* Unarchive */ cCommand := hb_strFormat( "%s " + cArchiverArgs + " %s", ; - cArchiver, CombinePath( s_cTempDir, "root" ), ; - CombinePath( s_cTempDir, cExtractedFileName ) ) + cArchiver, CombinePath( s_cTempDir, cExtractedFileName ) ) TRACE( "Running " + cCommand ) + cCWD := hb_CurDrive() + hb_osDriveSeparator() + OSPS + CurDir() + DirChange( CombinePath( s_cTempDir, "root" ) ) nResult := hb_processRun( cCommand, , @cStdOut, @cStdErr, .F. ) + DirChange( cCWD ) SaveLog( "archive", cStdOut, cStdErr ) IF nResult != 0 OutStd( "E: Error unarchiving " + cFileName + OSNL ) diff --git a/harbour/package/winuni/RELNOTES b/harbour/package/winuni/RELNOTES index 3e6cf9a7b0..574490ef41 100644 --- a/harbour/package/winuni/RELNOTES +++ b/harbour/package/winuni/RELNOTES @@ -58,7 +58,7 @@ Tool/lib versions used to create this package: Allegro 4.2.2 Blat 2.6.2 Cairo 1.8.8 - libcurl 7.20.1 + libcurl 7.21.0 Firebird 2.5.0rc2 FreeImage 3.13.1 GD 2.0.35