package/canfestival/0002-allow-to-set-python-interpreter.patch

   1 From s.martin49@gmail.com Fri Oct 10 23:43:32 2014
   2 Content-Type: text/plain; charset="us-ascii"
   3 MIME-Version: 1.0
   4 Content-Transfer-Encoding: 7bit
   5 Subject: [PATCH] allow to set python interpreter
   6 X-Mercurial-Node: 4805f636c2317d989a5f704ba691369f41be6595
   7 X-Mercurial-Series-Index: 1
   8 X-Mercurial-Series-Total: 1
   9 Message-Id: <4805f636c2317d989a5f.1412977412@bobook>
  10 X-Mercurial-Series-Id: <4805f636c2317d989a5f.1412977412@bobook>
  11 User-Agent: Mercurial-patchbomb/3.1.2
  12 Date: Fri, 10 Oct 2014 23:43:32 +0200
  13 From: Samuel Martin <s.martin49@gmail.com>
  14 To: canfestival-devel@lists.sourceforge.net
  15 Cc: Samuel Martin <s.martin49@gmail.com>
  16
  17 # HG changeset patch
  18 # User "Samuel Martin" <s.martin49@gmail.com>
  19 # Date 1412977082 -7200
  20 #      Fri Oct 10 23:38:02 2014 +0200
  21 # Node ID 4805f636c2317d989a5f704ba691369f41be6595
  22 # Parent  c408fdc77aa18fcda81db4f0d038e8a69ba84bb2
  23 allow to set python interpreter
  24
  25 Canfestival python modules and scripts are not python3 compliant.
  26
  27 Allow to pass the python interperter to be used to make.
  28
  29 Signed-off-by: Samuel Martin <s.martin49@gmail.com>
  30
  31 diff --git a/Makefile.in b/Makefile.in
  32 --- a/Makefile.in
  33 +++ b/Makefile.in
  34 @@ -21,6 +21,9 @@
  35  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  36  #
  37
  38 +PYTHON ?= python
  39 +export PYTHON
  40 +
  41  all: objdictedit canfestival examples
  42
  43  examples: canfestival driver
  44 diff --git a/doc/manual/en/manual.tex b/doc/manual/en/manual.tex
  45 --- a/doc/manual/en/manual.tex
  46 +++ b/doc/manual/en/manual.tex
  47 @@ -1134,6 +1134,7 @@
  48         python objdictedit.py [od files...]
  49  \end{verbatim}
  50
  51 +Note that Gnosis modules only run with python2 as interpreter.
  52
  53  \subsubsection{Installation and usage on Windows}
  54
  55 diff --git a/examples/CANOpenShell/Makefile.in b/examples/CANOpenShell/Makefile.in
  56 --- a/examples/CANOpenShell/Makefile.in
  57 +++ b/examples/CANOpenShell/Makefile.in
  58 @@ -69,11 +69,11 @@
  59
  60  CANOpenShellMasterOD.c: CANOpenShellMasterOD.od
  61         $(MAKE) -C ../../objdictgen gnosis
  62 -       python ../../objdictgen/objdictgen.py CANOpenShellMasterOD.od CANOpenShellMasterOD.c
  63 +       $(PYTHON) ../../objdictgen/objdictgen.py CANOpenShellMasterOD.od CANOpenShellMasterOD.c
  64
  65  CANOpenShellSlaveOD.c: CANOpenShellSlaveOD.od
  66         $(MAKE) -C ../../objdictgen gnosis
  67 -       python ../../objdictgen/objdictgen.py CANOpenShellSlaveOD.od CANOpenShellSlaveOD.c
  68 +       $(PYTHON) ../../objdictgen/objdictgen.py CANOpenShellSlaveOD.od CANOpenShellSlaveOD.c
  69
  70  %.o: %.c
  71         $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
  72 diff --git a/examples/DS401_Master/Makefile.in b/examples/DS401_Master/Makefile.in
  73 --- a/examples/DS401_Master/Makefile.in
  74 +++ b/examples/DS401_Master/Makefile.in
  75 @@ -53,7 +53,7 @@
  76
  77  TestMaster.c: TestMaster.od
  78         $(MAKE) -C ../../objdictgen gnosis
  79 -       python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c
  80 +       $(PYTHON) ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c
  81
  82  %.o: %.c
  83         $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
  84 diff --git a/examples/DS401_Slave_Gui/Makefile.in b/examples/DS401_Slave_Gui/Makefile.in
  85 --- a/examples/DS401_Slave_Gui/Makefile.in
  86 +++ b/examples/DS401_Slave_Gui/Makefile.in
  87 @@ -59,7 +59,7 @@
  88
  89  ObjDict.c: ObjDict.od
  90         $(MAKE) -C ../../objdictgen gnosis
  91 -       python ../../objdictgen/objdictgen.py ObjDict.od ObjDict.c
  92 +       $(PYTHON) ../../objdictgen/objdictgen.py ObjDict.od ObjDict.c
  93
  94  .cpp.o:
  95         $(CXX) -c $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) `wx-config --cxxflags` $< -o $@
  96 diff --git a/examples/SillySlave/Makefile.in b/examples/SillySlave/Makefile.in
  97 --- a/examples/SillySlave/Makefile.in
  98 +++ b/examples/SillySlave/Makefile.in
  99 @@ -53,7 +53,7 @@
 100
 101  SillySlave.c: SillySlave.od
 102         $(MAKE) -C ../../objdictgen gnosis
 103 -       python ../../objdictgen/objdictgen.py SillySlave.od SillySlave.c
 104 +       $(PYTHON) ../../objdictgen/objdictgen.py SillySlave.od SillySlave.c
 105
 106  %.o: %.c
 107         $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
 108 diff --git a/examples/TestMasterMicroMod/Makefile.in b/examples/TestMasterMicroMod/Makefile.in
 109 --- a/examples/TestMasterMicroMod/Makefile.in
 110 +++ b/examples/TestMasterMicroMod/Makefile.in
 111 @@ -61,7 +61,7 @@
 112
 113  TestMaster.c: TestMaster.od
 114         $(MAKE) -C ../../objdictgen gnosis
 115 -       python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c
 116 +       $(PYTHON) ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c
 117
 118  %.o: %.c
 119         $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
 120 diff --git a/examples/TestMasterSlave/Makefile.in b/examples/TestMasterSlave/Makefile.in
 121 --- a/examples/TestMasterSlave/Makefile.in
 122 +++ b/examples/TestMasterSlave/Makefile.in
 123 @@ -69,11 +69,11 @@
 124
 125  TestSlave.c: TestSlave.od
 126         $(MAKE) -C ../../objdictgen gnosis
 127 -       python ../../objdictgen/objdictgen.py TestSlave.od TestSlave.c
 128 +       $(PYTHON) ../../objdictgen/objdictgen.py TestSlave.od TestSlave.c
 129
 130  TestMaster.c: TestMaster.od
 131         $(MAKE) -C ../../objdictgen gnosis
 132 -       python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c
 133 +       $(PYTHON) ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c
 134
 135  %.o: %.c
 136         $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
 137 diff --git a/examples/TestMasterSlaveLSS/Makefile.in b/examples/TestMasterSlaveLSS/Makefile.in
 138 --- a/examples/TestMasterSlaveLSS/Makefile.in
 139 +++ b/examples/TestMasterSlaveLSS/Makefile.in
 140 @@ -64,15 +64,15 @@
 141
 142  TestSlaveA.c: TestSlaveA.od
 143         $(MAKE) -C ../../objdictgen gnosis
 144 -       python ../../objdictgen/objdictgen.py TestSlaveA.od TestSlaveA.c
 145 +       $(PYTHON) ../../objdictgen/objdictgen.py TestSlaveA.od TestSlaveA.c
 146
 147  TestSlaveB.c: TestSlaveB.od
 148         $(MAKE) -C ../../objdictgen gnosis
 149 -       python ../../objdictgen/objdictgen.py TestSlaveB.od TestSlaveB.c
 150 +       $(PYTHON) ../../objdictgen/objdictgen.py TestSlaveB.od TestSlaveB.c
 151
 152  TestMaster.c: TestMaster.od
 153         $(MAKE) -C ../../objdictgen gnosis
 154 -       python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c
 155 +       $(PYTHON) ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c
 156
 157  %.o: %.c
 158         $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
 159 diff --git a/examples/kerneltest/Makefile.in b/examples/kerneltest/Makefile.in
 160 --- a/examples/kerneltest/Makefile.in
 161 +++ b/examples/kerneltest/Makefile.in
 162 @@ -79,10 +79,10 @@
 163
 164  TestSlave.c: TestSlave.od
 165         $(MAKE) -C ../../objdictgen gnosis
 166 -       python ../../objdictgen/objdictgen.py TestSlave.od TestSlave.c
 167 +       $(PYTHON) ../../objdictgen/objdictgen.py TestSlave.od TestSlave.c
 168
 169  TestMaster.c: TestMaster.od
 170         $(MAKE) -C ../../objdictgen gnosis
 171 -       python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c
 172 +       $(PYTHON) ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c
 173
 174  #endif
 175
 176