[evolution-data-server] build: favor python3 as interpreter



commit 22684323591d3c03116641baef0c35ef8c6da04f
Author: Dominique Leuenberger <dimstar opensuse org>
Date:   Thu Feb 15 18:35:40 2018 +0100

    build: favor python3 as interpreter
    
    Various distros try to minimize the use of python2. Since all our
    python scripts are already compatible with python3, we now favor
    python3 as interpreter, falling back to python2 as needed.
    
    Also, gen-western-table.py is only used during build and we call it
    explicitly as parameter to the detected python interpreter; as such
    it does not require a shebang and we don't have to confuse anybody
    looking into it what version python we care for.

 CMakeLists.txt                                     |    2 +-
 .../libebook-contacts/gen-western-table.py         |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1371f54..f64e14b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -296,7 +296,7 @@ if(NOT PERL)
        message(FATAL_ERROR "You need perl to build ${PROJECT_NAME}")
 endif(NOT PERL)
 
-find_program(PYTHON python)
+find_program(PYTHON python3 python2 python)
 if(NOT PYTHON)
        message(FATAL_ERROR "You need python to build ${PROJECT_NAME}")
 endif(NOT PYTHON)
diff --git a/src/addressbook/libebook-contacts/gen-western-table.py 
b/src/addressbook/libebook-contacts/gen-western-table.py
old mode 100755
new mode 100644
index d510434..a157921
--- a/src/addressbook/libebook-contacts/gen-western-table.py
+++ b/src/addressbook/libebook-contacts/gen-western-table.py
@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
 # Copyright (C) 2006 Intel Corporation
 #
 # This library is free software: you can redistribute it and/or modify it


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