[gnoduino/gnoduino-0-3-0] Add temporary patch to use arduino API files from gnoduino bundle rather than system because we're a



commit 350a19bc52b1a43db9df82cd4c3b61b1c3bd0c04
Author: Lucian Langa <lucilanga gnome org>
Date:   Sun Feb 12 18:50:42 2012 +0100

    Add temporary patch to use arduino API files from gnoduino bundle
    rather than system because we're already incompatible with 1.0
    release. The proper way to do this is to actually detect the API version

 setup.py    |    2 +-
 src/misc.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/setup.py b/setup.py
index 68524bd..02c7eb3 100644
--- a/setup.py
+++ b/setup.py
@@ -108,7 +108,7 @@ def get_data_files():
     ]
     for subdir in ("hardware", "libraries", "reference"):
         # We ship hardware/libraries/reference modules if not already installed
-        if not os.path.exists(os.path.join(sys.prefix, "share", "arduino", subdir)):
+        if not os.path.exists(os.path.join(sys.prefix, "share", "arduino", subdir)) or 1:
             for dirpath, dirnames, filenames in os.walk(subdir):
                 if ".git" not in dirpath and filenames:
                     data_files.append([os.path.join("share", "gnoduino", dirpath),
diff --git a/src/misc.py b/src/misc.py
index cd37ecd..4357b90 100644
--- a/src/misc.py
+++ b/src/misc.py
@@ -39,7 +39,7 @@ def get_path(main_path, default=None):
     possible_paths = [
         os.path.join(os.path.expanduser('~/.arduino'), main_path),
         os.path.join(os.getcwd(), main_path),
-        os.path.join(sys.prefix, "share", "arduino", main_path),
+        #os.path.join(sys.prefix, "share", "arduino", main_path),
         os.path.join(sys.prefix, "local", "share", "gnoduino", main_path),
         os.path.join(sys.prefix, "share", "gnoduino", main_path),
     ]



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