diff --git a/ChangeLog.txt b/ChangeLog.txt index 2ef6fa2326..364ad2673c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,14 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-03-16 02:13 UTC+0100 Viktor Szakats (harbour syenar.net) + * package/updt_web_nightly.sh + ! fixed to oversights after git update + % be less verbose on download + + * tests/stripsvn.hb + * updated + 2013-03-16 02:10 UTC+0100 Viktor Szakats (harbour syenar.net) * (all files) * stripped svn header diff --git a/package/updt_web_nightly.sh b/package/updt_web_nightly.sh index 4f90399d1e..2224255187 100755 --- a/package/updt_web_nightly.sh +++ b/package/updt_web_nightly.sh @@ -50,8 +50,8 @@ cd _hb_web_src echo Downloading sources... -wget https://github.com/harbour/website/archive/master.tar.gz -tar -zxvf master.tar.gz +wget -nv https://github.com/harbour/website/archive/master.tar.gz +tar -zxvf website-master.tar.gz echo Updating website... @@ -67,7 +67,7 @@ else then echo Uploading site to sf.net web area... desthost=",harbour-project@web.sourceforge.net:" - rsync -zr -e "ssh -i $HB_SFNET_WEB_PRIVATE_KEY" website/* $HB_SFNET_USER$desthost$destdir + rsync -zr -e "ssh -i $HB_SFNET_WEB_PRIVATE_KEY" website-master/* $HB_SFNET_USER$desthost$destdir fi fi diff --git a/tests/stripsvn.hb b/tests/stripsvn.hb index 6f2fd1e0eb..54ca1762bc 100644 --- a/tests/stripsvn.hb +++ b/tests/stripsvn.hb @@ -57,7 +57,8 @@ PROCEDURE Main() cExt := hb_FNameExt( aFile[ F_NAME ] ) - IF "|" + cExt + "|" $ "|.c|.hb|.prg|.hbm|.hbp|.hbc|.ini|.bat|.sh|.vbs|.def" + IF Empty( cExt ) .OR. ; + "|" + cExt + "|" $ "|.c|.h|.hb|.prg|.hbm|.hbp|.hbc|.ini|.bat|.sh|.vbs|.def|.api|.ch|.txt|.mk|" tmp := MemoRead( aFile[ F_NAME ] ) tmp := StrTran( tmp, cHdr1 ) @@ -68,10 +69,13 @@ PROCEDURE Main() tmp := StrTran( tmp, cHdr6 ) tmp := StrTran( tmp, cHdr7 ) - IF Left( tmp, Len( hb_eol() ) + 2 ) == hb_eol() + "//" .OR. ; - Left( tmp, Len( hb_eol() ) + 2 ) == hb_eol() + "/*" .OR. ; - Left( tmp, Len( hb_eol() ) + 1 ) == hb_eol() + ";" - tmp := SubStr( tmp, Len( hb_eol() ) + 1 ) + IF ! "|" + cExt + "|" $ "|.hbm|.hbp|.hbc|.txt|" + IF Left( tmp, Len( hb_eol() ) + 2 ) == hb_eol() + "//" .OR. ; + Left( tmp, Len( hb_eol() ) + 2 ) == hb_eol() + "/*" .OR. ; + Left( tmp, Len( hb_eol() ) + 1 ) == hb_eol() + ";" .OR. ; + Left( tmp, Len( hb_eol() ) + 1 ) == hb_eol() + "#" + tmp := SubStr( tmp, Len( hb_eol() ) + 1 ) + ENDIF ENDIF hb_MemoWrit( aFile[ F_NAME ], tmp )