[jhbuild] install and call hg-update.py out of sources



commit b308d7c9893fc548817d42c43205e0e61a249dae
Author: Frédéric Péters <fpeters 0d be>
Date:   Sat May 16 12:52:19 2009 +0200

    install and call hg-update.py out of sources
---
 jhbuild/versioncontrol/hg.py |    7 ++++---
 scripts/Makefile.am          |    2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/jhbuild/versioncontrol/hg.py b/jhbuild/versioncontrol/hg.py
index f485b8a..a297d27 100644
--- a/jhbuild/versioncontrol/hg.py
+++ b/jhbuild/versioncontrol/hg.py
@@ -89,9 +89,10 @@ class HgBranch(Branch):
     def _update(self, buildscript):
         if self.config.sticky_date:
             raise FatalError(_('date based checkout not yet supported\n'))
-        hg_update = 'hg-update.py'
-        hg_update_path = os.path.join(os.path.dirname(__file__), '..',
-                                      '..', 'scripts', hg_update)
+        if os.path.exists(SRCDIR):
+            hg_update_path = os.path.join(SRCDIR, 'scripts', 'hg-update.py')
+        else:
+            hg_update_path = os.path.join(PKGDATADIR, 'hg-update.py')
         hg_update_path = os.path.normpath(hg_update_path)
         buildscript.execute([hg_update_path], hg_update, cwd=self.srcdir)
 
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index d12c2a2..3688e15 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -3,6 +3,8 @@ EXTRA_DIST = hg-update.py jhbuild.in
 bin_SCRIPTS = jhbuild
 CLEANFILES = jhbuild
 
+pkgdata_SCRIPTS = hg-update.py
+
 jhbuild: jhbuild.in
 	sed						\
 		-e s!\ srcdir\@!$(abs_top_srcdir)!	\



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]