Changeset 8164

Timestamp:

08/13/08 13:17:36 (5 years ago)

Author:

jawil06

Message:

All hardcoded references to site-packages removed. Installation path should no longer matter.

Location:

ossiedev/trunk/tools

Files:

• WaveDev/wavedev/ComponentFrame.py (modified) (2 diffs)
• WaveDev/wavedev/MainFrame.py (modified) (1 diff)
• alf/ALFutils.py (modified) (1 diff)

ossiedev/trunk/tools/WaveDev/wavedev/ComponentFrame.py

@@ -328 +328 @@
     def __init__(self, parent):
         # Constructor for ComponentFrame
-        self.wavedevPath = os.getcwd() + os.sep
-        # NOTE: This is another poor use of the full path
-        # a better way is to construct the string to be executed
-        availableTemplates = commands.getoutput("ls -I __init__.py* /usr/lib/python2.5/site-packages/WaveDev/wavedev/generate/templates/")
+            self.wavedevPath = os.getcwd() + os.sep
+
+        self.wavedevPath = __file__
+        if os.path.islink (self.wavedevPath):
+            self.wavedevPath = os.path.realpath (self.wavedevPath)
+        self.wavedevPath = os.path.dirname (os.path.abspath (self.wavedevPath)) 
+
+        #NOTE: There still may be a better way to do this,
+        # assuming generate/templates always exists below this file, this will work
+        path = self.wavedevPath + '/generate/templates'
+        availableTemplates = commands.getoutput("ls -I __init__.py* " + path)
         availableTemplates = availableTemplates.split()
-        self._init_ctrls(parent,availableTemplates)
+            self._init_ctrls(parent,availableTemplates)
 
         self.templateChoice.SetSelection(0)
@@ -342 +349 @@
         self.saveComponentPath = None
         self.calledByParent = False
-
-        self.wavedevPath = '/usr/lib/python2.5/site-packages/WaveDev/wavedev/'  # NOTE Should really be computed from the install path
 
         if parent == None:  #OSSIE Component Editor being run in stand-alone mode

ossiedev/trunk/tools/WaveDev/wavedev/MainFrame.py

@@ -477 +477 @@
 #        self.wavedevPath = os.getcwd() + "/"
 # NOTE The wavedevPath string should be constructed, not hard-coded
-        self.wavedevPath = "/usr/lib/python2.5/site-packages/WaveDev/wavedev/"
+#        self.wavedevPath = "/usr/lib/python2.5/site-packages/WaveDev/wavedev/"
+        self.wavedevPath = __file__
+        if os.path.islink (self.wavedevPath):
+            self.wavedevPath = os.path.realpath (self.wavedevPath)
+        self.wavedevPath = os.path.dirname (os.path.abspath (self.wavedevPath)) + '/'
 
 ################################################################################

ossiedev/trunk/tools/alf/ALFutils.py

@@ -156 +156 @@
     # NOTE: Tools directory is now now the alf_plugins module in site_packages
     #tooldir = frame_obj.installpath+"/tools"
-    # To do: we should find a way to not load this statically
-    tooldir = '/usr/lib/python2.5/site-packages/alf_plugins'
+    # NOTE: There may be a better way of finding the alf_plugins directory, but this works
+    tooldir = __import__('alf_plugins').__file__
+    if os.path.islink (tooldir):
+        root = os.path.realpath (tooldir)
+    tooldir = os.path.dirname (os.path.abspath (tooldir))
     frame_obj.tools = ToolList(tooldir)