summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Blum2013-05-11 19:56:48 -0700
committerJosh Blum2013-05-11 19:56:48 -0700
commit9e9308df1599bd13e808cacc6b3cea5a5c697df3 (patch)
treef01f195141a26a27b1c34f9cd2e03b92041a2a37
parenta847dd8414816158d11e142a002b67596719813c (diff)
downloadsandhi-9e9308df1599bd13e808cacc6b3cea5a5c697df3.tar.gz
sandhi-9e9308df1599bd13e808cacc6b3cea5a5c697df3.tar.bz2
sandhi-9e9308df1599bd13e808cacc6b3cea5a5c697df3.zip
gras: moved query app to top level
-rw-r--r--CMakeLists.txt1
-rw-r--r--benchmark/.gitignore2
-rw-r--r--python/gras/CMakeLists.txt5
-rw-r--r--query/CMakeLists.txt (renamed from python/gras/query/CMakeLists.txt)0
-rw-r--r--query/__init__.py (renamed from python/gras/query/__init__.py)0
-rw-r--r--query/chart_factory.js (renamed from python/gras/query/chart_factory.js)0
-rw-r--r--query/chart_global_counters.js (renamed from python/gras/query/chart_global_counters.js)0
-rw-r--r--query/chart_handler_breakdown.js (renamed from python/gras/query/chart_handler_breakdown.js)0
-rw-r--r--query/chart_overall_throughput.js (renamed from python/gras/query/chart_overall_throughput.js)0
-rw-r--r--query/chart_overhead_compare.js (renamed from python/gras/query/chart_overhead_compare.js)0
-rw-r--r--query/chart_port_counters.js (renamed from python/gras/query/chart_port_counters.js)0
-rw-r--r--query/chart_port_downtime.js (renamed from python/gras/query/chart_port_downtime.js)0
-rw-r--r--query/main.css (renamed from python/gras/query/main.css)0
-rw-r--r--query/main.html (renamed from python/gras/query/main.html)0
-rw-r--r--query/main.js (renamed from python/gras/query/main.js)0
-rw-r--r--query/utils.js (renamed from python/gras/query/utils.js)0
16 files changed, 3 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee09b26..21f1909 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,6 +98,7 @@ add_subdirectory(lib)
add_subdirectory(PMC)
add_subdirectory(python/gras)
add_subdirectory(tests)
+add_subdirectory(query)
########################################################################
# add gnuradio as sub-project
diff --git a/benchmark/.gitignore b/benchmark/.gitignore
index a74b07a..e9a5d35 100644
--- a/benchmark/.gitignore
+++ b/benchmark/.gitignore
@@ -1 +1,3 @@
/*.pyc
+/*.png
+/*.pdf
diff --git a/python/gras/CMakeLists.txt b/python/gras/CMakeLists.txt
index e91d8df..8171e7f 100644
--- a/python/gras/CMakeLists.txt
+++ b/python/gras/CMakeLists.txt
@@ -1,9 +1,4 @@
########################################################################
-# add subdirs
-########################################################################
-add_subdirectory(query)
-
-########################################################################
# Include swig generation macros
########################################################################
find_package(SWIG)
diff --git a/python/gras/query/CMakeLists.txt b/query/CMakeLists.txt
index f9a855e..f9a855e 100644
--- a/python/gras/query/CMakeLists.txt
+++ b/query/CMakeLists.txt
diff --git a/python/gras/query/__init__.py b/query/__init__.py
index c72222b..c72222b 100644
--- a/python/gras/query/__init__.py
+++ b/query/__init__.py
diff --git a/python/gras/query/chart_factory.js b/query/chart_factory.js
index 8b9656a..8b9656a 100644
--- a/python/gras/query/chart_factory.js
+++ b/query/chart_factory.js
diff --git a/python/gras/query/chart_global_counters.js b/query/chart_global_counters.js
index 1708c01..1708c01 100644
--- a/python/gras/query/chart_global_counters.js
+++ b/query/chart_global_counters.js
diff --git a/python/gras/query/chart_handler_breakdown.js b/query/chart_handler_breakdown.js
index 5f76d1d..5f76d1d 100644
--- a/python/gras/query/chart_handler_breakdown.js
+++ b/query/chart_handler_breakdown.js
diff --git a/python/gras/query/chart_overall_throughput.js b/query/chart_overall_throughput.js
index 6d66e40..6d66e40 100644
--- a/python/gras/query/chart_overall_throughput.js
+++ b/query/chart_overall_throughput.js
diff --git a/python/gras/query/chart_overhead_compare.js b/query/chart_overhead_compare.js
index 0ec9070..0ec9070 100644
--- a/python/gras/query/chart_overhead_compare.js
+++ b/query/chart_overhead_compare.js
diff --git a/python/gras/query/chart_port_counters.js b/query/chart_port_counters.js
index af74c33..af74c33 100644
--- a/python/gras/query/chart_port_counters.js
+++ b/query/chart_port_counters.js
diff --git a/python/gras/query/chart_port_downtime.js b/query/chart_port_downtime.js
index 2de421d..2de421d 100644
--- a/python/gras/query/chart_port_downtime.js
+++ b/query/chart_port_downtime.js
diff --git a/python/gras/query/main.css b/query/main.css
index 4d933fa..4d933fa 100644
--- a/python/gras/query/main.css
+++ b/query/main.css
diff --git a/python/gras/query/main.html b/query/main.html
index 3fc3508..3fc3508 100644
--- a/python/gras/query/main.html
+++ b/query/main.html
diff --git a/python/gras/query/main.js b/query/main.js
index b17af63..b17af63 100644
--- a/python/gras/query/main.js
+++ b/query/main.js
diff --git a/python/gras/query/utils.js b/query/utils.js
index 3e4fe4b..3e4fe4b 100644
--- a/python/gras/query/utils.js
+++ b/query/utils.js