diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3316a0ecb5..9d8f213977 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-10 12:04 UTC+0200 Viktor Szakats (harbour syenar.net) + * bin/commit.hb + * avoid the word svn + + added one comment to a git detection trick + + * contrib/hbhpdf/harupdf.ch + * minor formatting + 2012-10-10 00:46 UTC+0200 Viktor Szakats (vszakats syenar.net) * doc/howtorep.txt * minor cleanup diff --git a/harbour/bin/commit.hb b/harbour/bin/commit.hb index 61f9dddc61..d495423130 100644 --- a/harbour/bin/commit.hb +++ b/harbour/bin/commit.hb @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * SVN commit preparer + * Commit preparer * * Copyright 2012 Viktor Szakats (harbour syenar.net) * www - http://harbour-project.org @@ -95,6 +95,9 @@ STATIC FUNCTION VCSDetect() DO CASE CASE hb_DirExists( ".svn" ) ; RETURN "svn" CASE hb_DirExists( ".git" ) ; RETURN "git" + /* to make it work in an unmodified GIT repo. Ideally, all + files/dirs should be moved one dir up, removing the top + 'harbour' directory. */ CASE hb_DirExists( ".." + hb_ps() + ".git" ) ; RETURN "git" ENDCASE diff --git a/harbour/contrib/hbhpdf/harupdf.ch b/harbour/contrib/hbhpdf/harupdf.ch index e71b47e3e2..168ecc52ab 100644 --- a/harbour/contrib/hbhpdf/harupdf.ch +++ b/harbour/contrib/hbhpdf/harupdf.ch @@ -274,11 +274,11 @@ #define HPDF_TALIGN_CENTER 2 #define HPDF_TALIGN_JUSTIFY 3 -#define HPDF_TRUE .T. -#define HPDF_FALSE .F. +#define HPDF_TRUE .T. +#define HPDF_FALSE .F. -#define HPDF_OK 0 -#define HPDF_NOERROR 0 +#define HPDF_OK 0 +#define HPDF_NOERROR 0 /* buffer size which is required when we convert to character string. */ #define HPDF_TMP_BUF_SIZ 512 @@ -325,8 +325,8 @@ #define HPDF_COMP_IMAGE 0x02 #define HPDF_COMP_METADATA 0x04 #define HPDF_COMP_ALL 0x0F -/* #define HPDF_COMP_BEST_COMPRESS 0x10 */ -/* #define HPDF_COMP_BEST_SPEED 0x20 */ +/* #define HPDF_COMP_BEST_COMPRESS 0x10 */ +/* #define HPDF_COMP_BEST_SPEED 0x20 */ #define HPDF_COMP_MASK 0xFF /* permission flags (only Revision 2 is supported) */