[haiku-commits] haiku: hrev44291 - build/jam src/apps/webpositive
- From: alex@xxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 4 Jul 2012 01:22:14 +0200 (CEST)
hrev44291 adds 3 changesets to branch 'master'
old head: c4ba387bf8a43bca900c26e8af454a3df40b74c2
new head: 69914905f5fb21097ba8856a119d821f9b6e0693
----------------------------------------------------------------------------
36aac7c: Fix typo
40c493c: Hardcode kSVNRevision = 0 until i adapt version tracking
6991490: Remove left-over echo
[ Alexandre Deckner <alexandre.deckner@xxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 3 insertions(+), 5 deletions(-)
build/jam/FileRules | 2 +-
build/jam/OptionalBuildFeatures | 2 --
src/apps/webpositive/svn_revision.cpp | 4 ++--
############################################################################
Commit: 36aac7c55f78fdd6aae2dff8759150dd6d34dea6
URL: http://cgit.haiku-os.org/haiku/commit/?id=36aac7c
Author: Alexandre Deckner <alexandre.deckner@xxxxxxxx>
Date: Tue Jul 3 23:15:26 2012 UTC
Fix typo
----------------------------------------------------------------------------
diff --git a/build/jam/FileRules b/build/jam/FileRules
index 2a5b896..86fbe8b 100644
--- a/build/jam/FileRules
+++ b/build/jam/FileRules
@@ -199,7 +199,7 @@ rule ExtractArchive directory : entries : archiveFile :
grist
# <directory> and <archiveFile> combo.
#
# <directory> - The directory into which to extract the archive file.
The
- # directory is created is by this rule and it is the
target
+ # directory is created by this rule and it is the target
# that the extract action is associated with.
# <entries> - The entries of the archive file one is interested in.
The
# rule always extracts the complete archive file, from the
############################################################################
Commit: 40c493ce343abb484c96f84e3ce7ca867b153bf6
URL: http://cgit.haiku-os.org/haiku/commit/?id=40c493c
Author: Alexandre Deckner <alexandre.deckner@xxxxxxxx>
Date: Tue Jul 3 23:18:37 2012 UTC
Hardcode kSVNRevision = 0 until i adapt version tracking
----------------------------------------------------------------------------
diff --git a/src/apps/webpositive/svn_revision.cpp
b/src/apps/webpositive/svn_revision.cpp
index 489c64c..9e415b5 100644
--- a/src/apps/webpositive/svn_revision.cpp
+++ b/src/apps/webpositive/svn_revision.cpp
@@ -5,6 +5,6 @@
#include "svn_revision.h"
-const int32 kSVNRevision =
- #include "svn_revision"
+const int32 kSVNRevision = 0;
+// #include "svn_revision"
;
############################################################################
Revision: hrev44291
Commit: 69914905f5fb21097ba8856a119d821f9b6e0693
URL: http://cgit.haiku-os.org/haiku/commit/?id=6991490
Author: Alexandre Deckner <alexandre.deckner@xxxxxxxx>
Date: Tue Jul 3 23:21:57 2012 UTC
Remove left-over echo
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index 509e87f..1650242 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -435,8 +435,6 @@ if $(TARGET_ARCH) = x86 {
HAIKU_WEBKIT_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
$(HAIKU_WEBKIT_FILE:B) ] ;
- echo $(HAIKU_WEBKIT_DIR) ;
-
HAIKU_WEBKIT_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_WEBKIT_DIR)
: include/ : $(zipFile) : extracted-webkit ] ;
Other related posts:
- » [haiku-commits] haiku: hrev44291 - build/jam src/apps/webpositive - alex
