Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install pbs and pbs_ifl as loadable Python modules #1996

Merged
merged 22 commits into from
Oct 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
30e9793
Install pbs and pbs_ifl Python modules in PBS_EXEC
toonen Aug 19, 2020
bbfe6e3
Merge branch 'master' into install_pbs_ifl_py
toonen Aug 19, 2020
42f4de5
fixed warnings causing CI to fail
toonen Aug 25, 2020
904e6e6
fixed issue with make dist
toonen Aug 26, 2020
aaee7b9
fixed missing libz in pbs python module
toonen Aug 26, 2020
3a3bcf5
hopeful fix for the continuing libz issues
toonen Aug 27, 2020
6358130
probable fix for make dist not including SWIG input file
toonen Aug 27, 2020
ac324bf
Merge branch 'master' into install_pbs_py
toonen Sep 22, 2020
f548368
Eliminated duplicate pbs v1 module code
toonen Sep 22, 2020
cb037ab
Changes provided by @bayucan to eliminate link failure on SLES12
toonen Sep 22, 2020
3a61204
removed use of checkModule on import tests
toonen Sep 23, 2020
bc04af6
Merge branch 'master' into install_pbs_py
toonen Sep 23, 2020
82d7dfe
fixed pep8 error
toonen Sep 23, 2020
da4d5c9
added missing @swig_py_inc@ when generating pbs_ifl_wrap.c
toonen Sep 24, 2020
6aaffb9
patched libtool to correctly handle -fsanitize
toonen Sep 24, 2020
4860917
add possible missing path to PBS Python modules
toonen Sep 25, 2020
64c000e
attempt to fix PEP8 issues
toonen Sep 25, 2020
eca9263
another attempt to satisfy PEP8 and readability
toonen Sep 25, 2020
5591dd0
fixed indentation in add_pbs_python_path_to_sys_path()
toonen Sep 28, 2020
ff8b520
Merge branch 'master' into install_pbs_py
toonen Sep 28, 2020
fa6afda
improved PBS_AC_PATCH_LIBTOOL
toonen Sep 30, 2020
9b072c0
Merge branch 'master' into install_pbs_py
toonen Sep 30, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,7 @@ PBS_AC_WITH_LIBZ
PBS_AC_ENABLE_PTL
PBS_AC_SYSTEMD_UNITDIR
PBS_AC_WITH_LIBUNDOLR
PBS_AC_PATCH_LIBTOOL

AC_CONFIG_FILES([
openpbs.spec
Expand Down Expand Up @@ -370,6 +371,7 @@ AC_CONFIG_FILES([
src/lib/Libattr/Makefile
src/lib/Libdb/Makefile
src/lib/Libdb/pgsql/Makefile
src/lib/Libifl/Makefile
src/lib/Liblog/Makefile
src/lib/Libnet/Makefile
src/lib/Libpbs/Makefile
Expand Down
61 changes: 61 additions & 0 deletions m4/pbs_patch_libtool.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@

#
# Copyright (C) 1994-2020 Altair Engineering, Inc.
# For more information, contact Altair at www.altair.com.
#
# This file is part of both the OpenPBS software ("OpenPBS")
# and the PBS Professional ("PBS Pro") software.
#
# Open Source License Information:
#
# OpenPBS is free software. You can redistribute it and/or modify it under
# the terms of the GNU Affero General Public License as published by the
# Free Software Foundation, either version 3 of the License, or (at your
# option) any later version.
#
# OpenPBS is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
# License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# Commercial License Information:
#
# PBS Pro is commercially licensed software that shares a common core with
# the OpenPBS software. For a copy of the commercial license terms and
# conditions, go to: (http://www.pbspro.com/agreement.html) or contact the
# Altair Legal Department.
#
# Altair's dual-license business model allows companies, individuals, and
# organizations to create proprietary derivative works of OpenPBS and
# distribute them - whether embedded or bundled with other software -
# under a commercial license agreement.
#
# Use of Altair's trademarks, including but not limited to "PBS™",
# "OpenPBS®", "PBS Professional®", and "PBS Pro™" and Altair's logos is
# subject to Altair's trademark licensing policies.

#

AC_DEFUN([PBS_AC_PATCH_LIBTOOL], [
AC_CONFIG_COMMANDS([patch-libtool], [
AS_IF([! grep '[[-]]fsanitize=\*' libtool 2>&1 >/dev/null], [
AC_MSG_NOTICE([patching libtool to support -fsanitize])
AS_IF([! grep '[[-]]pg[[|)]]' libtool 2>&1 >/dev/null], [
grep -A 30 'Flags to be passed through unchanged' libtool \
>libtool.patched.err
AC_MSG_ERROR([libtool does not pass through -pg])
])
$SED 's/\(-pg\)\([[|)]]\)/\1|-fsanitize=\*\2/' \
libtool >libtool.patched 2>libtool.patched.err
AS_IF([! grep '[[-]]fsanitize=\*' libtool.patched \
2>&1 >/dev/null ], [
AC_MSG_ERROR([Failed to patch libtool])
], [])
mv -f libtool.patched libtool
rm -f libtool.patched.err
])
])
])
1 change: 1 addition & 0 deletions src/include/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ noinst_HEADERS = \
pbs_python_private.h \
pbs_share.h \
pbs_undolr.h \
pbs_v1_module_common.i \
pbs_version.h \
placementsets.h \
portability.h \
Expand Down
Loading