Merge pull request #91 from kb2ma/develop_SW-183

SW-183. Fix.
openwsn-berkeley · Oct 6, 2014 · a94897f · a94897f
2 parents 07b81de + 6dbd718
commit a94897f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/software/openvisualizer/SConstruct b/software/openvisualizer/SConstruct
@@ -232,8 +232,8 @@ def makeTreeSdist(env, target):
     cmdlist.append(Delete('openVisualizer.egg-info'))
 
     cmdlist.append(Mkdir(datadir))
-    cmdlist.append(Copy(os.path.join(datadir, 'requirements.pip'), 
-                        os.path.join(topdir, 'requirements.pip')))
+    cmdlist.append(Copy(os.path.join(datadir, 'requirements.txt'), 
+                        os.path.join(topdir, 'requirements.txt')))
     for conf in env['CONF_FILES']:
         cmdlist.append(Copy(os.path.join(datadir, conf), os.path.join(appdir, conf)))
     for data in env['DATA_DIRS']:

diff --git a/software/openvisualizer/nativeSetup.py b/software/openvisualizer/nativeSetup.py
@@ -51,10 +51,12 @@ def appdirGlob(globstr, subdir=''):
     scripts          = appdirGlob('openVisualizer*.py'),
     # Copy simdata files by extension so don't copy .gitignore in that directory.
     data_files       = [(confdir,                                  appdirGlob('*.conf')),
-                        ('/'.join([datadir, webstatic]),           appdirGlob('*.css', webstatic)), 
-                        ('/'.join([datadir, webstatic]),           appdirGlob('*.js', webstatic)), 
-                        ('/'.join([datadir, webstatic]),           appdirGlob('*.png', webstatic)), 
-                        ('/'.join([datadir, webstatic, 'images']), appdirGlob('*', '/'.join([webstatic, 'images']))), 
+                        ('/'.join([datadir, webstatic, 'css']),                        appdirGlob('*', '/'.join([webstatic, 'css']))), 
+                        ('/'.join([datadir, webstatic, 'font-awesome', 'css']),        appdirGlob('*', '/'.join([webstatic, 'font-awesome', 'css']))), 
+                        ('/'.join([datadir, webstatic, 'font-awesome', 'fonts']),      appdirGlob('*', '/'.join([webstatic, 'font-awesome', 'fonts']))), 
+                        ('/'.join([datadir, webstatic, 'images']),                     appdirGlob('*', '/'.join([webstatic, 'images']))), 
+                        ('/'.join([datadir, webstatic, 'js']),                         appdirGlob('*.js', '/'.join([webstatic, 'js']))),
+                        ('/'.join([datadir, webstatic, 'js', 'plugins', 'metisMenu']), appdirGlob('*', '/'.join([webstatic, 'js', 'plugins', 'metisMenu']))),
                         ('/'.join([datadir, webtmpl]),             appdirGlob('*', webtmpl)),
                         ('/'.join([datadir, simdata]),             appdirGlob('*.so', simdata)),
                         ('/'.join([datadir, simdata]),             appdirGlob('*.py', simdata)),

diff --git a/software/openvisualizer/setup.py b/software/openvisualizer/setup.py
@@ -16,7 +16,7 @@
 of directories with install options for setup.py.
 
 This implementation is based on setuptools, and builds the list of module
-dependencies by reading 'requirements.pip'.
+dependencies by reading 'requirements.txt'.
 '''
 
 VERSION   = '.'.join([str(v) for v in ovVersion.VERSION])
@@ -31,7 +31,7 @@
 # which is Unix only.
 # Assumes requirements file contains only module lines and comments.
 deplist = []
-with open(os.path.join('openvisualizer', 'data', 'requirements.pip')) as f:
+with open(os.path.join('openvisualizer', 'data', 'requirements.txt')) as f:
     for line in f:
         if not line.startswith('#'):
             deplist.append(line)
@@ -86,11 +86,13 @@ def build_package_data(self):
     # Copy simdata files by extension so don't copy .gitignore in that directory.
     package_data     = {'openvisualizer': [
                         'data/*.conf',
-                        'data/requirements.pip',
-                        '/'.join([webstatic, '*.css']), 
-                        '/'.join([webstatic, '*.js']), 
-                        '/'.join([webstatic, '*.png']),
+                        'data/requirements.txt',
+                        '/'.join([webstatic, 'css', '*']), 
+                        '/'.join([webstatic, 'font-awesome', 'css', '*']), 
+                        '/'.join([webstatic, 'font-awesome', 'fonts', '*']), 
                         '/'.join([webstatic, 'images', '*']), 
+                        '/'.join([webstatic, 'js', '*.js']), 
+                        '/'.join([webstatic, 'js', 'plugins', 'metisMenu', '*']), 
                         '/'.join([webtmpl, '*']), 
                         '/'.join([simdata, 'windows', '*.pyd']), 
                         '/'.join([simdata, 'linux',   '*.so']),