From 11fb625195168c0b6c4d49cfb2a9ed9a70108ccf Mon Sep 17 00:00:00 2001 From: David Shah Date: Wed, 4 Jul 2018 14:55:16 +0200 Subject: python: Renaming and fixing 'generic' build Signed-off-by: David Shah --- generic/arch_pybindings.cc | 32 ++++++++++++++++++++++++++++++++ generic/arch_pybindings.h | 31 +++++++++++++++++++++++++++++++ generic/pybindings.cc | 32 -------------------------------- 3 files changed, 63 insertions(+), 32 deletions(-) create mode 100644 generic/arch_pybindings.cc create mode 100644 generic/arch_pybindings.h delete mode 100644 generic/pybindings.cc (limited to 'generic') diff --git a/generic/arch_pybindings.cc b/generic/arch_pybindings.cc new file mode 100644 index 00000000..a2997456 --- /dev/null +++ b/generic/arch_pybindings.cc @@ -0,0 +1,32 @@ +/* + * nextpnr -- Next Generation Place and Route + * + * Copyright (C) 2018 Clifford Wolf + * Copyright (C) 2018 David Shah + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ + +#ifndef NO_PYTHON + +#include "pybindings.h" +#include "nextpnr.h" + +NEXTPNR_NAMESPACE_BEGIN + +void arch_wrap_python() { class_("ArchArgs"); } + +NEXTPNR_NAMESPACE_END + +#endif \ No newline at end of file diff --git a/generic/arch_pybindings.h b/generic/arch_pybindings.h new file mode 100644 index 00000000..12b666a2 --- /dev/null +++ b/generic/arch_pybindings.h @@ -0,0 +1,31 @@ +/* + * nextpnr -- Next Generation Place and Route + * + * Copyright (C) 2018 Clifford Wolf + * Copyright (C) 2018 David Shah + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ +#ifndef ARCH_PYBINDINGS_H +#define ARCH_PYBINDINGS_H +#ifndef NO_PYTHON + +#include "pybindings.h" +#include "nextpnr.h" + +NEXTPNR_NAMESPACE_BEGIN + +NEXTPNR_NAMESPACE_END +#endif +#endif diff --git a/generic/pybindings.cc b/generic/pybindings.cc deleted file mode 100644 index a2997456..00000000 --- a/generic/pybindings.cc +++ /dev/null @@ -1,32 +0,0 @@ -/* - * nextpnr -- Next Generation Place and Route - * - * Copyright (C) 2018 Clifford Wolf - * Copyright (C) 2018 David Shah - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - */ - -#ifndef NO_PYTHON - -#include "pybindings.h" -#include "nextpnr.h" - -NEXTPNR_NAMESPACE_BEGIN - -void arch_wrap_python() { class_("ArchArgs"); } - -NEXTPNR_NAMESPACE_END - -#endif \ No newline at end of file -- cgit v1.2.3 From 726f2020f140a1f5e89e966e7cbde1d1f79473ba Mon Sep 17 00:00:00 2001 From: David Shah Date: Wed, 4 Jul 2018 15:26:09 +0200 Subject: python: Convert empty BelId to None Signed-off-by: David Shah --- generic/arch_pybindings.cc | 2 +- generic/arch_pybindings.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'generic') diff --git a/generic/arch_pybindings.cc b/generic/arch_pybindings.cc index a2997456..a99723f2 100644 --- a/generic/arch_pybindings.cc +++ b/generic/arch_pybindings.cc @@ -20,8 +20,8 @@ #ifndef NO_PYTHON -#include "pybindings.h" #include "nextpnr.h" +#include "pybindings.h" NEXTPNR_NAMESPACE_BEGIN diff --git a/generic/arch_pybindings.h b/generic/arch_pybindings.h index 12b666a2..f7f07529 100644 --- a/generic/arch_pybindings.h +++ b/generic/arch_pybindings.h @@ -21,8 +21,8 @@ #define ARCH_PYBINDINGS_H #ifndef NO_PYTHON -#include "pybindings.h" #include "nextpnr.h" +#include "pybindings.h" NEXTPNR_NAMESPACE_BEGIN -- cgit v1.2.3