~/paste/5167
~/paste/5167
~/paste/5167

  1. diff --git a/setup.py b/setup.py
  2. index f40a5bb..e342408 100644
  3. --- a/setup.py
  4. +++ b/setup.py
  5. @@ -12,17 +12,18 @@ import os
  6.  
  7.  def pre_install():
  8.      """Do the custom compiling of the bluepy-helper executable from the makefile"""
  9. -    try:
  10. -        print("Working dir is " + os.getcwd())
  11. -        for cmd in [ "make -C ./bluepy clean", "make -C bluepy -j1" ]:
  12. -            print("execute " + cmd)
  13. -            msgs = subprocess.check_output(shlex.split(cmd), stderr=subprocess.STDOUT)
  14. -    except subprocess.CalledProcessError as e:
  15. -        print("Failed to compile bluepy-helper. Exiting install.")
  16. -        print("Command was " + repr(cmd) + " in " + os.getcwd())
  17. -        print("Return code was %d" % e.returncode)
  18. -        print("Output was:\n%s" % e.output)
  19. -        sys.exit(1)
  20. +    ### make will be called by OpenWrt with cross-toolchain flags explicitly
  21. +    #try:
  22. +    #    print("Working dir is " + os.getcwd())
  23. +    #    for cmd in [ "make -C ./bluepy clean", "make -C bluepy -j1" ]:
  24. +    #        print("execute " + cmd)
  25. +    #        msgs = subprocess.check_output(shlex.split(cmd), stderr=subprocess.STDOUT)
  26. +    #except subprocess.CalledProcessError as e:
  27. +    #    print("Failed to compile bluepy-helper. Exiting install.")
  28. +    #    print("Command was " + repr(cmd) + " in " + os.getcwd())
  29. +    #    print("Return code was %d" % e.returncode)
  30. +    #    print("Output was:\n%s" % e.output)
  31. +    #    sys.exit(1)
  32.  
  33.  def post_install():
  34.      """Post installation tasks"""
Language: diff
Posted by Anonymous at 10 Mar 2018, 03:57:17 UTC