diff options
| author | nags <nags@nags-desktop.(none)> | 2009-04-08 19:23:49 -0700 |
|---|---|---|
| committer | nags <nags@nags-desktop.(none)> | 2009-04-08 19:23:49 -0700 |
| commit | 2bc2ffc14f026f642853b56c4e3ce2e51052e28f (patch) | |
| tree | e823ff277b8af1244933a29d5e814d6824965090 /python | |
| parent | 309029acd022e62afd42e72212f8193de7163fcb (diff) | |
2009-04-08 Nagappan Alagappan <nagappan@gmail.com>
* ldtpeditor (LdtpEditorGui.__init__): Fixes bug # 573103, thanks
to Sandro Millien <msp@lloedy.com>.
* Makefile.am: Fixes bug # 573103, thanks to Sandro Millien
<msp@lloedy.com>.
Diffstat (limited to 'python')
| -rw-r--r-- | python/ChangeLog | 8 | ||||
| -rw-r--r-- | python/Makefile.am | 7 | ||||
| -rwxr-xr-x | python/ldtpeditor | 8 |
3 files changed, 21 insertions, 2 deletions
diff --git a/python/ChangeLog b/python/ChangeLog index 05c1bca..05be5c4 100644 --- a/python/ChangeLog +++ b/python/ChangeLog @@ -1,3 +1,11 @@ +2009-04-08 Nagappan Alagappan <nagappan@gmail.com> + + * ldtpeditor (LdtpEditorGui.__init__): Fixes bug # 573103, thanks + to Sandro Millien <msp@lloedy.com>. + + * Makefile.am: Fixes bug # 573103, thanks to Sandro Millien + <msp@lloedy.com>. + 2009-04-08 Willie Walker <william.walker@sun.com> * ldtp.py: LDTP should use LOGNAME instead of (or in addition to) diff --git a/python/Makefile.am b/python/Makefile.am index ffbc296..955d570 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -11,7 +11,10 @@ appdir = $(datadir)/ldtp %.pyc: %.py $(PYTHON_CMD) -c "import py_compile; py_compile.compile ('$<', '$@')" -bin_SCRIPTS = \ +gladechangepath: + sed 's|self.gladeFilePath = None|self.gladeFilePath = \"$(gladedir)\"|g' ldtpeditor > $(prefix)/bin/ldtpeditor + +bin_SCRIPTS = \ ldtpcodegen \ ldtpeditor \ ldtprunner @@ -36,3 +39,5 @@ CLEANFILES = \ MAINTAINERCLEANFILES = \ Makefile.in + +install-exec-hook: gladechangepath diff --git a/python/ldtpeditor b/python/ldtpeditor index 630ff4d..93feebd 100755 --- a/python/ldtpeditor +++ b/python/ldtpeditor @@ -104,7 +104,13 @@ class LdtpEditorGui (gnome.Program): gnome.Program.__init__ (self) ldtpEditorApp = gnome.program_init ('LDTP Editor', '1.0.0') gladeFileName = "ldtpeditor.glade" - self.gladeFilePath = './' + gladeFileName + # On install the following line will be replaced with glade path + self.gladeFilePath = None + if self.gladeFilePath: + self.gladeFilePath = '%s/./%s' % (self.gladeFilePath, + gladeFileName) + else: + self.gladeFilePath = './%s' % gladeFileName if os.path.exists (gladeFileName): self.gladeFilePath = sys.path [0] + '/' + gladeFileName else: |