Skip to content

Since PMIx is moving to release v3.0, embed the new release candidate… #4313

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 10, 2017
Merged

Since PMIx is moving to release v3.0, embed the new release candidate… #4313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
46 changes: 20 additions & 26 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,36 +310,30 @@ opal/mca/hwloc/base/static-components.h.new.struct

opal/mca/installdirs/config/install_dirs.h

opal/mca/pmix/ext2x/ext2x.c
opal/mca/pmix/ext2x/ext2x.h
opal/mca/pmix/ext2x/ext2x_client.c
opal/mca/pmix/ext2x/ext2x_component.c
opal/mca/pmix/ext2x/ext2x_server_north.c
opal/mca/pmix/ext2x/ext2x_server_south.c
opal/mca/pmix/pmix*/pmix/include/pmix/autogen/config.h
opal/mca/pmix/pmix*/pmix/include/pmix/autogen/config.h.in
opal/mca/pmix/pmix*/pmix/src/include/private/autogen/config.h.in
opal/mca/pmix/pmix*/pmix/src/include/private/autogen/config.h
opal/mca/pmix/pmix2x/pmix/src/include/frameworks.h
opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h
opal/mca/pmix/pmix2x/pmix/config/autogen_found_items.m4
opal/mca/pmix/pmix2x/pmix/src/include/pmix_config.h
opal/mca/pmix/pmix2x/pmix/src/include/pmix_config.h.in
opal/mca/pmix/pmix2x/pmix/include/pmix_rename.h
opal/mca/pmix/pmix2x/pmix/include/pmix_version.h
opal/mca/pmix/pmix2x/pmix/src/util/keyval/keyval_lex.c
opal/mca/pmix/pmix2x/pmix/src/util/show_help_lex.c
opal/mca/pmix/pmix2x/pmix/examples/alloc
opal/mca/pmix/pmix2x/pmix/examples/client
opal/mca/pmix/pmix2x/pmix/examples/debugger
opal/mca/pmix/pmix2x/pmix/examples/debuggerd
opal/mca/pmix/pmix2x/pmix/examples/dmodex
opal/mca/pmix/pmix2x/pmix/examples/dynamic
opal/mca/pmix/pmix2x/pmix/examples/fault
opal/mca/pmix/pmix2x/pmix/examples/jctrl
opal/mca/pmix/pmix2x/pmix/examples/pub
opal/mca/pmix/pmix2x/pmix/examples/server
opal/mca/pmix/pmix2x/pmix/examples/tool
opal/mca/pmix/pmix*/pmix/src/include/frameworks.h
opal/mca/pmix/pmix*/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h
opal/mca/pmix/pmix*/pmix/config/autogen_found_items.m4
opal/mca/pmix/pmix*/pmix/src/include/pmix_config.h
opal/mca/pmix/pmix*/pmix/src/include/pmix_config.h.in
opal/mca/pmix/pmix*/pmix/include/pmix_rename.h
opal/mca/pmix/pmix*/pmix/include/pmix_version.h
opal/mca/pmix/pmix*/pmix/src/util/keyval/keyval_lex.c
opal/mca/pmix/pmix*/pmix/src/util/show_help_lex.c
opal/mca/pmix/pmix*/pmix/examples/alloc
opal/mca/pmix/pmix*/pmix/examples/client
opal/mca/pmix/pmix*/pmix/examples/debugger
opal/mca/pmix/pmix*/pmix/examples/debuggerd
opal/mca/pmix/pmix*/pmix/examples/dmodex
opal/mca/pmix/pmix*/pmix/examples/dynamic
opal/mca/pmix/pmix*/pmix/examples/fault
opal/mca/pmix/pmix*/pmix/examples/jctrl
opal/mca/pmix/pmix*/pmix/examples/pub
opal/mca/pmix/pmix*/pmix/examples/server
opal/mca/pmix/pmix*/pmix/examples/tool

opal/tools/opal-checkpoint/opal-checkpoint
opal/tools/opal-checkpoint/opal-checkpoint.1
Expand Down
27 changes: 4 additions & 23 deletions opal/mca/pmix/ext2x/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,16 @@
dist_opaldata_DATA = help-pmix-ext2x.txt

sources = \
ext2x_local.c

nodist_headers = \
ext2x.h

nodist_sources = \
ext2x_local.c \
ext2x.c \
ext2x_client.c \
ext2x_component.c \
ext2x_server_north.c \
ext2x_server_south.c

headers = \
ext2x.h

# Make the output library in this directory, and name it either
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
# (for static builds).
Expand All @@ -38,23 +36,9 @@ component_noinst = libmca_pmix_ext2x.la
component_install =
endif

#
# Generate ext2x sources from the pmix2x component
#
$(nodist_headers):
pmix2xname=`echo $@ | sed -e s/ext2x/pmix2x/g` ; \
$(SED) 's/pmix2x/ext2x/g' $(top_srcdir)/opal/mca/pmix/pmix2x/$$pmix2xname > $@

$(sources): $(nodist_headers)

$(nodist_sources): $(nodist_headers)
pmix2xname=`echo $@ | sed -e s/ext2x/pmix2x/g` ; \
$(SED) 's/pmix2x/ext2x/g' $(top_srcdir)/opal/mca/pmix/pmix2x/$$pmix2xname > $@

mcacomponentdir = $(opallibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_pmix_ext2x_la_SOURCES = $(sources)
nodist_mca_pmix_ext2x_la_SOURCES = $(nodist_sources)
mca_pmix_ext2x_la_CFLAGS = $(opal_pmix_ext2x_CFLAGS)
mca_pmix_ext2x_la_CPPFLAGS =$(opal_pmix_ext2x_CPPFLAGS)
mca_pmix_ext2x_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext2x_LDFLAGS)
Expand All @@ -67,6 +51,3 @@ libmca_pmix_ext2x_la_CFLAGS = $(opal_pmix_ext2x_CFLAGS)
libmca_pmix_ext2x_la_CPPFLAGS = $(opal_pmix_ext2x_CPPFLAGS)
libmca_pmix_ext2x_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext2x_LDFLAGS)
libmca_pmix_ext2x_la_LIBADD = $(opal_pmix_ext2x_LIBS)

clean-local:
$(RM) -f $(nodist_sources) $(nodist_headers)
Loading